PixelShader更名为FragementShader
This commit is contained in:
@@ -79,8 +79,8 @@ public:
|
||||
return m_vertexShader;
|
||||
}
|
||||
|
||||
PixelShaderInterface* getPixelShader() const {
|
||||
return m_pixelShader;
|
||||
FragementShaderInterface* getFragementShader() const {
|
||||
return m_fragementShader;
|
||||
}
|
||||
|
||||
virtual bool setupMaterial();
|
||||
@@ -104,7 +104,7 @@ protected:
|
||||
std::string m_name;
|
||||
|
||||
VertexShaderInterface* m_vertexShader = nullptr;
|
||||
PixelShaderInterface* m_pixelShader = nullptr;
|
||||
FragementShaderInterface* m_fragementShader = nullptr;
|
||||
|
||||
std::string m_vertexshaderFile;
|
||||
std::string m_vertexShaderName;
|
||||
|
||||
@@ -82,7 +82,7 @@ typedef std::shared_ptr<const Renderable> RenderableConstPtr;
|
||||
typedef std::vector<RenderableConstPtr> RenderableArray;
|
||||
|
||||
class VertexShaderInterface;
|
||||
class PixelShaderInterface;
|
||||
class FragementShaderInterface;
|
||||
|
||||
class UniformBuffer;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
virtual void end() = 0;
|
||||
};
|
||||
|
||||
class PixelShaderInterface
|
||||
class FragementShaderInterface
|
||||
{
|
||||
public:
|
||||
virtual const char* getName(void) const = 0;
|
||||
@@ -39,7 +39,7 @@ class ShaderFileInterface
|
||||
{
|
||||
public:
|
||||
virtual VertexShaderInterface* getVertexShader(const char* szName) = 0;
|
||||
virtual PixelShaderInterface* getPixelShader(const char* szName) = 0;
|
||||
virtual FragementShaderInterface* getFragementShader(const char* szName) = 0;
|
||||
};
|
||||
|
||||
typedef ShaderFileInterface* (*ShaderFileInterfaceFunc)();
|
||||
|
||||
Reference in New Issue
Block a user