Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the light color issue in box rendering example.

Browse Source
This commit is contained in:
yunfeibai
2016-11-29 11:43:52 -08:00
parent 5fe36ca200
commit 86c5dfe8f4
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/RenderingExamples/TinyRendererSetup.cpp
View File

@@ -154,7 +154,6 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui)
const char* fileName = "textured_sphere_smooth.obj"; const char* fileName = "textured_sphere_smooth.obj";
fileName = "cube.obj"; fileName = "cube.obj";
{ {
@@ -373,6 +372,9 @@ void TinyRendererSetup::stepSimulation(float deltaTime)
}; };
m_internalData->m_renderObjects[o]->m_lightDirWorld = lightDirWorld.normalized(); 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;
} }
} }

2
examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
View File

@@ -798,7 +798,7 @@ void TinyRendererVisualShapeConverter::render(const float viewMat[16], const flo
renderObj->m_lightDirWorld = lightDirWorld; renderObj->m_lightDirWorld = lightDirWorld;
renderObj->m_lightColor = lightColor; renderObj->m_lightColor = lightColor;
renderObj->m_lightDistance = lightDistance; renderObj->m_lightDistance = lightDistance;
TinyRenderer::renderObjectShadow(*renderObj); TinyRenderer::renderObject(*renderObj);
} }
} }
//printf("write tga \n"); //printf("write tga \n");

7
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -406,11 +406,6 @@ TinyRenderObjectData::~TinyRenderObjectData()
delete m_model; delete m_model;
} }
void TinyRenderer::renderObject(TinyRenderObjectData& renderData)
{
}
void TinyRenderer::renderObjectDepth(TinyRenderObjectData& renderData) void TinyRenderer::renderObjectDepth(TinyRenderObjectData& renderData)
{ {
int width = renderData.m_rgbColorBuffer.get_width(); 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 width = renderData.m_rgbColorBuffer.get_width();
int height = renderData.m_rgbColorBuffer.get_height(); int height = renderData.m_rgbColorBuffer.get_height();

3
examples/TinyRenderer/TinyRenderer.h
View File

@@ -53,9 +53,8 @@ struct TinyRenderObjectData
class TinyRenderer class TinyRenderer
{ {
public: public:
static void renderObject(TinyRenderObjectData& renderData);
static void renderObjectDepth(TinyRenderObjectData& renderData); static void renderObjectDepth(TinyRenderObjectData& renderData);
static void renderObjectShadow(TinyRenderObjectData& renderData); static void renderObject(TinyRenderObjectData& renderData);
}; };
#endif // TINY_RENDERER_Hbla #endif // TINY_RENDERER_Hbla