updated porting notes to discuss MOAICamera consolidation; fixed ‘win…

…dow’ more camera to scale Z to 0

docs/moai 2.0 - porting notes.md

@@ -45,6 +45,12 @@ Is now:
 
 prop:moveLoc(x, y, z, t)
 
+## MOAICamera consolidation
+
+2D, 3D or ortho cameras have been consolidated into a single class: MOAICamera. To set the camera type, use MOAICamera.setType() with one of MOAICamera.CAMERA_TYPE_3D, MOAICamera.CAMERA_TYPE_ORTHO, MOAICamera.CAMERA_TYPE_WINDOW.
+
+The '3D' and 'ortho' camera types are simply perspective and orthographic projects. The 'window' camera type is an ortho projection that ignores that discards the Z axis (by scaling Z to 0). This elimates depth information, but also the effect of the near/far plane settings.
+
 ## Partition membership
 
 MOAIPartitionHull now exists independently of MOAIProp. MOAIPartitionHull inherits MOAITransform and represents membership in a partition, dimenionality (having bounds or existing boundlessly in global space), and placement (having a location and orientation in space).

samples/layer-camera/main.lua

@@ -10,22 +10,22 @@ viewport = MOAIViewport.new ()
 viewport:setSize ( 320, 480 )
 viewport:setScale ( 320, 480 )
 
-camera = MOAICamera2D.new ()
+camera = MOAICamera.new ()
 
-camera:moveLoc ( 128, 0, 3 )
-camera:moveRot ( 180, 3 )
-camera:moveScl ( 1, 1, 3 )
+camera:moveLoc ( 128, 0, 0, 3 )
+camera:moveRot ( 0, 0, 180, 3 )
+camera:moveScl ( 1, 1, 0, 3 )
 
 layer = MOAIPartitionViewLayer.new ()
 layer:setViewport ( viewport )
 layer:setCamera ( camera )
 layer:pushRenderPass ()
 
-gfxQuad = MOAIGfxQuad2D.new ()
-gfxQuad:setTexture ( "moai.png" )
-gfxQuad:setRect ( -64, -64, 64, 64 )
+spriteDeck = MOAISpriteDeck2D.new ()
+spriteDeck:setTexture ( '../resources/moai.png' )
+spriteDeck:setRect ( -64, -64, 64, 64 )
 
 prop = MOAIProp.new ()
-prop:setDeck ( gfxQuad )
+prop:setDeck ( spriteDeck )
 prop:setPartition ( layer )
 

src/moai-sim/MOAICamera.cpp

@@ -412,12 +412,10 @@ ZLMatrix4x4 MOAICamera::GetProjMtx ( const MOAIViewport& viewport ) const {
 			case CAMERA_TYPE_WINDOW:
 			default: {
 
-				ZLRect rect = viewport.GetRect ();
+				float xScale = ( 2.0f / viewport.Width ()) * viewScale.mX;
+				float yScale = ( 2.0f / viewport.Height ()) * viewScale.mY;
 
-				float xScale = ( 2.0f / rect.Width ()) * viewScale.mX;
-				float yScale = ( 2.0f / rect.Height ()) * viewScale.mY;
-
-				mtx.Scale ( xScale, yScale, -1.0f );
+				mtx.Scale ( xScale, yScale, 0.0 );
 			}
 		}
 	}