Browse Source

Fixed custom camera viewport.

Mark Sibly 7 years ago
parent
commit
8ffba864a2
1 changed files with 5 additions and 21 deletions
  1. 5 21
      modules/mojo3d/scene/entities/camera.monkey2

+ 5 - 21
modules/mojo3d/scene/entities/camera.monkey2

@@ -59,7 +59,6 @@ Class Camera Extends Entity
 		_view=view
 		
 		If _view SetViewport( _view.Rect )
-		
 	End
 
 	#rem monkeydoc Viewport.
@@ -75,7 +74,7 @@ Class Camera Extends Entity
 		
 	Setter( viewport:Recti )
 		
-		Assert( Not _view,"Viewport cannot be manually modified for a camera with view" )
+		Assert( Not _view,"Viewport cannot be manually modified for a camera with a view" )
 		
 		SetViewport( viewport )
 	End
@@ -169,26 +168,11 @@ Class Camera Extends Entity
 	#end
 	Method Render( canvas:Canvas )
 		
-		If _view
-			SetViewport( _view.Rect )
-		Else
-			SetViewport( New Recti( 0,0,canvas.RenderBounds.Size ) )
-		Endif
-		
-		Local target:=canvas.GraphicsDevice.RenderTarget
-		
-		Local targetSize:=canvas.GraphicsDevice.RenderTargetSize
-		
-'		Local viewport:=canvas.RenderMatrix * Viewport
-		Local viewport:=canvas.RenderBounds
-		
-'		Print "camera viewport="+viewport
-		
-		canvas.Flush()
-		
-		Local renderer:=Renderer.GetCurrent()
+		If _view SetViewport( _view.Rect )
+			
+		Local gdevice:=canvas.GraphicsDevice
 		
-		renderer.Render( target,targetSize,viewport,Scene,InverseMatrix,ProjectionMatrix,Near,Far )
+		Renderer.GetCurrent().Render( gdevice.RenderTarget,gdevice.RenderTargetSize,Viewport,Scene,InverseMatrix,ProjectionMatrix,Near,Far )
 	End
 	
 	#rem monkeydoc Converts a point from world coordinates to viewport coordinates.