[Hgengine-cvs] SF.net SVN: hgengine:[628] Mercury2

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

Revision: 628
          http://hgengine.svn.sourceforge.net/hgengine/?rev=628&view=rev
Author:   axlecrusher
Date:     2009-12-14 20:27:01 +0000 (Mon, 14 Dec 2009)

Log Message:
-----------
updates for particles

Modified Paths:
--------------
    Mercury2/Themes/default/File/scenegraph.xml
    Mercury2/Themes/default/Graphic/test.frag
    Mercury2/Themes/default/Graphic/test.vert
    Mercury2/modules.xml

Modified: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml	2009-12-14 20:17:42 UTC (rev 627)
+++ Mercury2/Themes/default/File/scenegraph.xml	2009-12-14 20:27:01 UTC (rev 628)
@@ -17,6 +17,7 @@
 				<asset type="texture" file="MODEL:map.png"/>
 				<asset type="terrain" file="MODEL:map.hgmdl" />
 			</node>
+			
 			<node type="mercurynode" name="lampForest" >
 				<node type="transformnode" movz="-5" movx="0" movy="0" name="lamprow" >
 					<node type="mercurynode" name="lamp">
@@ -24,12 +25,24 @@
 							<asset type="texture" file="MODEL:lamp.png"/>
 							<asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
 						</node>
-						<node type="billboardnode" billboardaxis="0,-1,0" spheremode="true" >
+<!--						<node type="billboardnode" billboardaxis="0,-1,0" spheremode="true" >
 							<node type="transformnode" scalex="0.1" scaley="0.1" alphaPath="true">
 								<asset type="StateChanger" file="ColorChange:1,0,1,1" />
 								<asset type="texture" file="GRAPHIC:flame.png"/>
 								<asset type="quad"/>
 							</node>
+						</node> -->
+<!--						<asset type="StateChanger" file="DepthWrite:0" />
+						state changer needs some work for proper on and off.
+						until then had code it for all particles -->
+						<node type="particleemitter" texture="GRAPHIC:flame.png">
+							<asset type="texture" file="GRAPHIC:flame.png"/>
+							<asset type="shader" file="GRAPHIC:FireParticles"/>
+							<particle>
+								<node type="transformnode" scalex="0.075" scaley="0.075" scalez="0.075" alphaPath="false">
+									<asset type="quad"/>
+								</node>
+							</particle>
 						</node>
 					</node>
 					<node type="transformnode" movx="1" fallback="lamprow.lamp" />

Modified: Mercury2/Themes/default/Graphic/test.frag
===================================================================
--- Mercury2/Themes/default/Graphic/test.frag	2009-12-14 20:17:42 UTC (rev 627)
+++ Mercury2/Themes/default/Graphic/test.frag	2009-12-14 20:27:01 UTC (rev 628)
@@ -1,4 +1,6 @@
+varying vec3 color;
+
 void main()
 {
-	gl_FragColor = vec4( 1., 0., 1., 1. );
-}
\ No newline at end of file
+	gl_FragColor = vec4( color, 1. );
+}

Modified: Mercury2/Themes/default/Graphic/test.vert
===================================================================
--- Mercury2/Themes/default/Graphic/test.vert	2009-12-14 20:17:42 UTC (rev 627)
+++ Mercury2/Themes/default/Graphic/test.vert	2009-12-14 20:27:01 UTC (rev 628)
@@ -1,4 +1,14 @@
+varying vec3 color;
+
+uniform vec4 HG_EyePos;
+uniform mat4 HG_ModelMatrix;
+
 void main()
 {
 	gl_Position = ftransform();
-}
\ No newline at end of file
+	color = vec3(0,0,1);
+
+	vec3 v = normalize(HG_EyePos - (HG_ModelMatrix*vec4(0,0,0,1))).xyz;
+
+	color = (v+1.0)*0.5;
+}

Modified: Mercury2/modules.xml
===================================================================
--- Mercury2/modules.xml	2009-12-14 20:17:42 UTC (rev 627)
+++ Mercury2/modules.xml	2009-12-14 20:27:01 UTC (rev 628)
@@ -3,5 +3,6 @@
 	<Module src="modules/BillboardNode.cpp" obj="modules/BillboardNode" func="InstallBillboardNode" class="BillboardNode" />
 	<Module src="modules/Terrain.cpp" obj="modules/Terrain" func="" class="TerrainNode"/>
 	<Module src="modules/TextPlate.cpp" obj="modules/TextPlate" func="InstallTextPlate" class="TextPlate"/>
+	<Module src="modules/ParticleEmitter.cpp" obj="modules/ParticleEmitter" func="InstallParticleEmitter" class="ParticleEmitter"/>
 	<Module src="modules/Cu2.cpp" obj="modules/Cu2" func="InstallCu2Element" class="Cu2Element"/>
 </Modules>


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