From 88289c032ef7c6721df61e891d00682cb76b7a13 Mon Sep 17 00:00:00 2001
From: Erwin Coumans
 <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>
Date: Sat, 18 Nov 2017 17:20:21 -0800
Subject: [PATCH] fix canvas issues from previous commit

---
 examples/RenderingExamples/RaytracerSetup.cpp   |  2 +-
 examples/RenderingExamples/TimeSeriesCanvas.cpp |  2 +-
 examples/RenderingExamples/TinyVRGui.cpp        |  2 +-
 examples/SharedMemory/PhysicsClientExample.cpp  | 13 +++++++------
 examples/SharedMemory/PhysicsServerExample.cpp  |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/RenderingExamples/RaytracerSetup.cpp b/examples/RenderingExamples/RaytracerSetup.cpp
index 28d08fc9f..550451459 100644
--- a/examples/RenderingExamples/RaytracerSetup.cpp
+++ b/examples/RenderingExamples/RaytracerSetup.cpp
@@ -142,7 +142,7 @@ void RaytracerPhysicsSetup::initPhysics()
 	if (m_internalData->m_canvas)
 	{
 		
-		m_internalData->m_canvasIndex = m_internalData->m_canvas->createCanvas("raytracer",m_internalData->m_width,m_internalData->m_height);
+		m_internalData->m_canvasIndex = m_internalData->m_canvas->createCanvas("raytracer",m_internalData->m_width,m_internalData->m_height, 15,55);
 		for (int i=0;i<m_internalData->m_width;i++)
 		{
 			for (int j=0;j<m_internalData->m_height;j++)
diff --git a/examples/RenderingExamples/TimeSeriesCanvas.cpp b/examples/RenderingExamples/TimeSeriesCanvas.cpp
index 096579839..60140b10e 100644
--- a/examples/RenderingExamples/TimeSeriesCanvas.cpp
+++ b/examples/RenderingExamples/TimeSeriesCanvas.cpp
@@ -78,7 +78,7 @@ TimeSeriesCanvas::TimeSeriesCanvas(struct Common2dCanvasInterface* canvasInterfa
 
 	if (canvasInterface)
 	{
-		m_internalData->m_canvasIndex = m_internalData->m_canvasInterface->createCanvas(windowTitle,m_internalData->m_width,m_internalData->m_height);
+		m_internalData->m_canvasIndex = m_internalData->m_canvasInterface->createCanvas(windowTitle,m_internalData->m_width,m_internalData->m_height,20,50);
 	}
 }
 
diff --git a/examples/RenderingExamples/TinyVRGui.cpp b/examples/RenderingExamples/TinyVRGui.cpp
index 368606bf0..0b125dd33 100644
--- a/examples/RenderingExamples/TinyVRGui.cpp
+++ b/examples/RenderingExamples/TinyVRGui.cpp
@@ -28,7 +28,7 @@ struct TestCanvasInterface2 : public Common2dCanvasInterface
 
 	virtual ~TestCanvasInterface2() 
 	{}
-	virtual int createCanvas(const char* canvasName, int width, int height)
+	virtual int createCanvas(const char* canvasName, int width, int height,int posX,int posY)
 	{
 		return 0;
 	}
diff --git a/examples/SharedMemory/PhysicsClientExample.cpp b/examples/SharedMemory/PhysicsClientExample.cpp
index bdc65dac2..86aaa1a8a 100644
--- a/examples/SharedMemory/PhysicsClientExample.cpp
+++ b/examples/SharedMemory/PhysicsClientExample.cpp
@@ -22,8 +22,9 @@ struct MyMotorInfo2
     int     m_qIndex;
 };
 
-static int camVisualizerWidth = 320;//1024/3;
-static int camVisualizerHeight = 240;//768/3;
+
+static int camVisualizerWidth = 228;//1024/3;
+static int camVisualizerHeight = 192;//768/3;
 
 enum CustomCommands
 {
@@ -758,10 +759,10 @@ void	PhysicsClientExample::initPhysics()
 		m_canvas = m_guiHelper->get2dCanvasInterface();
 		if (m_canvas)
 		{
-		    
-			m_canvasRGBIndex = m_canvas->createCanvas("Synthetic Camera RGB data",camVisualizerWidth, camVisualizerHeight);
-			m_canvasDepthIndex = m_canvas->createCanvas("Synthetic Camera Depth data",camVisualizerWidth, camVisualizerHeight);
-			m_canvasSegMaskIndex = m_canvas->createCanvas("Synthetic Camera Segmentation Mask",camVisualizerWidth, camVisualizerHeight);
+		   	 m_canvasRGBIndex = m_canvas->createCanvas("Synthetic Camera RGB data",camVisualizerWidth, camVisualizerHeight, 8,55);
+                        m_canvasDepthIndex = m_canvas->createCanvas("Synthetic Camera Depth data",camVisualizerWidth, camVisualizerHeight,8,75+camVisualizerHeight);
+                        m_canvasSegMaskIndex = m_canvas->createCanvas("Synthetic Camera Segmentation Mask",camVisualizerWidth, camVisualizerHeight,8,95+camVisualizerHeight*2);
+
 
 			for (int i=0;i<camVisualizerWidth;i++)
 			{
diff --git a/examples/SharedMemory/PhysicsServerExample.cpp b/examples/SharedMemory/PhysicsServerExample.cpp
index ebadcad29..518f1b657 100644
--- a/examples/SharedMemory/PhysicsServerExample.cpp
+++ b/examples/SharedMemory/PhysicsServerExample.cpp
@@ -2138,7 +2138,7 @@ void	PhysicsServerExample::updateGraphics()
 										btScalar maxDepthValue = frustumZFar;
 
 										float depth = depthValue;
-										double linearDepth = 255.*(2.0 * frustumZNear) / (frustumZFar + frustumZNear - depth * (frustumZFar - frustumZNear));
+										btScalar linearDepth = 255.*(2.0 * frustumZNear) / (frustumZFar + frustumZNear - depth * (frustumZFar - frustumZNear));
 										btClamp(linearDepth, btScalar(0),btScalar(255));
 										rgb =  linearDepth;