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

Commit in order to pull from Master.

Browse Source
This commit is contained in:
antc13
2016-01-19 18:21:27 +01:00
parent 3826142e94
commit e643581971
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Shaders/ForwardPlus.frag.glsl
+1 -2
View File
@@ -113,7 +113,7 @@ void main()
totalLighting.Specular += result.Specular; totalLighting.Specular += result.Specular;
} }
//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * texel * Color; fragmentColor += (totalLighting.Diffuse + totalLighting.Specular) * texel * Color;
//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse) * texel * Color; //fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse) * texel * Color;
//fragmentColor += vec4(0.0, LightGrids.Data[currentTile].Amount/3.0, 0, 1); //fragmentColor += vec4(0.0, LightGrids.Data[currentTile].Amount/3.0, 0, 1);
//fragmentColor = texel * Input.DiffuseColor * Color; //fragmentColor = texel * Input.DiffuseColor * Color;
@@ -125,7 +125,6 @@ void main()
} }
fragmentColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
} }
src/Engine/Rendering/DrawFinalPassState.cpp
+1 -1
View File
@@ -7,7 +7,7 @@ DrawFinalPassState::DrawFinalPassState()
Enable(GL_BLEND); Enable(GL_BLEND);
BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Enable(GL_DEPTH_TEST); Enable(GL_DEPTH_TEST);
Disable(GL_CULL_FACE); //Should be enabled, fix it johan and andreas. Enable(GL_CULL_FACE);
ClearColor(glm::vec4(200.f / 255, 0.f / 255, 200.f / 255, 0.f)); ClearColor(glm::vec4(200.f / 255, 0.f / 255, 200.f / 255, 0.f));
Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
} }
src/Engine/Rendering/RawModelCustom.cpp
+3 -1
View File
@@ -148,7 +148,9 @@ void RawModel::ReadMaterialSingle(unsigned int &offset, char* fileData, unsigned
throw Resource::FailedLoadingException("Reading Material texture path failed"); throw Resource::FailedLoadingException("Reading Material texture path failed");
} }
newMaterial.TexturePath = (fileData + offset); newMaterial.TexturePath = "Textures/";
newMaterial.TexturePath += (fileData + offset);
newMaterial.TexturePath += ".png";
offset += nameLengths[0]; offset += nameLengths[0];
} }
src/Engine/Rendering/Renderer.cpp
+4 -4
View File
@@ -101,10 +101,10 @@ void Renderer::Draw(RenderFrame& frame)
m_Camera = scene->Camera; // remove renderer camera when Editor uses the render scene cameras. m_Camera = scene->Camera; // remove renderer camera when Editor uses the render scene cameras.
FillDepth(*scene); FillDepth(*scene);
//m_PickingPass->Draw(*scene); m_PickingPass->Draw(*scene);
//m_LightCullingPass->GenerateNewFrustum(*scene); m_LightCullingPass->GenerateNewFrustum(*scene);
//m_LightCullingPass->FillLightList(*scene); m_LightCullingPass->FillLightList(*scene);
//m_LightCullingPass->CullLights(*scene); m_LightCullingPass->CullLights(*scene);
m_DrawFinalPass->Draw(*scene); m_DrawFinalPass->Draw(*scene);
//m_DrawScenePass->Draw(rq); //m_DrawScenePass->Draw(rq);
tools/MayaExporter/MayaExporter/Mesh.h
+4 -3
View File
@@ -69,9 +69,10 @@ public:
for (auto aVertex : Vertices) { for (auto aVertex : Vertices) {
aVertex.WriteBinary(out); aVertex.WriteBinary(out);
} }
//for (auto aIndex : Indices) { for (auto aIndex : Indices) {
for (std::map<std::string, std::vector<int>>::reverse_iterator aIndex = Indices.rbegin(); aIndex != Indices.rend(); aIndex++){ //for (std::map<std::string, std::vector<int>>::reverse_iterator aIndex = Indices.rbegin(); aIndex != Indices.rend(); aIndex++){
out.write((char*)(*aIndex).second.data(), sizeof(int) * (*aIndex).second.size()); //out.write((char*)(*aIndex).second.data(), sizeof(int) * (*aIndex).second.size());
out.write((char*)aIndex.second.data(), sizeof(int) * aIndex.second.size());
} }
} }