Merge branch 'main' into Imgui

This commit is contained in:
2024-03-22 17:19:06 +01:00
15 changed files with 1119 additions and 55 deletions

View File

@@ -2,14 +2,14 @@
#define _APPLICATIONCLASS_H_
//////////////
// INCLUDES //
//////////////
///////////////////////
// MY CLASS INCLUDES //
///////////////////////
#include "d3dclass.h"
#include "cameraclass.h"
#include "modelclass.h"
#include "colorshaderclass.h"
#include "d3dclass.h"
#include "lightshaderclass.h"
#include "lightclass.h"
/////////////
// GLOBALS //
@@ -18,6 +18,10 @@ const bool VSYNC_ENABLED = true;
const float SCREEN_DEPTH = 1000.0f;
const float SCREEN_NEAR = 0.3f;
////////////////////////////////////////////////////////////////////////////////
// Class name: ApplicationClass
////////////////////////////////////////////////////////////////////////////////
class ApplicationClass
{
public:
@@ -35,15 +39,16 @@ public:
int GetScreenHeight() const;
private:
bool Render();
bool Render(float);
private:
D3DClass* m_Direct3D;
CameraClass* m_Camera;
ModelClass* m_Model;
ColorShaderClass* m_ColorShader;
IDXGISwapChain* m_swapChain;
bool m_fullscreen = false;
LightShaderClass* m_LightShader;
LightClass* m_Light;
};
#endif
#endif