ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Merge branch 'main' of https://github.com/GamingCampus-AdrienBourgois/khaotic-engine

Browse Source
This commit is contained in:
CatChow0
2024-04-11 11:04:37 +02:00
parent a84e42ce2c cf434ffca0
commit d52ea4b753
7 changed files with 174 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
enginecustom/shadermanagerclass.h
View File

@@ -11,6 +11,8 @@
#include "alphamapshaderclass.h"
#include "specmapshaderclass.h"
#include "transparentshaderclass.h"
#include "lightshaderclass.h"
#include "lightmapshaderclass.h"
////////////////////////////////////////////////////////////////////////////////
@@ -33,6 +35,8 @@ public:
bool RenderSpecMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*,
XMFLOAT3, XMFLOAT4, XMFLOAT3, XMFLOAT4, float);
bool RenderTransparentShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, float);
bool RenderlightShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[]);
bool RenderlightMapShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, ID3D11ShaderResourceView*);
private:
TextureShaderClass* m_TextureShader;
@@ -44,6 +48,8 @@ private:
TransparentShaderClass* m_TransparentShader;
Logger logger;
LightShaderClass* m_LightShader;
LightMapShaderClass* m_LightMapShader;
};
#endif