Merge branch 'Graphics-Update'
Former-commit-id: 9855f235dd21d47d1cd9da8c3c0b4ede41e74472
This commit is contained in:
@@ -179,13 +179,14 @@ enum nzShaderTarget
|
||||
nzShaderTarget_FullscreenQuad,
|
||||
nzShaderTarget_Model,
|
||||
nzShaderTarget_None,
|
||||
nzShaderTarget_Sprite,
|
||||
|
||||
nzShaderTarget_Max = nzShaderTarget_None
|
||||
nzShaderTarget_Max = nzShaderTarget_Sprite
|
||||
};
|
||||
|
||||
enum nzShaderUniform
|
||||
{
|
||||
nzShaderUniform_CameraPosition,
|
||||
nzShaderUniform_EyePosition,
|
||||
nzShaderUniform_InvTargetSize,
|
||||
nzShaderUniform_MaterialAlphaMap,
|
||||
nzShaderUniform_MaterialAlphaThreshold,
|
||||
|
||||
@@ -58,6 +58,7 @@ class NAZARA_API NzRenderWindow : public NzRenderTarget, public NzWindow
|
||||
private:
|
||||
bool OnWindowCreated() override;
|
||||
void OnWindowDestroy() override;
|
||||
void OnWindowResized() override;
|
||||
|
||||
NzClock m_clock;
|
||||
NzContextParameters m_parameters;
|
||||
|
||||
@@ -30,6 +30,13 @@ struct NzShaderProgramManagerParams
|
||||
bool specularMapping;
|
||||
};
|
||||
|
||||
struct Sprite
|
||||
{
|
||||
bool alphaMapping;
|
||||
bool alphaTest;
|
||||
bool diffuseMapping;
|
||||
};
|
||||
|
||||
nzShaderTarget target;
|
||||
nzUInt32 flags;
|
||||
|
||||
@@ -37,6 +44,7 @@ struct NzShaderProgramManagerParams
|
||||
{
|
||||
FullscreenQuad fullscreenQuad;
|
||||
Model model;
|
||||
Sprite sprite;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user