From 86c5dfe8f4fe43cf0068743b1a1f719a3e36a245 Mon Sep 17 00:00:00 2001 From: yunfeibai Date: Tue, 29 Nov 2016 11:43:52 -0800 Subject: [PATCH] Fix the light color issue in box rendering example. --- examples/RenderingExamples/TinyRendererSetup.cpp | 4 +++- examples/SharedMemory/TinyRendererVisualShapeConverter.cpp | 2 +- examples/TinyRenderer/TinyRenderer.cpp | 7 +------ examples/TinyRenderer/TinyRenderer.h | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/examples/RenderingExamples/TinyRendererSetup.cpp b/examples/RenderingExamples/TinyRendererSetup.cpp index 84f7b0033..21906d787 100644 --- a/examples/RenderingExamples/TinyRendererSetup.cpp +++ b/examples/RenderingExamples/TinyRendererSetup.cpp @@ -154,7 +154,6 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui) const char* fileName = "textured_sphere_smooth.obj"; fileName = "cube.obj"; - { @@ -373,6 +372,9 @@ void TinyRendererSetup::stepSimulation(float deltaTime) }; m_internalData->m_renderObjects[o]->m_lightDirWorld = lightDirWorld.normalized(); + + btVector3 lightColor(1.0,1.0,1.0); + m_internalData->m_renderObjects[o]->m_lightColor = lightColor; } } diff --git a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp index 13aa4b19b..aed5ae467 100644 --- a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp @@ -798,7 +798,7 @@ void TinyRendererVisualShapeConverter::render(const float viewMat[16], const flo renderObj->m_lightDirWorld = lightDirWorld; renderObj->m_lightColor = lightColor; renderObj->m_lightDistance = lightDistance; - TinyRenderer::renderObjectShadow(*renderObj); + TinyRenderer::renderObject(*renderObj); } } //printf("write tga \n"); diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp index 974a8db5e..592667309 100644 --- a/examples/TinyRenderer/TinyRenderer.cpp +++ b/examples/TinyRenderer/TinyRenderer.cpp @@ -406,11 +406,6 @@ TinyRenderObjectData::~TinyRenderObjectData() delete m_model; } -void TinyRenderer::renderObject(TinyRenderObjectData& renderData) -{ - -} - void TinyRenderer::renderObjectDepth(TinyRenderObjectData& renderData) { int width = renderData.m_rgbColorBuffer.get_width(); @@ -453,7 +448,7 @@ void TinyRenderer::renderObjectDepth(TinyRenderObjectData& renderData) } -void TinyRenderer::renderObjectShadow(TinyRenderObjectData& renderData) +void TinyRenderer::renderObject(TinyRenderObjectData& renderData) { int width = renderData.m_rgbColorBuffer.get_width(); int height = renderData.m_rgbColorBuffer.get_height(); diff --git a/examples/TinyRenderer/TinyRenderer.h b/examples/TinyRenderer/TinyRenderer.h index 28c684b36..d82060382 100644 --- a/examples/TinyRenderer/TinyRenderer.h +++ b/examples/TinyRenderer/TinyRenderer.h @@ -53,9 +53,8 @@ struct TinyRenderObjectData class TinyRenderer { public: - static void renderObject(TinyRenderObjectData& renderData); static void renderObjectDepth(TinyRenderObjectData& renderData); - static void renderObjectShadow(TinyRenderObjectData& renderData); + static void renderObject(TinyRenderObjectData& renderData); }; #endif // TINY_RENDERER_Hbla