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

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

Revision: 644
          http://hgengine.svn.sourceforge.net/hgengine/?rev=644&view=rev
Author:   axlecrusher
Date:     2009-12-24 21:28:19 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
better looking fire

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

Added Paths:
-----------
    Mercury2/Themes/default/Graphic/flame2.png

Modified: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml	2009-12-24 20:44:59 UTC (rev 643)
+++ Mercury2/Themes/default/File/scenegraph.xml	2009-12-24 21:28:19 UTC (rev 644)
@@ -37,7 +37,7 @@
 						until then had code it for all particles -->
 						<node type="transformnode" scalex="0.1" scaley="0.1" scalez="0.1">
 							<asset type="shader" file="GRAPHIC:FireParticles"/>
-							<asset type="texture" file="GRAPHIC:flame.png"/>
+							<asset type="texture" file="GRAPHIC:flame2.png"/>
 							<node type="particleemitter"/>
 						</node>
 					</node>

Modified: Mercury2/Themes/default/Graphic/FireParticles.frag
===================================================================
--- Mercury2/Themes/default/Graphic/FireParticles.frag	2009-12-24 20:44:59 UTC (rev 643)
+++ Mercury2/Themes/default/Graphic/FireParticles.frag	2009-12-24 21:28:19 UTC (rev 644)
@@ -19,4 +19,4 @@
 
 	gl_FragData[0] = texture2D(HG_Texture0, gl_TexCoord[0].st)*color;
 	gl_FragData[0].a *= 1.0-(particleData.x/particleData.y);
-}
\ No newline at end of file
+}

Modified: Mercury2/Themes/default/Graphic/FireParticles.vert
===================================================================
--- Mercury2/Themes/default/Graphic/FireParticles.vert	2009-12-24 20:44:59 UTC (rev 643)
+++ Mercury2/Themes/default/Graphic/FireParticles.vert	2009-12-24 21:28:19 UTC (rev 644)
@@ -43,7 +43,9 @@
 	vec3 up = cross(objLookAt, objToEye);
 	float angleCos = dot(objLookAt, objToEye);
 
-	return glRotate(-acos(angleCos), up);
+	//add in an extra rotation around y to make particles look more unique
+	float o = 360.0*((particleData.z-50000.0)/50000.0);
+	return glRotate(-acos(angleCos), up)*glRotate(o, vec3(0,0,1));
 }
 
 void main()
@@ -51,7 +53,7 @@
  	particleData = gl_Color; 
 
 	vec4 pos = vec4(1.0);
-	pos.y = 0.6*(particleData.x*particleData.x);
+	pos.y = 0.3*(particleData.x*particleData.x);
 	pos.x = 0.40*((particleData.z-50000.0)/50000.0)*particleData.x; //rand num
 	pos.z = 0.40*((particleData.w-50000.0)/50000.0)*particleData.x; //rand num
 

Added: Mercury2/Themes/default/Graphic/flame2.png
===================================================================
(Binary files differ)


Property changes on: Mercury2/Themes/default/Graphic/flame2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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