From e0c3392ceeeea07d2b5d6881470ad3761f2755fa Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Tue, 7 Jun 2016 17:02:47 -0700
Subject: [PATCH] don't pass width/height into renderObject

---
 examples/RenderingExamples/TinyRendererSetup.cpp             | 2 +-
 examples/SharedMemory/TinyRendererVisualShapeConverter.cpp   | 2 +-
 .../StandaloneMain/main_sw_tinyrenderer_single_example.cpp   | 2 +-
 examples/StandaloneMain/main_tinyrenderer_single_example.cpp | 2 +-
 examples/TinyRenderer/TinyRenderer.cpp                       | 5 ++++-
 examples/TinyRenderer/TinyRenderer.h                         | 2 +-
 examples/TinyRenderer/main.cpp                               | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/RenderingExamples/TinyRendererSetup.cpp b/examples/RenderingExamples/TinyRendererSetup.cpp
index 8df1a76ad..fd3f80e41 100644
--- a/examples/RenderingExamples/TinyRendererSetup.cpp
+++ b/examples/RenderingExamples/TinyRendererSetup.cpp
@@ -363,7 +363,7 @@ void TinyRendererSetup::stepSimulation(float deltaTime)
 					
                 }
             }
-            TinyRenderer::renderObject(*m_internalData->m_renderObjects[o], m_internalData->m_width,m_internalData->m_height);
+            TinyRenderer::renderObject(*m_internalData->m_renderObjects[o]);
         }
         //m_app->drawText("hello",500,500);
         render->activateTexture(m_internalData->m_textureHandle);
diff --git a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
index 7c3507b25..3bb5e893e 100644
--- a/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
+++ b/examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
@@ -576,7 +576,7 @@ void TinyRendererVisualShapeConverter::render(const float viewMat[16], const flo
                     renderObj->m_lightDirWorld = lightDirWorld;
                 }
             }
-            TinyRenderer::renderObject(*renderObj,m_data->m_swWidth,m_data->m_swHeight);
+            TinyRenderer::renderObject(*renderObj);
         }
     }
 	//printf("write tga \n");
diff --git a/examples/StandaloneMain/main_sw_tinyrenderer_single_example.cpp b/examples/StandaloneMain/main_sw_tinyrenderer_single_example.cpp
index 786e0eed1..1fa1b0ccd 100644
--- a/examples/StandaloneMain/main_sw_tinyrenderer_single_example.cpp
+++ b/examples/StandaloneMain/main_sw_tinyrenderer_single_example.cpp
@@ -110,7 +110,7 @@ public:
    	    int shapeIndex = OpenGLGuiHelper::registerGraphicsShape(vertices,numvertices,indices,numIndices);
    	    if (shapeIndex>=0)
         {
-            TinyRenderObjectData* swObj = new TinyRenderObjectData(m_swWidth,m_swHeight,m_rgbColorBuffer,m_depthBuffer);
+            TinyRenderObjectData* swObj = new TinyRenderObjectData(m_rgbColorBuffer,m_depthBuffer);
         float rgbaColor[4] = {1,1,1,1};    
 	swObj->registerMeshShape(vertices,numvertices,indices,numIndices,rgbaColor);
 			//swObj->createCube(1,1,1);//MeshShape(vertices,numvertices,indices,numIndices);
diff --git a/examples/StandaloneMain/main_tinyrenderer_single_example.cpp b/examples/StandaloneMain/main_tinyrenderer_single_example.cpp
index 157ab233c..565b771e7 100644
--- a/examples/StandaloneMain/main_tinyrenderer_single_example.cpp
+++ b/examples/StandaloneMain/main_tinyrenderer_single_example.cpp
@@ -253,7 +253,7 @@ struct TinyRendererGUIHelper : public GUIHelperInterface
 	{
 		int shapeIndex = m_swRenderObjects.size();
 
-		TinyRenderObjectData* swObj = new TinyRenderObjectData(m_swWidth,m_swHeight,m_rgbColorBuffer,m_depthBuffer);
+		TinyRenderObjectData* swObj = new TinyRenderObjectData(m_rgbColorBuffer,m_depthBuffer);
         float rgbaColor[4] = {1,1,1,1};
 	swObj->registerMeshShape(vertices,numvertices,indices,numIndices,rgbaColor);
 		//swObj->createCube(1,1,1);//MeshShape(vertices,numvertices,indices,numIndices);
diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp
index e13f97077..aebf0440e 100644
--- a/examples/TinyRenderer/TinyRenderer.cpp
+++ b/examples/TinyRenderer/TinyRenderer.cpp
@@ -231,8 +231,11 @@ TinyRenderObjectData::~TinyRenderObjectData()
     delete m_model;
 }
 
-void TinyRenderer::renderObject(TinyRenderObjectData& renderData, int width, int height)
+void TinyRenderer::renderObject(TinyRenderObjectData& renderData)
 {
+	int width = renderData.m_rgbColorBuffer.get_width();
+	int height = renderData.m_rgbColorBuffer.get_height();
+
 	Vec3f light_dir_local = Vec3f(renderData.m_lightDirWorld[0],renderData.m_lightDirWorld[1],renderData.m_lightDirWorld[2]);
     Model* model = renderData.m_model;
     if (0==model)
diff --git a/examples/TinyRenderer/TinyRenderer.h b/examples/TinyRenderer/TinyRenderer.h
index cfe857eca..c6f4f9821 100644
--- a/examples/TinyRenderer/TinyRenderer.h
+++ b/examples/TinyRenderer/TinyRenderer.h
@@ -47,7 +47,7 @@ struct TinyRenderObjectData
 class TinyRenderer
 {
     public:
-        static void renderObject(TinyRenderObjectData& renderData, int width, int height);
+        static void renderObject(TinyRenderObjectData& renderData);
 };
 
 #endif // TINY_RENDERER_Hbla
diff --git a/examples/TinyRenderer/main.cpp b/examples/TinyRenderer/main.cpp
index 9995b8f66..32f5e7edd 100644
--- a/examples/TinyRenderer/main.cpp
+++ b/examples/TinyRenderer/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
         b3AlignedObjectArray<float> depthBuffer;
 	depthBuffer.resize(gWidth*gHeight);
  
-	TinyRenderObjectData renderData(textureWidth, textureHeight,rgbColorBuffer,depthBuffer);//, "african_head/african_head.obj");//floor.obj");
+	TinyRenderObjectData renderData(rgbColorBuffer,depthBuffer);//, "african_head/african_head.obj");//floor.obj");
 	
 	//renderData.loadModel("african_head/african_head.obj");
 	renderData.loadModel("floor.obj");