Przeglądaj źródła

Added Scene.EnvColor.

Mark Sibly 8 lat temu
rodzic
commit
b0673c35b2

+ 7 - 0
modules/mojo3d/graphics/renderer.monkey2

@@ -134,10 +134,14 @@ Class Renderer
 		
 		_runiforms.SetTexture( "EnvTexture",env )
 		
+		_runiforms.SetColor( "EnvColor",_renderScene.EnvColor )
+		
 		_renderQueue.Clear()
 		
 		_renderQueue.Time=time
 		
+		_renderQueue.AddShadowOps=False
+			
 		For Local model:=Eachin _renderScene.Models
 			
 			_renderQueue.AddShadowOps=model.CastsShadow
@@ -162,10 +166,13 @@ Class Renderer
 		Local viewMat:=_renderCamera.InverseMatrix
 		Local projMat:=_renderCamera.ProjectionMatrix
 		Local invProjMat:=-projMat
+		
 			
 		_runiforms.SetMat3f( "EnvMatrix",envMat )
 		_runiforms.SetMat4f( "ProjectionMatrix",projMat )
 		_runiforms.SetMat4f( "InverseProjectionMatrix",invProjMat )
+		_runiforms.SetMat4f( "ViewMatrix",_renderCamera.InverseMatrix )
+		_runiforms.SetMat4f( "CameraMatrix",_renderCamera.Matrix )
 		_runiforms.SetFloat( "DepthNear",_renderCamera.Near )
 		_runiforms.SetFloat( "DepthFar",_renderCamera.Far )
 		

+ 23 - 14
modules/mojo3d/graphics/scene.monkey2

@@ -25,11 +25,11 @@ Class Scene Extends DynamicObject
 	#end
 	Property SkyTexture:Texture()
 		
-		Return _skytex
+		Return _skyTexture
 	
-	Setter( skytex:Texture )
+	Setter( texture:Texture )
 		
-		_skytex=skytex
+		_skyTexture=texture
 	End
 	
 	#rem monkeydoc The environment texture.
@@ -45,11 +45,23 @@ Class Scene Extends DynamicObject
 	#end
 	Property EnvTexture:Texture()
 		
-		Return _envtex
+		Return _envTexture
 	
-	Setter( envtex:Texture )
+	Setter( texture:Texture )
 		
-		_envtex=envtex
+		_envTexture=texture
+	End
+	
+	#rem monkey The environment color.
+	
+	#end
+	Property EnvColor:Color()
+		
+		Return _envColor
+	
+	Setter( color:Color )
+		
+		_envColor=color
 	End
 	
 	#rem monkeydoc The clear color.
@@ -171,11 +183,6 @@ Class Scene Extends DynamicObject
 		Return _models
 	End
 	
-	Property Terrains:Stack<Terrain>()
-		
-		Return _terrains
-	End
-	
 	Property Sprites:Stack<Sprite>()
 		
 		Return _sprites
@@ -192,8 +199,11 @@ Class Scene Extends DynamicObject
 	
 	Global _defaultEnv:Texture
 	
-	Field _skytex:Texture
-	Field _envtex:Texture
+	Field _skyTexture:Texture
+	
+	Field _envTexture:Texture
+	Field _envColor:Color
+	
 	Field _clearColor:Color
 	Field _ambientDiffuse:Color
 	Field _postEffects:=New Stack<PostEffect>
@@ -203,7 +213,6 @@ Class Scene Extends DynamicObject
 	Field _cameras:=New Stack<Camera>
 	Field _lights:=New Stack<Light>
 	Field _models:=New Stack<Model>
-	Field _terrains:=New Stack<Terrain>
 	Field _sprites:=New Stack<Sprite>
 	Field _psystems:=New Stack<ParticleSystem>