From 238ba8c642a4c5f4de392dfc7fb6fb4dddd51571 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 12 Aug 2016 14:28:02 -0700 Subject: [PATCH] remote a c++11-style constructor --- examples/TinyRenderer/TinyRenderer.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp index a382c1564..b81ce57ed 100644 --- a/examples/TinyRenderer/TinyRenderer.cpp +++ b/examples/TinyRenderer/TinyRenderer.cpp @@ -88,12 +88,25 @@ struct Shader : public IShader { }; TinyRenderObjectData::TinyRenderObjectData(TGAImage& rgbColorBuffer,b3AlignedObjectArray&depthBuffer) -:TinyRenderObjectData(rgbColorBuffer,depthBuffer,0,0) +:m_rgbColorBuffer(rgbColorBuffer), +m_depthBuffer(depthBuffer), +m_segmentationMaskBufferPtr(0), +m_model(0), +m_userData(0), +m_userIndex(-1), +m_objectIndex(-1) { - + Vec3f eye(1,1,3); + Vec3f center(0,0,0); + Vec3f up(0,0,1); + m_lightDirWorld.setValue(0,0,0); + m_localScaling.setValue(1,1,1); + m_modelMatrix = Matrix::identity(); + } + TinyRenderObjectData::TinyRenderObjectData(TGAImage& rgbColorBuffer,b3AlignedObjectArray&depthBuffer, b3AlignedObjectArray* segmentationMaskBuffer, int objectIndex) :m_rgbColorBuffer(rgbColorBuffer), m_depthBuffer(depthBuffer),