BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed isSkined to IsSkinned and removed duplicated code in PickingPass

Browse Source
This commit is contained in:
viktorljung
2016-02-10 14:36:25 +01:00
parent 1e238b2407
commit e9d36c48a6
6 changed files with 67 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/Model.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
const AABB& Box() const { return m_Box; }
bool isSkined() const { return m_RawModel->isSkined(); }
bool IsSkinned() const { return m_RawModel->IsSkinned(); }
GLuint VAO;
GLuint ElementBuffer;
RawModel* m_RawModel;
include/Engine/Rendering/ModelJob.h
+3 -3
View File
@@ -27,7 +27,7 @@ struct ModelJob : RenderJob
::RawModel::MaterialBasic* matGroup = matProp.material;
switch(matProp.type){
case ::RawModel::MaterialType::Basic:
if (Model->isSkined()) {
if (Model->IsSkinned()) {
ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
}
else {
@@ -37,7 +37,7 @@ struct ModelJob : RenderJob
break;
case ::RawModel::MaterialType::SingleTextures:
{
if (Model->isSkined()) {
if (Model->IsSkinned()) {
ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
}
else {
@@ -64,7 +64,7 @@ struct ModelJob : RenderJob
break;
case ::RawModel::MaterialType::SplatMapping:
{
if (Model->isSkined()) {
if (Model->IsSkinned()) {
ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapSkinnedProgram")->ResourceID;
}
else {
include/Engine/Rendering/RawModelCustom.h
+1 -1
View File
@@ -114,7 +114,7 @@ public:
}
};
bool isSkined() const { return hasSkin; };
bool IsSkinned() const { return hasSkin; };
std::vector<MaterialProperties> m_Materials;