Skip to content

Commit

Permalink
ADD Controls window and additional options.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpvanoosten
jpvanoosten committed Nov 19, 2020
1 parent bdc3c02 commit 38fa6fc
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 60 deletions.
1 change: 1 addition & 0 deletions samples/05-Models/inc/Tutorial5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ class Tutorial5
bool m_AllowFullscreenToggle;
bool m_ShowFileOpenDialog;
bool m_CancelLoading;
bool m_ShowControls;
std::atomic_bool m_IsLoading;
std::future<bool> m_LoadingTask;
float m_LoadingProgress;
Expand Down
32 changes: 20 additions & 12 deletions samples/05-Models/src/CameraController.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include <CameraController.h>

#include <Camera.h>
#include <imgui/imgui.h> // Need to check if ImGui wants to capture mouse or keyboard input.

#include <Camera.h>
#include <cmath> // for std::abs and std::pow

using namespace DirectX;
Expand Down Expand Up @@ -88,7 +89,7 @@ CameraController::CameraController( Camera& camera )
ResetView();
}

void CameraController::ResetView()
void CameraController::ResetView()
{
// Reset previous deltas.
m_X = m_Y = m_Z = m_PreviousPitch = m_PreviousYaw = 0.0f;
Expand All @@ -104,18 +105,25 @@ void CameraController::ResetView()

void CameraController::Update( UpdateEventArgs& e )
{
const float MOVE_SPEED = 10.0;
const float LOOK_SENSITIVITY = 90.0;
const float MOUSE_SENSITIVITY = 0.1;
const float MOVE_SPEED = 10.0;
const float LOOK_SENSITIVITY = 90.0;
const float MOUSE_SENSITIVITY = 0.1;

float speedScale = m_PadInput->GetBool( Boost ) || m_KMInput->GetBool( Boost ) ? 2.0 : 1.0;
float speedScale = m_PadInput->GetBool( Boost ) || m_KMInput->GetBool( Boost ) ? 2.0 : 1.0;
float rotationScale = m_PadInput->GetBool( Boost ) || m_KMInput->GetBool( Boost ) ? 2.0 : 1.0;

float X = ( m_KMInput->GetFloat( MoveX ) + m_PadInput->GetFloat( MoveX ) ) * MOVE_SPEED * speedScale * e.DeltaTime;
float Y = ( m_KMInput->GetFloat( MoveY ) + m_PadInput->GetFloat( MoveY ) ) * MOVE_SPEED * speedScale * e.DeltaTime;
float Z = ( m_KMInput->GetFloat( MoveZ ) + m_PadInput->GetFloat( MoveZ ) ) * MOVE_SPEED * speedScale * e.DeltaTime;
float pitch = m_PadInput->GetFloat( Pitch ) * LOOK_SENSITIVITY * rotationScale * e.DeltaTime;
float yaw = m_PadInput->GetFloat( Yaw ) * LOOK_SENSITIVITY * rotationScale * e.DeltaTime;
float X = m_PadInput->GetFloat( MoveX ) * MOVE_SPEED * speedScale * e.DeltaTime;
float Y = m_PadInput->GetFloat( MoveY ) * MOVE_SPEED * speedScale * e.DeltaTime;
float Z = m_PadInput->GetFloat( MoveZ ) * MOVE_SPEED * speedScale * e.DeltaTime;
float pitch = m_PadInput->GetFloat( Pitch ) * LOOK_SENSITIVITY * rotationScale * e.DeltaTime;
float yaw = m_PadInput->GetFloat( Yaw ) * LOOK_SENSITIVITY * rotationScale * e.DeltaTime;

if ( !ImGui::GetIO().WantCaptureKeyboard )
{
X += m_KMInput->GetFloat( MoveX ) * MOVE_SPEED * speedScale * e.DeltaTime;
Y += m_KMInput->GetFloat( MoveY ) * MOVE_SPEED * speedScale * e.DeltaTime;
Z += m_KMInput->GetFloat( MoveZ ) * MOVE_SPEED * speedScale * e.DeltaTime;
}

// Apply smoothing
Smooth( m_X, X, e.DeltaTime );
Expand All @@ -125,7 +133,7 @@ void CameraController::Update( UpdateEventArgs& e )
Smooth( m_PreviousYaw, yaw, e.DeltaTime );

// Add mouse motion without smoothing.
if ( m_KMInput->GetBool( LMB ) )
if ( m_KMInput->GetBool( LMB ) && !ImGui::GetIO().WantCaptureMouse )
{
pitch += m_KMInput->GetFloatDelta( Pitch ) * MOUSE_SENSITIVITY * rotationScale;
yaw += m_KMInput->GetFloatDelta( Yaw ) * MOUSE_SENSITIVITY * rotationScale;
Expand Down
158 changes: 110 additions & 48 deletions samples/05-Models/src/Tutorial5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ Tutorial5::Tutorial5( const std::wstring& name, int width, int height, bool vSyn
, m_AllowFullscreenToggle( true )
, m_ShowFileOpenDialog( false )
, m_CancelLoading( false )
, m_ShowControls( true )
, m_Width( width )
, m_Height( height )
, m_IsLoading( true )
Expand Down Expand Up @@ -545,7 +546,7 @@ void Tutorial5::OnKeyPressed( KeyEventArgs& e )
m_CameraController.ResetView();
break;
case KeyCode::O:
if (e.Control)
if ( e.Control )
{
OpenFile();
}
Expand Down Expand Up @@ -573,8 +574,6 @@ void Tutorial5::OnKeyReleased( KeyEventArgs& e )

void Tutorial5::OnMouseMoved( MouseMotionEventArgs& e )
{
const float mouseSpeed = 0.1f;

if ( !ImGui::GetIO().WantCaptureMouse ) {}
}

Expand All @@ -598,6 +597,19 @@ void Tutorial5::OnDPIScaleChanged( DPIScaleEventArgs& e )
m_GUI->SetScaling( e.DPIScale );
}

static void HelpMarker( const char* desc )
{
ImGui::TextDisabled( "(?)" );
if ( ImGui::IsItemHovered() )
{
ImGui::BeginTooltip();
ImGui::PushTextWrapPos( ImGui::GetFontSize() * 35.0f );
ImGui::TextUnformatted( desc );
ImGui::PopTextWrapPos();
ImGui::EndTooltip();
}
}

void Tutorial5::OnGUI( const std::shared_ptr<CommandList>& commandList, const RenderTarget& renderTarget )
{
m_GUI->NewFrame();
Expand Down Expand Up @@ -645,6 +657,13 @@ void Tutorial5::OnGUI( const std::shared_ptr<CommandList>& commandList, const Re
ImGui::EndMenu();
}

if ( ImGui::BeginMenu( "View" ) )
{
ImGui::MenuItem( "Controls", nullptr, &m_ShowControls );

ImGui::EndMenu();
}

if ( ImGui::BeginMenu( "Options" ) )
{
bool vSync = m_SwapChain->GetVSync();
Expand All @@ -661,6 +680,18 @@ void Tutorial5::OnGUI( const std::shared_ptr<CommandList>& commandList, const Re
m_Fullscreen = fullscreen;
}

ImGui::MenuItem( "Animate Lights", "Space", &m_AnimateLights );

bool invertY = m_CameraController.IsInverseY();
if ( ImGui::MenuItem( "Inverse Y", nullptr, &invertY ) )
{
m_CameraController.SetInverseY( invertY );
}
if ( ImGui::MenuItem( "Reset view", "R" ) )
{
m_CameraController.ResetView();
}

ImGui::EndMenu();
}

Expand All @@ -675,61 +706,92 @@ void Tutorial5::OnGUI( const std::shared_ptr<CommandList>& commandList, const Re
ImGui::EndMainMenuBar();
}

if ( m_ShowControls && ImGui::Begin( "Controls", &m_ShowControls ) )
{
ImGui::Text( "KEYBOARD CONTROLS" );
ImGui::BulletText( "ESC: Terminate application" );
ImGui::BulletText( "Alt+Enter: Toggle fullscreen" );
ImGui::BulletText( "F11: Toggle fullscreen" );
ImGui::BulletText( "W: Move camera forward" );
ImGui::BulletText( "A: Move camera left" );
ImGui::BulletText( "S: Move camera backward" );
ImGui::BulletText( "D: Move camera right" );
ImGui::BulletText( "Q: Move camera down" );
ImGui::BulletText( "E: Move camera up" );
ImGui::BulletText( "R: Reset view" );
ImGui::BulletText( "Shift: Boost move/rotate speed" );
ImGui::BulletText( "Space: Animate lights" );
ImGui::Separator();

ImGui::Text( "MOUSE CONTROLS" );
ImGui::BulletText( "LMB: Rotate camera" );
ImGui::BulletText( "Mouse wheel: Change field of view" );
ImGui::Separator();

ImGui::Text( "GAMEPAD CONTROLS" );
ImGui::BulletText( "Left analog stick: Move camera" );
ImGui::BulletText( "Right analog stick: Rotate camera around the focal point" );
ImGui::BulletText( "Left trigger: Move camera down" );
ImGui::BulletText( "Right trigger: Move camera up" );
ImGui::BulletText( "Hold left or right stick: Boost move/rotate speed" );

ImGui::End();
}
m_GUI->Render( commandList, renderTarget );
}

// clang-format off
static const COMDLG_FILTERSPEC g_FileFilters[] = {
{ L"Autodesk", L"*.fbx" },
{ L"Collada", L"*.dae" },
{ L"glTF", L"*.gltf;*.glb" },
{ L"Blender 3D", L"*.blend" },
{ L"3ds Max 3DS", L"*.3ds" },
{ L"3ds Max ASE", L"*.ase" },
{ L"Wavefront Object", L"*.obj" },
{ L"Industry Foundation Classes (IFC/Step)", L"*.ifc" },
{ L"XGL", L"*.xgl;*.zgl" },
{ L"Stanford Polygon Library", L"*.ply" },
{ L"AutoCAD DXF", L"*.dxf" },
{ L"LightWave", L"*.lws" },
{ L"LightWave Scene", L"*.lws" },
{ L"Modo", L"*.lxo" },
{ L"Stereolithography", L"*.stl" },
{ L"DirectX X", L"*.x" },
{ L"AC3D", L"*.ac" },
{ L"Milkshape 3D", L"*.ms3d" },
{ L"TrueSpace", L"*.cob;*.scn" },
{ L"Ogre XML", L"*.xml" },
{ L"Irrlicht Mesh", L"*.irrmesh" },
{ L"Irrlicht Scene", L"*.irr" },
{ L"Quake I", L"*.mdl" },
{ L"Quake II", L"*.md2" },
{ L"Quake III", L"*.md3" },
{ L"Quake III Map/BSP", L"*.pk3" },
{ L"Return to Castle Wolfenstein", L"*.mdc" },
{ L"Doom 3", L"*.md5*" },
{ L"Valve Model", L"*.smd;*.vta" },
{ L"Open Game Engine Exchange", L"*.ogx" },
{ L"Unreal", L"*.3d" },
{ L"BlitzBasic 3D", L"*.b3d" },
{ L"Quick3D", L"*.q3d;*.q3s" },
{ L"Neutral File Format", L"*.nff" },
{ L"Sense8 WorldToolKit", L"*.nff" },
{ L"Object File Format", L"*.off" },
{ L"PovRAY Raw", L"*.raw" },
{ L"Terragen Terrain", L"*.ter" },
{ L"Izware Nendo", L"*.ndo" },
{ L"All Files", L"*.*" }
};
// clang-format on

// Open a file dialog for the user to select a scene to load.
// @see https://docs.microsoft.com/en-us/windows/win32/learnwin32/example--the-open-dialog-box
// @see
// https://github.com/microsoft/Windows-classic-samples/blob/master/Samples/Win7Samples/winui/shell/appplatform/commonfiledialog/CommonFileDialogApp.cpp
// @see https://www.codeproject.com/Articles/16678/Vista-Goodies-in-C-Using-the-New-Vista-File-Dialog
void Tutorial5::OpenFile()
{
// clang-format off
static const COMDLG_FILTERSPEC g_FileFilters[] = {
{ L"Autodesk", L"*.fbx" },
{ L"Collada", L"*.dae" },
{ L"glTF", L"*.gltf;*.glb" },
{ L"Blender 3D", L"*.blend" },
{ L"3ds Max 3DS", L"*.3ds" },
{ L"3ds Max ASE", L"*.ase" },
{ L"Wavefront Object", L"*.obj" },
{ L"Industry Foundation Classes (IFC/Step)", L"*.ifc" },
{ L"XGL", L"*.xgl;*.zgl" },
{ L"Stanford Polygon Library", L"*.ply" },
{ L"AutoCAD DXF", L"*.dxf" },
{ L"LightWave", L"*.lws" },
{ L"LightWave Scene", L"*.lws" },
{ L"Modo", L"*.lxo" },
{ L"Stereolithography", L"*.stl" },
{ L"DirectX X", L"*.x" },
{ L"AC3D", L"*.ac" },
{ L"Milkshape 3D", L"*.ms3d" },
{ L"TrueSpace", L"*.cob;*.scn" },
{ L"Ogre XML", L"*.xml" },
{ L"Irrlicht Mesh", L"*.irrmesh" },
{ L"Irrlicht Scene", L"*.irr" },
{ L"Quake I", L"*.mdl" },
{ L"Quake II", L"*.md2" },
{ L"Quake III", L"*.md3" },
{ L"Quake III Map/BSP", L"*.pk3" },
{ L"Return to Castle Wolfenstein", L"*.mdc" },
{ L"Doom 3", L"*.md5*" },
{ L"Valve Model", L"*.smd;*.vta" },
{ L"Open Game Engine Exchange", L"*.ogx" },
{ L"Unreal", L"*.3d" },
{ L"BlitzBasic 3D", L"*.b3d" },
{ L"Quick3D", L"*.q3d;*.q3s" },
{ L"Neutral File Format", L"*.nff" },
{ L"Sense8 WorldToolKit", L"*.nff" },
{ L"Object File Format", L"*.off" },
{ L"PovRAY Raw", L"*.raw" },
{ L"Terragen Terrain", L"*.ter" },
{ L"Izware Nendo", L"*.ndo" },
{ L"All Files", L"*.*" }
};
// clang-format on

ComPtr<IFileOpenDialog> pFileOpen;
HRESULT hr = CoCreateInstance( CLSID_FileOpenDialog, NULL, CLSCTX_ALL, IID_PPV_ARGS( &pFileOpen ) );

Expand Down

0 comments on commit 38fa6fc

Please sign in to comment.