Merge branch 'Sprites'

This commit is contained in:
StratiX0
2024-03-27 12:01:07 +01:00
40 changed files with 2819 additions and 357 deletions

View File

@@ -11,7 +11,10 @@
#include "lightshaderclass.h"
#include "lightclass.h"
#include "multitextureshaderclass.h"
#include "modelclass.h"
#include "bitmapclass.h"
#include "textureshaderclass.h"
#include "spriteclass.h"
#include "timerclass.h"
/////////////
// GLOBALS //
@@ -37,8 +40,7 @@ public:
bool Frame();
private:
bool Render(float);
bool Render(float, float, float, float);
private:
D3DClass* m_Direct3D;
CameraClass* m_Camera;
@@ -46,6 +48,10 @@ private:
LightClass* m_Light;
MultiTextureShaderClass* m_MultiTextureShader;
ModelClass* m_Model;
TextureShaderClass* m_TextureShader;
BitmapClass* m_Bitmap;
SpriteClass* m_Sprite;
TimerClass* m_Timer;
};
#endif