Merge remote-tracking branch 'origin/Romain' into 3d-model
This commit is contained in:
@@ -86,7 +86,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
|
||||
|
||||
m_Light->SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
m_Light->SetDirection(0.0f, 0.0f, 1.0f);
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -108,6 +108,14 @@ void ApplicationClass::Shutdown()
|
||||
m_LightShader = 0;
|
||||
}
|
||||
|
||||
// Release the light shader object.
|
||||
if (m_LightShader)
|
||||
{
|
||||
m_LightShader->Shutdown();
|
||||
delete m_LightShader;
|
||||
m_LightShader = 0;
|
||||
}
|
||||
|
||||
// Release the model object.
|
||||
if (m_Model)
|
||||
{
|
||||
@@ -143,7 +151,6 @@ bool ApplicationClass::Frame()
|
||||
static float z = 0.f;
|
||||
bool result;
|
||||
|
||||
|
||||
// Update the rotation variable each frame.
|
||||
rotation -= 0.0174532925f * 0.1f;
|
||||
if (rotation < 0.0f)
|
||||
|
||||
Reference in New Issue
Block a user