[Hgengine-cvs] SF.net SVN: hgengine:[468] Mercury2/Themes/default

[<axl...@us...>]

Revision: 468
          http://hgengine.svn.sourceforge.net/hgengine/?rev=468&view=rev
Author:   axlecrusher
Date:     2009-08-10 00:39:17 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
updates

Modified Paths:
--------------
    Mercury2/Themes/default/File/scenegraphDeferred.xml
    Mercury2/Themes/default/Graphic/globalLight.frag
    Mercury2/Themes/default/Graphic/pointLight.frag

Modified: Mercury2/Themes/default/File/scenegraphDeferred.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraphDeferred.xml	2009-08-10 00:38:39 UTC (rev 467)
+++ Mercury2/Themes/default/File/scenegraphDeferred.xml	2009-08-10 00:39:17 UTC (rev 468)
@@ -1,6 +1,8 @@
 <SceneGraph name="root">
 	<node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100" name="vp">
 		<node type="cameranode" movx="0" movz="0" movy="0" rotx="0" roty="0" rotz="0" name="camera">
+			<asset type="texture" file="screenFBO_0" dynamic="true"/>
+			<asset type="texture" file="screenFBO_1" dynamic="true"/>
 			<node type="mercuryfbo" width="640" height="480" depth="true" tnum="2" name="screenFBO" usescreensize="true" colorbyte0="RGBA16F" colorbyte1="RGBA16F">
 				<asset type="shader" file="GRAPHIC:differedStep1"/>
 				<node type="transformnode" movz="0" movx="0" movy="2">
@@ -15,7 +17,7 @@
 						<node type="transformnode" rotx="-90" >
 							<asset type="texture" file="MODEL:lamp.png"/>
 							<asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
-							<node type="light" atten="0.7,5,0" shader="GRAPHIC:pointLight" />
+							<node type="light" atten="0.7,0,30" power="4.0" shader="GRAPHIC:pointLight" />
 						</node>
 						<node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
 							<node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
@@ -35,8 +37,6 @@
 
 				</node>
 			</node>
-			<asset type="texture" file="screenFBO_0" dynamic="true"/>
-			<asset type="texture" file="screenFBO_1" dynamic="true"/>
 			<asset type="renderdifferedlights"/>
 		</node>
 	</node>

Modified: Mercury2/Themes/default/Graphic/globalLight.frag
===================================================================
--- Mercury2/Themes/default/Graphic/globalLight.frag	2009-08-10 00:38:39 UTC (rev 467)
+++ Mercury2/Themes/default/Graphic/globalLight.frag	2009-08-10 00:39:17 UTC (rev 468)
@@ -47,7 +47,7 @@
 
 	if( dist > HG_LightAtten.w ) discard;
 
-	float att = 1.0 / (HG_LightAtten.x + HG_LightAtten.y * dist +
+	float att = HG_LightColor.a / (HG_LightAtten.x + HG_LightAtten.y * dist +
 	HG_LightAtten.z * dist * dist);
 
 	vec3 diffuse = texture2D(HG_Texture1, coord).rgb;
@@ -59,7 +59,7 @@
 
 	vec3 color = diffuse;
 
-	color += specular;
+	color += specular*float(NdotL>0.0); //no speculat on back faces
 	color *= att;
 
 	gl_FragColor.rgb = clamp(color, 0.0, 1.0);

Modified: Mercury2/Themes/default/Graphic/pointLight.frag
===================================================================
--- Mercury2/Themes/default/Graphic/pointLight.frag	2009-08-10 00:38:39 UTC (rev 467)
+++ Mercury2/Themes/default/Graphic/pointLight.frag	2009-08-10 00:39:17 UTC (rev 468)
@@ -41,7 +41,7 @@
 
 	if( dist > HG_LightAtten.w ) discard;
 
-	float att = 1.0 / (HG_LightAtten.x + HG_LightAtten.y * dist +
+	float att = HG_LightColor.a / (HG_LightAtten.x + HG_LightAtten.y * dist +
 	HG_LightAtten.z * dist * dist);
 
 	vec3 diffuse = texture2D(HG_Texture1, coord).rgb;
@@ -53,7 +53,7 @@
 
 	vec3 color = diffuse;
 
-	color += specular;
+	color += specular*float(NdotL>0.0); //no speculat on back faces
 	color *= att;
 
 	gl_FragColor.rgb = clamp(color, 0.0, 1.0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.