Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two crash fixes for graphics and camera #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −8
Open

Two crash fixes for graphics and camera #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25e2c51
Crash fixes for window size and camera R
Jun 15, 2019
b64efa7
GetWindowRect exception handling
Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hw3d/Camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void Camera::SpawnControlWindow() noexcept
if( ImGui::Begin( "Camera" ) )
{
ImGui::Text( "Position" );
ImGui::SliderFloat( "R",&r,0.0f,80.0f,"%.1f" );
ImGui::SliderFloat( "R",&r, FLT_EPSILON,80.0f,"%.1f" );
ImGui::SliderAngle( "Theta",&theta,-180.0f,180.0f );
ImGui::SliderAngle( "Phi",&phi,-89.0f,89.0f );
ImGui::Text( "Orientation" );
Expand All @@ -35,6 +35,7 @@ void Camera::SpawnControlWindow() noexcept
}
}
ImGui::End();
if( r <= 0 ) r = FLT_EPSILON;
}

void Camera::Reset() noexcept
Expand Down
19 changes: 12 additions & 7 deletions hw3d/Graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ namespace dx = DirectX;

Graphics::Graphics( HWND hWnd )
{
// for checking results of d3d functions
HRESULT hr;

RECT rcTemp;
if( !GetWindowRect( hWnd, &rcTemp ) ) {
GFX_EXCEPT( __HRESULT_FROM_WIN32( GetLastError() ) );
}

DXGI_SWAP_CHAIN_DESC sd = {};
sd.BufferDesc.Width = 0;
sd.BufferDesc.Height = 0;
Expand All @@ -39,9 +47,6 @@ Graphics::Graphics( HWND hWnd )
swapCreateFlags |= D3D11_CREATE_DEVICE_DEBUG;
#endif

// for checking results of d3d functions
HRESULT hr;

// create device and front/back buffers, and swap chain and rendering context
GFX_THROW_INFO( D3D11CreateDeviceAndSwapChain(
nullptr,
Expand Down Expand Up @@ -77,8 +82,8 @@ Graphics::Graphics( HWND hWnd )
// create depth stensil texture
wrl::ComPtr<ID3D11Texture2D> pDepthStencil;
D3D11_TEXTURE2D_DESC descDepth = {};
descDepth.Width = 800u;
descDepth.Height = 600u;
descDepth.Width = rcTemp.right;
descDepth.Height = rcTemp.bottom;
descDepth.MipLevels = 1u;
descDepth.ArraySize = 1u;
descDepth.Format = DXGI_FORMAT_D32_FLOAT;
Expand All @@ -102,8 +107,8 @@ Graphics::Graphics( HWND hWnd )

// configure viewport
D3D11_VIEWPORT vp;
vp.Width = 800.0f;
vp.Height = 600.0f;
vp.Width = rcTemp.right;
vp.Height = rcTemp.bottom;
vp.MinDepth = 0.0f;
vp.MaxDepth = 1.0f;
vp.TopLeftX = 0.0f;
Expand Down