vegastrike-cvs Mailing List for Vega Strike (Page 3)

Brought to you by: ace123, ashieh, danielrh, hellcatv, and 3 others

vegastrike-cvs — CVS messages

You can subscribe to this list here.

2004	Jan	Feb (72)	Mar (274)	Apr (274)	May (123)	Jun (111)	Jul (210)	Aug (165)	Sep (172)	Oct (222)	Nov (196)	Dec (407)
2005	Jan (116)	Feb (288)	Mar (98)	Apr (24)	May (150)	Jun (65)	Jul (88)	Aug (164)	Sep (103)	Oct (145)	Nov (1126)	Dec (190)
2006	Jan (79)	Feb (29)	Mar (32)	Apr (33)	May (42)	Jun (27)	Jul (103)	Aug (217)	Sep (136)	Oct (36)	Nov (41)	Dec (12)
2007	Jan (30)	Feb (34)	Mar (52)	Apr (11)	May (14)	Jun (22)	Jul (121)	Aug (191)	Sep (112)	Oct (67)	Nov (27)	Dec (8)
2008	Jan (59)	Feb (108)	Mar (169)	Apr (119)	May (99)	Jun (60)	Jul (20)	Aug (25)	Sep (19)	Oct (43)	Nov (7)	Dec (16)
2009	Jan (8)	Feb (17)	Mar (12)	Apr (2)	May (4)	Jun	Jul	Aug (4)	Sep (2)	Oct (4)	Nov (2)	Dec (9)
2010	Jan (37)	Feb (58)	Mar (92)	Apr (10)	May (21)	Jun	Jul (20)	Aug (73)	Sep (37)	Oct (7)	Nov (28)	Dec (38)
2011	Jan (23)	Feb (85)	Mar (73)	Apr (13)	May (1)	Jun (3)	Jul (3)	Aug (3)	Sep (17)	Oct (3)	Nov (32)	Dec (28)
2012	Jan (30)	Feb (11)	Mar (25)	Apr (17)	May (20)	Jun (1)	Jul (13)	Aug (3)	Sep (14)	Oct (15)	Nov (22)	Dec (12)
2013	Jan (33)	Feb (39)	Mar (80)	Apr (8)	May	Jun (6)	Jul (22)	Aug	Sep (5)	Oct (1)	Nov (5)	Dec (1)
2014	Jan	Feb (1)	Mar (10)	Apr	May (1)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug (17)	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun (12)	Jul (9)	Aug (8)	Sep	Oct	Nov	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb (2)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 329 > >> (Page 3 of 329)

[Vegastrike-cvs] SF.net SVN: vegastrike:[13683] branches/jacks/platform/

From: <ja...@us...> - 2015-08-04 22:28:14

Revision: 13683
          http://sourceforge.net/p/vegastrike/code/13683
Author:   jacks
Date:     2015-08-04 22:28:13 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
collation for conversion

Added Paths:
-----------
    branches/jacks/platform/

[Vegastrike-cvs] SF.net SVN: vegastrike:[13682] trunk/vegastrike/CMakeLists.txt

From: <kla...@us...> - 2015-04-08 04:11:22

Revision: 13682
          http://sourceforge.net/p/vegastrike/code/13682
Author:   klaussfreire
Date:     2015-04-08 04:11:19 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Add option to disable Ogre support

Modified Paths:
--------------
    trunk/vegastrike/CMakeLists.txt

Modified: trunk/vegastrike/CMakeLists.txt
===================================================================
--- trunk/vegastrike/CMakeLists.txt	2014-08-10 19:40:39 UTC (rev 13681)
+++ trunk/vegastrike/CMakeLists.txt	2015-04-08 04:11:19 UTC (rev 13682)
@@ -884,17 +884,23 @@
 
 #Find Ogre
 
-find_package(OGRE)
-IF(OGRE_FOUND)
-    SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
-    SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
-    add_definitions(${OGRE_DEFINITIONS})
-    SET(HAVE_OGRE 1)
-    message("++ Found Ogre: ${OGRE_VERSION}")
-ELSE(OGRE_FOUND)
-    message("-- Ogre Not Found: compiling without")
-ENDIF(OGRE_FOUND)
+OPTION(DISABLE_OGRE "Disable Ogre-mesh support in mesh tool" OFF)
 
+IF(NOT DISABLE_OGRE)
+  find_package(OGRE)
+  IF(OGRE_FOUND)
+      SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
+      SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
+      add_definitions(${OGRE_DEFINITIONS})
+      SET(HAVE_OGRE 1)
+      message("++ Found Ogre: ${OGRE_VERSION}")
+  ELSE(OGRE_FOUND)
+      message("-- Ogre Not Found: compiling without")
+  ENDIF(OGRE_FOUND)
+ELSE(NOT DISABLE_OGRE)
+  message("-- Ogre disabled")
+ENDIF(NOT DISABLE_OGRE)
+
 IF(NOT BEOS)
 	FIND_LIBRARY(UTIL_LIB util)
 ELSE (NOT BEOS)

[Vegastrike-cvs] SF.net SVN: vegastrike:[13681] trunk/data/programs/planet

From: <kla...@us...> - 2014-08-10 19:40:47

Revision: 13681
          http://sourceforge.net/p/vegastrike/code/13681
Author:   klaussfreire
Date:     2014-08-10 19:40:39 +0000 (Sun, 10 Aug 2014)
Log Message:
-----------
Avoid duplication of code, include cloud/ground vs in version #130 variants

Modified Paths:
--------------
    trunk/data/programs/planet/cloud_vs1.1.130.vp
    trunk/data/programs/planet/ground_vs1.1.130.vp

Modified: trunk/data/programs/planet/cloud_vs1.1.130.vp
===================================================================
--- trunk/data/programs/planet/cloud_vs1.1.130.vp	2014-08-10 18:16:59 UTC (rev 13680)
+++ trunk/data/programs/planet/cloud_vs1.1.130.vp	2014-08-10 19:40:39 UTC (rev 13681)
@@ -1,77 +1,3 @@
 #version 130
 
-#include "earth_params.h"
-#include "../stdlib_vp.h"
-
-#define outCloudCoord gl_TexCoord[0]
-#define outGroundCoord gl_TexCoord[1]
-#define outShadowCoord gl_TexCoord[2]
-#define outNoiseCoord gl_TexCoord[3]
-#define outCityCoord gl_TexCoord[4]
-
-varying vec3 varTSLight;
-varying vec3 varTSView;
-varying vec3 varWSNormal;
-
-uniform float fTime;
-
-float soffs(float lim, float x)
-{
-  return x + ((x>=0.0)?lim:-lim);
-}
-
-vec2 shadowExtrude(in vec2 texcoord, in vec3 direction, float mult)
-{
-  return texcoord + direction.xy * fAtmosphereExtrusion.x * fShadowRelHeight.x / soffs(0.1,direction.z) * mult;
-}
-
-void main()
-{
-   // Compute position, eye-to-object direction and normalized world-space normal
-   vec4 extrudedPosition = gl_Vertex + vec4(normalize(gl_Normal.xyz),0.0) * fAtmosphereExtrusion.x * fShadowRelHeight.x;
-   vec3 normal   = normalize(gl_NormalMatrix * gl_Normal);
-   vec3 tangent  = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz);
-   vec3 binormal = cross(tangent, normal) * sign(gl_MultiTexCoord2.w);
-   
-   // Extrude sphere
-   vec4 position = gl_ModelViewMatrix * extrudedPosition;
-   vec3 eyetopos = normalize(position.xyz);
-   
-   vec4 lightpos;
-   float lightatt;
-   lightPosSizeAndAtt0(position, lightpos, lightatt);
-   
-   // TS view vector
-   varTSView.x = dot( tangent, -eyetopos );
-   varTSView.y = dot( binormal, -eyetopos );
-   varTSView.z = dot( normal, -eyetopos );
-   
-   // TS light posision
-   varTSLight.x = dot( tangent, lightpos.xyz );
-   varTSLight.y = dot( binormal, lightpos.xyz );
-   varTSLight.z = dot( normal, lightpos.xyz );
-   
-   // WS normal
-   varWSNormal = normal;
-   
-   // Load varyings
-   outCloudCoord       = gl_MultiTexCoord0 + fTime*fvCloudLayerDrift.xyxy;
-   outNoiseCoord       = gl_MultiTexCoord0 - fTime*fvCloudLayerDrift.xyxy;
-   outCityCoord        = gl_MultiTexCoord0;
-   outGroundCoord      = shadowExtrude(outCloudCoord.xy, varTSView, 1.0).xyxy;
-   outShadowCoord      = shadowExtrude(outGroundCoord.xy, varTSLight, -1.0).xyxy;
-   
-   // set primary color to the emissive material properties
-   vec4 pc = gl_FrontMaterial.emission;
-   vec4 sc = vec4(0.0);
-   pc.a = fvCloudColor.a * fCloudLayerDensity;
-   
-   pc.rgb += fvCloudColor.rgb * gl_LightSource[0].diffuse.rgb * lightatt;
-   sc.rgb += fvCloudColor.rgb * gl_LightSource[0].specular.rgb * lightatt;
-   
-   // Need this instead of ftransform() for invariance
-   gl_Position = gl_ModelViewProjectionMatrix * extrudedPosition;
-   gl_FrontColor = gl_BackColor = pc;
-   gl_FrontSecondaryColor = gl_BackSecondaryColor = sc;
-}
-
+#include "cloud_vs1.1.vp"

Modified: trunk/data/programs/planet/ground_vs1.1.130.vp
===================================================================
--- trunk/data/programs/planet/ground_vs1.1.130.vp	2014-08-10 18:16:59 UTC (rev 13680)
+++ trunk/data/programs/planet/ground_vs1.1.130.vp	2014-08-10 19:40:39 UTC (rev 13681)
@@ -1,67 +1,3 @@
 #version 130
 
-#include "earth_params.h"
-#include "../stdlib_vp.h"
-
-uniform float fTime;
-
-varying vec3 varTSLight;
-varying vec3 varTSView;
-
-
-float soffs(float lim, float x)
-{
-  return x + ((x>=0.0)?lim:-lim);
-}
-
-vec2 shadowExtrude(in vec2 texcoord, in vec3 direction)
-{
-  return texcoord - direction.xy * fAtmosphereExtrusion.x * fvCloudLayerDrift_ShadowRelHeight.w / soffs(0.1,direction.z);
-}
-
-void main() 
-{
-  // Compute position, eye-to-object direction and normalized world-space normal
-  vec4 position = gl_ModelViewMatrix * gl_Vertex;
-  vec3 eyetopos = normalize(position.xyz);
-  vec3 normal   = normalize(gl_NormalMatrix * gl_Normal);
-  vec3 tangent  = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz);
-  vec3 binormal = cross(tangent, normal) * sign(gl_MultiTexCoord2.w);
-  vec4 lightpos;
-  float lightatt; 
-  lightPosSizeAndAtt0(position, lightpos, lightatt);
-  
-  // Load varyings
-  gl_TexCoord[0] = gl_MultiTexCoord0;
-  
-  // TS view vector
-  varTSView.x = dot( tangent, -eyetopos );
-  varTSView.y = dot( binormal, -eyetopos );
-  varTSView.z = dot( normal, -eyetopos );
-  
-  // TS light posision
-  varTSLight.x = dot( tangent, lightpos.xyz );
-  varTSLight.y = dot( binormal, lightpos.xyz );
-  varTSLight.z = dot( normal, lightpos.xyz );
-  
-  // Cloud & shadow coords
-  vec2 cloudcoord = gl_MultiTexCoord0.xy + fTime*fvCloudLayerDrift_ShadowRelHeight.xy;
-  vec2 clouddetail= gl_MultiTexCoord0.xy - fTime*fvCloudLayerDrift_ShadowRelHeight.xy;
-  gl_TexCoord[1].zw = cloudcoord;
-  gl_TexCoord[1].xy = shadowExtrude(cloudcoord, varTSLight);
-  gl_TexCoord[2].xy = shadowExtrude(clouddetail, varTSLight);
-  gl_TexCoord[2].zw = vec2(0.0);
-  
-  // set primary color to the emissive material properties
-  vec4 pc = gl_FrontMaterial.emission;
-  vec4 sc = vec4(0.0);
-  
-  pc += gl_FrontMaterial.diffuse * gl_LightSource[0].diffuse * lightatt;
-  sc += gl_FrontMaterial.specular * gl_LightSource[0].specular * lightatt;
-  
-  // Need this instead of ftransform() for invariance
-  gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-  gl_FrontColor = gl_BackColor = pc;
-  gl_FrontSecondaryColor = gl_BackSecondaryColor = sc;
-}
-
+#include "ground_vs1.1.vp"

[Vegastrike-cvs] SF.net SVN: vegastrike:[13680] trunk/data

From: <kla...@us...> - 2014-08-10 18:17:08

Revision: 13680
          http://sourceforge.net/p/vegastrike/code/13680
Author:   klaussfreire
Date:     2014-08-10 18:16:59 +0000 (Sun, 10 Aug 2014)
Log Message:
-----------
Fix Mesa compatibility issue: don't mix version-130 fragment shaders
with unversioned ones, makes Mesa complain pointlessly (it can handle
them just fine)

Modified Paths:
--------------
    trunk/data/techniques/5_ps3.0/earth.technique
    trunk/data/techniques/5_ps3.0/mars.technique
    trunk/data/techniques/6_ps4.0/earth.technique
    trunk/data/techniques/6_ps4.0/mars.technique

Added Paths:
-----------
    trunk/data/programs/planet/cloud_vs1.1.130.vp
    trunk/data/programs/planet/ground_vs1.1.130.vp

Added: trunk/data/programs/planet/cloud_vs1.1.130.vp
===================================================================
--- trunk/data/programs/planet/cloud_vs1.1.130.vp	                        (rev 0)
+++ trunk/data/programs/planet/cloud_vs1.1.130.vp	2014-08-10 18:16:59 UTC (rev 13680)
@@ -0,0 +1,77 @@
+#version 130
+
+#include "earth_params.h"
+#include "../stdlib_vp.h"
+
+#define outCloudCoord gl_TexCoord[0]
+#define outGroundCoord gl_TexCoord[1]
+#define outShadowCoord gl_TexCoord[2]
+#define outNoiseCoord gl_TexCoord[3]
+#define outCityCoord gl_TexCoord[4]
+
+varying vec3 varTSLight;
+varying vec3 varTSView;
+varying vec3 varWSNormal;
+
+uniform float fTime;
+
+float soffs(float lim, float x)
+{
+  return x + ((x>=0.0)?lim:-lim);
+}
+
+vec2 shadowExtrude(in vec2 texcoord, in vec3 direction, float mult)
+{
+  return texcoord + direction.xy * fAtmosphereExtrusion.x * fShadowRelHeight.x / soffs(0.1,direction.z) * mult;
+}
+
+void main()
+{
+   // Compute position, eye-to-object direction and normalized world-space normal
+   vec4 extrudedPosition = gl_Vertex + vec4(normalize(gl_Normal.xyz),0.0) * fAtmosphereExtrusion.x * fShadowRelHeight.x;
+   vec3 normal   = normalize(gl_NormalMatrix * gl_Normal);
+   vec3 tangent  = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz);
+   vec3 binormal = cross(tangent, normal) * sign(gl_MultiTexCoord2.w);
+   
+   // Extrude sphere
+   vec4 position = gl_ModelViewMatrix * extrudedPosition;
+   vec3 eyetopos = normalize(position.xyz);
+   
+   vec4 lightpos;
+   float lightatt;
+   lightPosSizeAndAtt0(position, lightpos, lightatt);
+   
+   // TS view vector
+   varTSView.x = dot( tangent, -eyetopos );
+   varTSView.y = dot( binormal, -eyetopos );
+   varTSView.z = dot( normal, -eyetopos );
+   
+   // TS light posision
+   varTSLight.x = dot( tangent, lightpos.xyz );
+   varTSLight.y = dot( binormal, lightpos.xyz );
+   varTSLight.z = dot( normal, lightpos.xyz );
+   
+   // WS normal
+   varWSNormal = normal;
+   
+   // Load varyings
+   outCloudCoord       = gl_MultiTexCoord0 + fTime*fvCloudLayerDrift.xyxy;
+   outNoiseCoord       = gl_MultiTexCoord0 - fTime*fvCloudLayerDrift.xyxy;
+   outCityCoord        = gl_MultiTexCoord0;
+   outGroundCoord      = shadowExtrude(outCloudCoord.xy, varTSView, 1.0).xyxy;
+   outShadowCoord      = shadowExtrude(outGroundCoord.xy, varTSLight, -1.0).xyxy;
+   
+   // set primary color to the emissive material properties
+   vec4 pc = gl_FrontMaterial.emission;
+   vec4 sc = vec4(0.0);
+   pc.a = fvCloudColor.a * fCloudLayerDensity;
+   
+   pc.rgb += fvCloudColor.rgb * gl_LightSource[0].diffuse.rgb * lightatt;
+   sc.rgb += fvCloudColor.rgb * gl_LightSource[0].specular.rgb * lightatt;
+   
+   // Need this instead of ftransform() for invariance
+   gl_Position = gl_ModelViewProjectionMatrix * extrudedPosition;
+   gl_FrontColor = gl_BackColor = pc;
+   gl_FrontSecondaryColor = gl_BackSecondaryColor = sc;
+}
+

Added: trunk/data/programs/planet/ground_vs1.1.130.vp
===================================================================
--- trunk/data/programs/planet/ground_vs1.1.130.vp	                        (rev 0)
+++ trunk/data/programs/planet/ground_vs1.1.130.vp	2014-08-10 18:16:59 UTC (rev 13680)
@@ -0,0 +1,67 @@
+#version 130
+
+#include "earth_params.h"
+#include "../stdlib_vp.h"
+
+uniform float fTime;
+
+varying vec3 varTSLight;
+varying vec3 varTSView;
+
+
+float soffs(float lim, float x)
+{
+  return x + ((x>=0.0)?lim:-lim);
+}
+
+vec2 shadowExtrude(in vec2 texcoord, in vec3 direction)
+{
+  return texcoord - direction.xy * fAtmosphereExtrusion.x * fvCloudLayerDrift_ShadowRelHeight.w / soffs(0.1,direction.z);
+}
+
+void main() 
+{
+  // Compute position, eye-to-object direction and normalized world-space normal
+  vec4 position = gl_ModelViewMatrix * gl_Vertex;
+  vec3 eyetopos = normalize(position.xyz);
+  vec3 normal   = normalize(gl_NormalMatrix * gl_Normal);
+  vec3 tangent  = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz);
+  vec3 binormal = cross(tangent, normal) * sign(gl_MultiTexCoord2.w);
+  vec4 lightpos;
+  float lightatt; 
+  lightPosSizeAndAtt0(position, lightpos, lightatt);
+  
+  // Load varyings
+  gl_TexCoord[0] = gl_MultiTexCoord0;
+  
+  // TS view vector
+  varTSView.x = dot( tangent, -eyetopos );
+  varTSView.y = dot( binormal, -eyetopos );
+  varTSView.z = dot( normal, -eyetopos );
+  
+  // TS light posision
+  varTSLight.x = dot( tangent, lightpos.xyz );
+  varTSLight.y = dot( binormal, lightpos.xyz );
+  varTSLight.z = dot( normal, lightpos.xyz );
+  
+  // Cloud & shadow coords
+  vec2 cloudcoord = gl_MultiTexCoord0.xy + fTime*fvCloudLayerDrift_ShadowRelHeight.xy;
+  vec2 clouddetail= gl_MultiTexCoord0.xy - fTime*fvCloudLayerDrift_ShadowRelHeight.xy;
+  gl_TexCoord[1].zw = cloudcoord;
+  gl_TexCoord[1].xy = shadowExtrude(cloudcoord, varTSLight);
+  gl_TexCoord[2].xy = shadowExtrude(clouddetail, varTSLight);
+  gl_TexCoord[2].zw = vec2(0.0);
+  
+  // set primary color to the emissive material properties
+  vec4 pc = gl_FrontMaterial.emission;
+  vec4 sc = vec4(0.0);
+  
+  pc += gl_FrontMaterial.diffuse * gl_LightSource[0].diffuse * lightatt;
+  sc += gl_FrontMaterial.specular * gl_LightSource[0].specular * lightatt;
+  
+  // Need this instead of ftransform() for invariance
+  gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+  gl_FrontColor = gl_BackColor = pc;
+  gl_FrontSecondaryColor = gl_BackSecondaryColor = sc;
+}
+

Modified: trunk/data/techniques/5_ps3.0/earth.technique
===================================================================
--- trunk/data/techniques/5_ps3.0/earth.technique	2014-07-24 23:17:33 UTC (rev 13679)
+++ trunk/data/techniques/5_ps3.0/earth.technique	2014-08-10 18:16:59 UTC (rev 13680)
@@ -53,7 +53,7 @@
             srgb_aware="true"
             iteration="1" maxiterations="2"
             blend="multi_alpha_blend">
-        <vertex_program src="planet/ground_vs1.1"/>
+        <vertex_program src="planet/ground_vs1.1.130"/>
         <fragment_program src="planet/ground_ps3.0"/>
         
         <texture_unit src="decal:0" default="file:white.bmp" name="baseMap_20"/>
@@ -131,7 +131,7 @@
             iteration="1" maxiterations="2"
             blend="multi_alpha_blend"
             polygon_offset_units="-1">
-        <vertex_program src="planet/cloud_vs1.1"/>
+        <vertex_program src="planet/cloud_vs1.1.130"/>
         <fragment_program src="planet/cloud_ps3.0"/>
 
         <texture_unit src="environment" name="envMap"/>

Modified: trunk/data/techniques/5_ps3.0/mars.technique
===================================================================
--- trunk/data/techniques/5_ps3.0/mars.technique	2014-07-24 23:17:33 UTC (rev 13679)
+++ trunk/data/techniques/5_ps3.0/mars.technique	2014-08-10 18:16:59 UTC (rev 13680)
@@ -53,7 +53,7 @@
             srgb_aware="true"
             iteration="1" maxiterations="2"
             blend="multi_alpha_blend">
-        <vertex_program src="planet/ground_vs1.1"/>
+        <vertex_program src="planet/ground_vs1.1.130"/>
         <fragment_program src="planet/ground_ps3.0"/>
         
         <texture_unit src="decal:0" default="file:white.bmp" name="baseMap_20"/>

Modified: trunk/data/techniques/6_ps4.0/earth.technique
===================================================================
--- trunk/data/techniques/6_ps4.0/earth.technique	2014-07-24 23:17:33 UTC (rev 13679)
+++ trunk/data/techniques/6_ps4.0/earth.technique	2014-08-10 18:16:59 UTC (rev 13680)
@@ -53,7 +53,7 @@
             srgb_aware="true"
             iteration="1" maxiterations="4"
             blend="multi_alpha_blend">
-        <vertex_program src="planet/ground_vs1.1"/>
+        <vertex_program src="planet/ground_vs1.1.130"/>
         <fragment_program src="planet/ground_ps3.0"/>
         
         <texture_unit src="decal:0" default="file:white.bmp" name="baseMap_20"/>
@@ -132,7 +132,7 @@
             iteration="1" maxiterations="4"
             blend="multi_alpha_blend"
             polygon_offset_units="-1">
-        <vertex_program src="planet/cloud_vs1.1"/>
+        <vertex_program src="planet/cloud_vs1.1.130"/>
         <fragment_program src="planet/cloud_ps3.0"/>
 
         <texture_unit src="environment" name="envMap"/>

Modified: trunk/data/techniques/6_ps4.0/mars.technique
===================================================================
--- trunk/data/techniques/6_ps4.0/mars.technique	2014-07-24 23:17:33 UTC (rev 13679)
+++ trunk/data/techniques/6_ps4.0/mars.technique	2014-08-10 18:16:59 UTC (rev 13680)
@@ -53,7 +53,7 @@
             srgb_aware="true"
             iteration="1" maxiterations="4"
             blend="multi_alpha_blend">
-        <vertex_program src="planet/ground_vs1.1"/>
+        <vertex_program src="planet/ground_vs1.1.130"/>
         <fragment_program src="planet/ground_ps3.0"/>
         
         <texture_unit src="decal:0" default="file:white.bmp" name="baseMap_20"/>

[Vegastrike-cvs] SF.net SVN: vegastrike:[13679] trunk/vegastrike/CMakeLists.txt

From: <kla...@us...> - 2014-07-24 23:17:41

Revision: 13679
          http://sourceforge.net/p/vegastrike/code/13679
Author:   klaussfreire
Date:     2014-07-24 23:17:33 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
Add datadir option to CMakeLists.txt (needed for packaging)

Modified Paths:
--------------
    trunk/vegastrike/CMakeLists.txt

Modified: trunk/vegastrike/CMakeLists.txt
===================================================================
--- trunk/vegastrike/CMakeLists.txt	2014-05-19 17:53:06 UTC (rev 13678)
+++ trunk/vegastrike/CMakeLists.txt	2014-07-24 23:17:33 UTC (rev 13679)
@@ -549,10 +549,13 @@
 OPTION(CPUINTEL_native "Enable host-specific optimizations for this machine"
     OFF )
 
+SET(DATADIR "" CACHE STRING "Default vegastrike data directory")
 
 # Hide our temporary variable and initialize it to empty
 SET(CPU_OPTS  )
+SET(DEFINES " -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES ")
 MARK_AS_ADVANCED( CPU_OPTS )
+MARK_AS_ADVANCED( DEFINES )
 SET(CPU_SMP "1" CACHE STRING 
     "Number of CPU's in system")
 # Depending on the boolean chosen above, set CPU_OPTS to the correct cpu opts
@@ -579,11 +582,15 @@
     SET(CPU_OPTS " ${CPU_OPTS} -ftree-parallelize-loops=${CPU_SMP} ")
 ENDIF(CPU_SMP GREATER 1)
 
+IF(DATADIR)
+    SET(DEFINES "${DEFINES} -DDATA_DIR=\"${DATADIR}\"")
+ENDIF(DATADIR)
+
 # Debug target block. 
-SET(CMAKE_CXX_FLAGS_DEBUG " ${BUILD_OPT} ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -fvisibility=hidden" CACHE STRING
+SET(CMAKE_CXX_FLAGS_DEBUG " ${BUILD_OPT} ${CPU_OPTS} ${DEFINES} -include config.h -pipe -g2 -Wall -fvisibility=hidden" CACHE STRING
     "Flags used by the C++ compiler during debug builds."
      FORCE )
-SET( CMAKE_C_FLAGS_DEBUG "  ${BUILD_OPT} ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
+SET( CMAKE_C_FLAGS_DEBUG "  ${BUILD_OPT} ${CPU_OPTS} ${DEFINES} -include config.h -pipe -g2 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
     "Flags used by the C compiler during debug builds."
      FORCE )
 SET( CMAKE_EXE_LINKER_FLAGS_DEBUG

[Vegastrike-cvs] SF.net SVN: vegastrike:[13678] trunk/vegastrike/src/cmd/music.cpp

From: <kla...@us...> - 2014-05-19 17:53:08

Revision: 13678
          http://sourceforge.net/p/vegastrike/code/13678
Author:   klaussfreire
Date:     2014-05-19 17:53:06 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Fix DJ bug: do not invoke dj_script before the activeStarSystem is
initialized, it will only crash very hardly

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/music.cpp

Modified: trunk/vegastrike/src/cmd/music.cpp
===================================================================
--- trunk/vegastrike/src/cmd/music.cpp	2014-03-21 20:11:54 UTC (rev 13677)
+++ trunk/vegastrike/src/cmd/music.cpp	2014-05-19 17:53:06 UTC (rev 13678)
@@ -218,7 +218,7 @@
             return whichsong;
         }
     }
-    if ( _Universe && _Universe->numPlayers() ) {
+    if ( _Universe && _Universe->activeStarSystem() != NULL && _Universe->numPlayers() ) {
         CompileRunPython( dj_script );
     } else {
         static std::string loading_tune = vs_config->getVariable( "audio", "loading_sound", "../music/loading.ogg" );

[Vegastrike-cvs] SF.net SVN: vegastrike:[13677] trunk/data/documentation

From: <kla...@us...> - 2014-03-21 20:11:57

Revision: 13677
          http://sourceforge.net/p/vegastrike/code/13677
Author:   klaussfreire
Date:     2014-03-21 20:11:54 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Fix forum links

Modified Paths:
--------------
    trunk/data/documentation/detailtextures.txt
    trunk/data/documentation/readme.txt

Modified: trunk/data/documentation/detailtextures.txt
===================================================================
--- trunk/data/documentation/detailtextures.txt	2014-03-19 01:30:14 UTC (rev 13676)
+++ trunk/data/documentation/detailtextures.txt	2014-03-21 20:11:54 UTC (rev 13677)
@@ -80,4 +80,4 @@
 so I hope you enjoy--no one seems to use lods anyway
 
 
-http://vegastrike.sourceforge.net/forums/viewtopic.php?t=1205
\ No newline at end of file
+http://forums.vega-strike.org/viewtopic.php?t=1205

Modified: trunk/data/documentation/readme.txt
===================================================================
--- trunk/data/documentation/readme.txt	2014-03-19 01:30:14 UTC (rev 13676)
+++ trunk/data/documentation/readme.txt	2014-03-21 20:11:54 UTC (rev 13677)
@@ -686,7 +686,7 @@
    
    To connect to a server, click on Multiplayer, and in the Online
    Account mode, type in your username and password.
-   Register an account athttp://vegastrike.sourceforge.net/forums/
+   Register an account at http://forums.vega-strike.org/
    and sign up for an account.
    
    It is also in late alpha, so please report any bugs you find (we

[Vegastrike-cvs] SF.net SVN: vegastrike:[13676] trunk/vegastrike/src/gui/textinputdisplay.h

From: <phe...@us...> - 2014-03-19 01:30:18

Revision: 13676
          http://sourceforge.net/p/vegastrike/code/13676
Author:   pheonixstorm
Date:     2014-03-19 01:30:14 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Typo in inclusion guard. Missing D in TEXTINPUTDISPLAY_H

Modified Paths:
--------------
    trunk/vegastrike/src/gui/textinputdisplay.h

Modified: trunk/vegastrike/src/gui/textinputdisplay.h
===================================================================
--- trunk/vegastrike/src/gui/textinputdisplay.h	2014-03-11 22:46:20 UTC (rev 13675)
+++ trunk/vegastrike/src/gui/textinputdisplay.h	2014-03-19 01:30:14 UTC (rev 13676)
@@ -20,7 +20,7 @@
  */
 
 #ifndef __TEXTINPUTDISPLAY_H__
-#define __TEXTINPUTISPLAY_H__
+#define __TEXTINPUTDISPLAY_H__
 
 #include "staticdisplay.h"
 #include <vector>

[Vegastrike-cvs] SF.net SVN: vegastrike:[13675] trunk/masters/units/vessels

From: <ja...@us...> - 2014-03-11 22:46:33

Revision: 13675
          http://sourceforge.net/p/vegastrike/code/13675
Author:   jacks
Date:     2014-03-11 22:46:20 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
Was doing some spring cleaning - noticed I never uploaded these.

Added Paths:
-----------
    trunk/masters/units/vessels/Anaxander/
    trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga
    trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg
    trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga
    trunk/masters/units/vessels/Anaxander/anaxander.dae

Added: trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga
===================================================================
(Binary files differ)

Index: trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga
===================================================================
--- trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga	2014-03-09 04:13:21 UTC (rev 13674)
+++ trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga	2014-03-11 22:46:20 UTC (rev 13675)

Property changes on: trunk/masters/units/vessels/Anaxander/Anaxander_COLOR.tga
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg
===================================================================
(Binary files differ)

Index: trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg
===================================================================
--- trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg	2014-03-09 04:13:21 UTC (rev 13674)
+++ trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg	2014-03-11 22:46:20 UTC (rev 13675)

Property changes on: trunk/masters/units/vessels/Anaxander/Anaxander_NRM2.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga
===================================================================
(Binary files differ)

Index: trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga
===================================================================
--- trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga	2014-03-09 04:13:21 UTC (rev 13674)
+++ trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga	2014-03-11 22:46:20 UTC (rev 13675)

Property changes on: trunk/masters/units/vessels/Anaxander/Anaxander_SPM2.tga
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/masters/units/vessels/Anaxander/anaxander.dae
===================================================================
--- trunk/masters/units/vessels/Anaxander/anaxander.dae	                        (rev 0)
+++ trunk/masters/units/vessels/Anaxander/anaxander.dae	2014-03-11 22:46:20 UTC (rev 13675)
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Owner</author>
+      <authoring_tool>OpenCOLLADA2008</authoring_tool>
+      <comments>
+			ColladaMaya export options: 
+			bakeTransforms=0;relativePaths=0;copyTextures=0;exportTriangles=0;exportCgfxFileReferences=1;
+			isSampling=0;curveConstrainSampling=0;removeStaticCurves=1;exportPolygonMeshes=1;exportLights=1;
+			exportCameras=1;exportJointsAndSkin=1;exportAnimations=1;exportInvisibleNodes=0;exportDefaultCameras=0;
+			exportTexCoords=1;exportNormals=1;exportNormalsPerVertex=1;exportVertexColors=1;exportVertexColorsPerVertex=1;
+			exportTexTangents=0;exportTangents=0;exportReferencedMaterials=0;exportMaterialsOnly=0;
+			exportXRefs=1;dereferenceXRefs=1;exportCameraAsLookat=0;cameraXFov=0;cameraYFov=1;doublePrecision=0
+		</comments>
+      <source_data>file:///C:/Documents%20and%20Settings/Owner/Desktop/VegaStrike_Sirikata/3d/anaxander/anaxander.ma</source_data>
+    </contributor>
+    <created>2010-04-20T12:59:20</created>
+    <modified>2010-04-20T12:59:20</modified>
+    <unit name="centimeter" meter="0.01"/>
+    <up_axis>Y_UP</up_axis>
+  </asset>
+  <library_materials>
+    <material id="anaxander" name="anaxander">
+      <instance_effect url="#anaxander-fx"/>
+    </material>
+  </library_materials>
+  <library_effects>
+    <effect id="anaxander-fx">
+      <profile_COMMON>
+        <newparam sid="file1-surface">
+          <surface type="2D">
+            <init_from>file1</init_from>
+          </surface>
+        </newparam>
+        <newparam sid="file1-sampler">
+          <sampler2D>
+            <source>file1-surface</source>
+          </sampler2D>
+        </newparam>
+        <newparam sid="file2-surface">
+          <surface type="2D">
+            <init_from>file2</init_from>
+          </surface>
+        </newparam>
+        <newparam sid="file2-sampler">
+          <sampler2D>
+            <source>file2-surface</source>
+          </sampler2D>
+        </newparam>
+        <newparam sid="file3-surface">
+          <surface type="2D">
+            <init_from>file3</init_from>
+          </surface>
+        </newparam>
+        <newparam sid="file3-sampler">
+          <sampler2D>
+            <source>file3-surface</source>
+          </sampler2D>
+        </newparam>
+        <technique sid="common">
+          <blinn>
+            <emission>
+              <color>0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color>0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <texture texture="file1-sampler" texcoord="TEX0">
+                <extra>
+                  <technique profile="OpenCOLLADAMaya">
+                    <blend_mode>NONE</blend_mode>
+                    <coverageU>1</coverageU>
+                    <coverageV>1</coverageV>
+                    <fast>0</fast>
+                    <mirrorU>0</mirrorU>
+                    <mirrorV>0</mirrorV>
+                    <noiseU>0</noiseU>
+                    <noiseV>0</noiseV>
+                    <offsetU>0</offsetU>
+                    <offsetV>0</offsetV>
+                    <repeatU>1</repeatU>
+                    <repeatV>1</repeatV>
+                    <rotateFrame>0</rotateFrame>
+                    <rotateUV>0</rotateUV>
+                    <stagger>0</stagger>
+                    <translateFrameU>0</translateFrameU>
+                    <translateFrameV>0</translateFrameV>
+                    <wrapU>1</wrapU>
+                    <wrapV>1</wrapV>
+                  </technique>
+                </extra>
+              </texture>
+            </diffuse>
+            <specular>
+              <texture texture="file2-sampler" texcoord="TEX2">
+                <extra>
+                  <technique profile="OpenCOLLADAMaya">
+                    <blend_mode>NONE</blend_mode>
+                    <coverageU>1</coverageU>
+                    <coverageV>1</coverageV>
+                    <fast>0</fast>
+                    <mirrorU>0</mirrorU>
+                    <mirrorV>0</mirrorV>
+                    <noiseU>0</noiseU>
+                    <noiseV>0</noiseV>
+                    <offsetU>0</offsetU>
+                    <offsetV>0</offsetV>
+                    <repeatU>1</repeatU>
+                    <repeatV>1</repeatV>
+                    <rotateFrame>0</rotateFrame>
+                    <rotateUV>0</rotateUV>
+                    <stagger>0</stagger>
+                    <translateFrameU>0</translateFrameU>
+                    <translateFrameV>0</translateFrameV>
+                    <wrapU>1</wrapU>
+                    <wrapV>1</wrapV>
+                  </technique>
+                </extra>
+              </texture>
+            </specular>
+            <shininess>
+              <float>0.3</float>
+            </shininess>
+            <reflective>
+              <color>0 0 0 1</color>
+            </reflective>
+            <reflectivity>
+              <float>0.5</float>
+            </reflectivity>
+            <transparent opaque="RGB_ZERO">
+              <color>0 0 0 1</color>
+            </transparent>
+            <transparency>
+              <float>1</float>
+            </transparency>
+          </blinn>
+          <extra>
+            <technique profile="OpenCOLLADAMaya">
+              <bump>
+                <texture texture="file3-sampler" texcoord="TEX1">
+                  <extra>
+                    <technique profile="OpenCOLLADA3dsMax">
+                      <amount>1</amount>
+                      <bumpInterp>0</bumpInterp>
+                    </technique>
+                    <technique profile="OpenCOLLADAMaya">
+                      <blend_mode>NONE</blend_mode>
+                      <coverageU>1</coverageU>
+                      <coverageV>1</coverageV>
+                      <fast>0</fast>
+                      <mirrorU>0</mirrorU>
+                      <mirrorV>0</mirrorV>
+                      <noiseU>0</noiseU>
+                      <noiseV>0</noiseV>
+                      <offsetU>0</offsetU>
+                      <offsetV>0</offsetV>
+                      <repeatU>1</repeatU>
+                      <repeatV>1</repeatV>
+                      <rotateFrame>0</rotateFrame>
+                      <rotateUV>0</rotateUV>
+                      <stagger>0</stagger>
+                      <translateFrameU>0</translateFrameU>
+                      <translateFrameV>0</translateFrameV>
+                      <wrapU>1</wrapU>
+                      <wrapV>1</wrapV>
+                    </technique>
+                  </extra>
+                </texture>
+              </bump>
+            </technique>
+          </extra>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_images>
+    <image id="file1" name="file1">
+      <init_from>file:///C:/Documents%20and%20Settings/Owner/Desktop/VegaStrike_Sirikata/3d/anaxander/Anaxander_COLOR.tga</init_from>
+      <extra>
+        <technique profile="OpenCOLLADAMaya">
+          <dgnode_type>kFile</dgnode_type>
+          <image_sequence>0</image_sequence>
+          <originalMayaNodeId>file1</originalMayaNodeId>
+        </technique>
+      </extra>
+    </image>
+    <image id="file3" name="file3">
+      <init_from>file:///C:/Documents%20and%20Settings/Owner/Desktop/VegaStrike_Sirikata/3d/anaxander/Anaxander_NRM2.jpg</init_from>
+      <extra>
+        <technique profile="OpenCOLLADAMaya">
+          <dgnode_type>kFile</dgnode_type>
+          <image_sequence>0</image_sequence>
+          <originalMayaNodeId>file3</originalMayaNodeId>
+        </technique>
+      </extra>
+    </image>
+    <image id="file2" name="file2">
+      <init_from>file:///C:/Documents%20and%20Settings/Owner/Desktop/VegaStrike_Sirikata/3d/anaxander/Anaxander_SPM2.tga</init_from>
+      <extra>
+        <technique profile="OpenCOLLADAMaya">
+          <dgnode_type>kFile</dgnode_type>
+          <image_sequence>0</image_sequence>
+          <originalMayaNodeId>file2</originalMayaNodeId>
+        </technique>
+      </extra>
+    </image>
+  </library_images>
+  <library_geometries>
+    <geometry id="anaxanderShape1" name="anaxanderShape1">
+      <mesh>
+        <source id="anaxanderShape1-positions" name="anaxanderShape1-positions">
+          <float_array id="anaxanderShape1-positions-array" count="18069">-1.714901 -0.5736663 -1.309944 -0.4689903 0.03872848 -2.380054 -1.732104 -0.5250185 -0.9664307 -0.5205903 0.1281025 -1.451838 -1.723671 -0.5488665 -0.827528 -0.4952941 0.0842886 -1.107164 -1.729365 -0.5327647 -0.8728981 -0.5123744 0.1138725 -1.219744 -1.724024 -0.5478685 -1.154236 -0.4963531 0.08612347 -1.944002 -1.731087 -0.5278952 -1.054035 -0.5175371 0.1228156 -1.669212 -1.718167 -0.5644295 -1.226168 -0.4787874 0.05569744 -2.146025 -1.697698 -0.6223142 -0.9664307 -0.4173894 -0.05064654 -1.451838 -1.706131 -0.5984657 -0.827528 -0.4426851 -0.006832361 -1.107164 -1.700437 -0.6145685 -0.8728981 -0.4256053 -0.03641534 -1.219744 -1.705778 -0.5994647 -1.154236 -0.4416261 -0.008666515 -1.944002 -1.698716 -0.6194365 -1.054035 -0.4204421 -0.04535842 -1.669212 -1.711635 -0.5829036 -1.226168 -0.4591932 0.02175951 -2.146025 -1.051706 -0.3432634 -1.072054 -1.038896 -0.3654516 -1.151028 -1.032735 -0.3761246 -1.298445 -1.035024 -0.3721583 -1.426296 -1.050912 -0.3446395 -1.573 -1.064087 -0.3218205 -1.670494 -1.071435 -0.3090932 -1.816322 -1.078782 -0.2963665 -1.670494 -1.091957 -0.2735474 -1.573 -1.107846 -0.2460287 -1.426296 -1.110135 -0.2420623 -1.298445 -1.103973 -0.2527354 -1.151028 -1.091163 -0.2749226 -1.072054 -0.7471962 -0.1750484 -1.115786 -0.7322512 -0.2009332 -1.211563 -0.7250624 -0.2133844 -1.39362 -0.7277331 -0.2087595 -1.563152 -0.7462692 -0.1766534 -1.746967 -0.7616401 -0.1500304 -1.883419 -0.7702122 -0.1351824 -2.060272 -0.7787852 -0.1203344 -1.883419 -0.7941551 -0.09371138 -1.746967 -0.8126912 -0.06160641 -1.563152 -0.8153625 -0.05698037 -1.39362 -0.8081732 -0.0694325 -1.211563 -0.7932291 -0.09531641 -1.115786 -1.376017 -0.4887054 -0.9852085 -1.368899 -0.5088346 -1.04738 -1.365475 -0.5185163 -1.160154 -1.366747 -0.5149195 -1.264801 -1.375575 -0.4899542 -1.374397 -1.382896 -0.4692523 -1.457569 -1.386978 -0.4577062 -1.572372 -1.391061 -0.4461606 -1.457569 -1.398382 -0.4254587 -1.374397 -1.40721 -0.4004934 -1.264801 -1.408482 -0.3968966 -1.160154 -1.405058 -0.4065783 -1.04738 -1.397941 -0.4267075 -0.9852085 -0.3154154 0.1273944 -2.50717 -0.3266282 0.1468146 -2.244732 -0.3744693 0.2296786 -1.462461 -0.3650661 0.2133925 -1.198648 -0.3455191 0.1795356 -1.070683 -0.3467312 0.1816356 -2.018316 -0.3709764 0.2236276 -1.709543 -0.304203 0.1079736 -2.244732 -0.2563624 0.02511048 -1.462461 -0.2657642 0.04139662 -1.198648 -0.2853112 0.07525253 -1.070683 -0.2840991 0.0731535 -2.018316 -0.2598553 0.03116155 -1.709543 0 -2.212392 1.879404 0 -0.1219964 2.69154 -0.05160046 -2.212392 1.620903 -0.1032004 -0.1219964 1.955681 -0.02630424 -2.212392 1.516375 -0.05260944 -0.1219964 1.59885 -0.04338408 -2.212392 1.550516 -0.0867691 -0.1219964 1.683571 -0.02736425 -2.212392 1.76223 -0.05472708 -0.1219964 2.356539 -0.04854822 -2.212392 1.686825 -0.09709644 -0.1219964 2.149763 -0.009797096 -2.212392 1.81636 -0.01959419 -0.1219964 2.509293 0.0515995 -2.212392 1.620903 0.1032 -0.1219964 1.955681 0.02630377 -2.212392 1.516375 0.05260897 -0.1219964 1.59885 0.0433836 -2.212392 1.550516 0.08676767 -0.1219964 1.683571 0.02736378 -2.212392 1.76223 0.0547266 -0.1219964 2.356539 0.04854774 -2.212392 1.686825 0.09709597 -0.1219964 2.149763 0.009796619 -2.212392 1.81636 0.01959372 -0.1219964 2.509293 0.03945684 -1.169206 1.700386 0.06507587 -1.169206 1.759817 0.07739973 -1.169206 1.87075 0.07282162 -1.169206 1.966963 0.04104471 -1.169206 2.077362 0.01469564 -1.169206 2.150728 0 -1.169206 2.260468 -0.01469612 -1.169206 2.150728 -0.04104614 -1.169206 2.077362 -0.07282209 -1.169206 1.966963 -0.07740021 -1.169206 1.87075 -0.06507635 -1.169206 1.759817 -0.03945732 -1.169206 1.700386 0.04603291 -0.6455996 1.714331 0.07592154 -0.6455996 1.786404 0.09029961 -0.6455996 1.942371 0.08495855 -0.6455996 2.06995 0.04788589 -0.6455996 2.208275 0.01714468 -0.6455996 2.310959 0 -0.6455996 2.444046 -0.01714516 -0.6455996 2.310959 -0.04788637 -0.6455996 2.208275 -0.08495903 -0.6455996 2.06995 -0.09030008 -0.6455996 1.942371 -0.07592249 -0.6455996 1.786404 -0.04603338 -0.6455996 1.714331 0.03287983 -1.69281 1.635031 0.05422974 -1.69281 1.681818 0.06449986 -1.69281 1.766684 0.06068468 -1.69281 1.845434 0.03420353 -1.69281 1.927908 0.01224566 -1.69281 1.990496 0 -1.69281 2.076889 -0.01224613 -1.69281 1.990496 -0.03420544 -1.69281 1.927908 -0.06068516 -1.69281 1.845434 -0.06450033 -1.69281 1.766684 -0.05423021 -1.69281 1.681818 -0.03288126 -1.69281 1.635031 0 0.05282545 2.786106 -0.02046537 0.05282545 2.576645 -0.1077871 0.05282545 1.969143 -0.09062529 0.05282545 1.625017 -0.05494738 0.05282545 1.530884 -0.05716038 0.05282545 2.408964 -0.1014113 0.05282545 2.1814 0.0204649 0.05282545 2.576645 0.1077867 0.05282545 1.969143 0.09062481 0.05282545 1.625017 0.0549469 0.05282545 1.530884 0.0571599 0.05282545 2.408964 0.1014109 0.05282545 2.1814 0 2.212391 -1.309944 0 0.8211045 -2.380054 -0.05160046 2.212391 -0.9664307 -0.1032004 0.8211045 -1.451838 -0.02630424 2.212391 -0.827528 -0.05260944 0.8211045 -1.107164 -0.04338408 2.212391 -0.8728981 -0.0867691 0.8211045 -1.219744 -0.02736425 2.212391 -1.154236 -0.05472708 0.8211045 -1.944002 -0.04854822 2.212391 -1.054035 -0.09709644 0.8211045 -1.669212 -0.009797096 2.212391 -1.226168 -0.01959419 0.8211045 -2.146025 0.0515995 2.212391 -0.9664307 0.1032 0.8211045 -1.451838 0.02630377 2.212391 -0.827528 0.05260897 0.8211045 -1.107164 0.0433836 2.212391 -0.8728981 0.08676767 0.8211045 -1.219744 0.02736378 2.212391 -1.154236 0.0547266 0.8211045 -1.944002 0.04854774 2.212391 -1.054035 0.09709597 0.8211045 -1.669212 0.009796619 2.212391 -1.226168 0.01959372 0.8211045 -2.146025 0.03945684 1.51675 -1.072054 0.06507587 1.51675 -1.15103 0.07739973 1.51675 -1.298445 0.07282162 1.51675 -1.426296 0.04104471 1.51675 -1.573002 0.01469564 1.51675 -1.670494 0 1.51675 -1.816322 -0.01469612 1.51675 -1.670494 -0.04104614 1.51675 -1.573002 -0.07282209 1.51675 -1.426296 -0.07740021 1.51675 -1.298445 -0.06507635 1.51675 -1.15103 -0.03945732 1.51675 -1.072054 0.04603291 1.168926 -1.115786 0.07592154 1.168926 -1.211563 0.09029961 1.168926 -1.39362 0.08495855 1.168926 -1.563152 0.04788589 1.168926 -1.746967 0.01714468 1.168926 -1.883419 0 1.168926 -2.060272 -0.01714516 1.168926 -1.883419 -0.04788637 1.168926 -1.746967 -0.08495903 1.168926 -1.563152 -0.09030008 1.168926 -1.39362 -0.07592249 1.168926 -1.211563 -0.04603338 1.168926 -1.115786 0.03287983 1.864572 -0.9852085 0.05422974 1.864572 -1.04738 0.06449986 1.864572 -1.160154 0.06068468 1.864572 -1.264803 0.03420353 1.864572 -1.374397 0.01224566 1.864572 -1.457569 0 1.864572 -1.572372 -0.01224613 1.864572 -1.457569 -0.03420544 1.864572 -1.374397 -0.06068516 1.864572 -1.264803 -0.06450033 1.864572 -1.160154 -0.05423021 1.864572 -1.04738 -0.03288126 1.864572 -0.9852085 0 0.6437716 -2.50717 -0.02242517 0.6437716 -2.244734 -0.1181073 0.6437716 -1.462461 -0.09930229 0.6437716 -1.198648 -0.06020832 0.6437716 -1.070683 -0.06263208 0.6437716 -2.018316 -0.1111212 0.6437716 -1.709543 0.0224247 0.6437716 -2.244734 0.1181068 0.6437716 -1.462461 0.09930182 0.6437716 -1.198648 0.06020784 0.6437716 -1.070683 0.06263161 0.6437716 -2.018316 0.1111197 0.6437716 -1.709543 0 1.432935 0.1147938 0 1.432935 0.2580013 0 1.506617 0.2580013 0.04338074 1.492522 0.2580013 0.07019091 1.45562 0.2580013 0.07019091 1.410007 0.2580013 0.04338074 1.373105 0.2580013 0.02280569 1.362622 0.2580013 0 1.506617 0.1147938 0.04338074 1.492522 0.1147938 0.07019091 1.45562 0.1147938 0.07019091 1.410007 0.1147938 0.04338074 1.373105 0.1147938 0.02280569 1.362622 0.1147938 0 1.520369 0.1863976 0.0514636 1.503647 0.1863976 0.0832696 1.45987 0.1863976 0.0832696 1.405756 0.1863976 0.0514636 1.361979 0.1863976 0 1.234059 0.1147938 0 1.234059 0.2580013 0.02280569 1.304249 0.2580013 0.04338074 1.293766 0.2580013 0.07019091 1.256865 0.2580013 0.07019091 1.211251 0.2580013 0.04338074 1.17435 0.2580013 0.02280569 1.163866 0.2580013 0.02280569 1.304249 0.1147938 0.04338074 1.293766 0.1147938 0.07019091 1.256865 0.1147938 0.07019091 1.211251 0.1147938 0.04338074 1.17435 0.1147938 0.02280569 1.163866 0.1147938 0.0514636 1.304891 0.1863976 0.0832696 1.261114 0.1863976 0.0832696 1.207001 0.1863976 0.0514636 1.163224 0.1863976 0 1.035114 0.1147938 0 1.035114 0.2580013 0.02280569 1.105494 0.2580013 0.04338074 1.095011 0.2580013 0.07019091 1.058109 0.2580013 0.07019091 1.012496 0.2580013 0.05970764 0.9919217 0.2580013 0.02280569 0.9651105 0.2580013 0.02280569 1.105494 0.1147938 0.04338074 1.095011 0.1147938 0.07019091 1.058109 0.1147938 0.07019091 1.012496 0.1147938 0.05970764 0.9919217 0.1147938 0.02280569 0.9651105 0.1147938 0.0514636 1.106136 0.1863976 0.0832696 1.062359 0.1863976 0.0832696 1.008247 0.1863976 0.07083368 0.9838395 0.1863976 0.02705574 0.9520316 0.1863976 0.04128885 1.352504 0.2438793 0.02231264 1.333436 0.2381096 0.04821157 1.352504 0.1863976 0.02608061 1.333436 0.1863976 0.04128885 1.352504 0.1289158 0.02231264 1.333436 0.1346836 0.04128885 1.314367 0.2438793 0.04821157 1.314367 0.1863976 0.04128885 1.314367 0.1289158 0.04128885 1.153749 0.2438793 0.02231264 1.13468 0.2381096 0.04821157 1.153749 0.1863976 0.02608061 1.13468 0.1863976 0.04128885 1.153749 0.1289158 0.02231264 1.13468 0.1346836 0.04128885 1.115611 0.2438793 0.04821157 1.115611 0.1863976 0.04128885 1.115611 0.1289158 0.1052575 0.8982685 0.2580013 0.1185508 0.8982685 0.1863976 0.03974485 0.8982685 0.2580013 0.04482174 0.8982685 0.1863976 0.1052575 0.8982685 0.1147938 0.03974485 0.8982685 0.1147938 0.1228766 0.8381655 0.2580013 0.1385765 0.8381655 0.1863976 0.04550457 0.8381655 0.2580013 0.05150175 0.8381655 0.1863976 0.1228766 0.8381655 0.1147938 0.04550457 0.8381655 0.1147938 0.1087198 0.7767246 0.2580013 0.1249328 0.7767246 0.1863976 0.02881384 0.7767246 0.2580013 0.03500652 0.7767246 0.1863976 0.1087198 0.7767246 0.1147938 0.02881384 0.7767246 0.1147938 -0.04338121 1.492522 0.2580013 -0.07019138 1.45562 0.2580013 -0.07019138 1.410007 0.2580013 -0.04338121 1.373105 0.2580013 -0.02280712 1.362622 0.2580013 -0.04338121 1.492522 0.1147938 -0.07019138 1.45562 0.1147938 -0.07019138 1.410007 0.1147938 -0.04338121 1.373105 0.1147938 -0.02280712 1.362622 0.1147938 -0.05146408 1.503647 0.1863976 -0.08327007 1.45987 0.1863976 -0.08327007 1.405756 0.1863976 -0.05146408 1.361979 0.1863976 -0.02280712 1.304249 0.2580013 -0.04338121 1.293766 0.2580013 -0.07019138 1.256865 0.2580013 -0.07019138 1.211251 0.2580013 -0.04338121 1.17435 0.2580013 -0.02280712 1.163866 0.2580013 -0.02280712 1.304249 0.1147938 -0.04338121 1.293766 0.1147938 -0.07019138 1.256865 0.1147938 -0.07019138 1.211251 0.1147938 -0.04338121 1.17435 0.1147938 -0.02280712 1.163866 0.1147938 -0.05146408 1.304891 0.1863976 -0.08327007 1.261114 0.1863976 -0.08327007 1.207001 0.1863976 -0.05146408 1.163224 0.1863976 -0.02280712 1.105494 0.2580013 -0.04338121 1.095011 0.2580013 -0.07019138 1.058109 0.2580013 -0.07019138 1.012496 0.2580013 -0.05970812 0.9919217 0.2580013 -0.02280712 0.9651105 0.2580013 -0.02280712 1.105494 0.1147938 -0.04338121 1.095011 0.1147938 -0.07019138 1.058109 0.1147938 -0.07019138 1.012496 0.1147938 -0.05970812 0.9919217 0.1147938 -0.02280712 0.9651105 0.1147938 -0.05146408 1.106136 0.1863976 -0.08327007 1.062359 0.1863976 -0.08327007 1.008247 0.1863976 -0.07083416 0.9838395 0.1863976 -0.02705622 0.9520316 0.1863976 -0.04128933 1.352504 0.2438793 -0.02231312 1.333436 0.2381096 -0.04821205 1.352504 0.1863976 -0.02608109 1.333436 0.1863976 -0.04128933 1.352504 0.1289158 -0.02231312 1.333436 0.1346836 -0.04128933 1.314367 0.2438793 -0.04821205 1.314367 0.1863976 -0.04128933 1.314367 0.1289158 -0.04128933 1.153749 0.2438793 -0.02231312 1.13468 0.2381096 -0.04821205 1.153749 0.1863976 -0.02608109 1.13468 0.1863976 -0.04128933 1.153749 0.1289158 -0.02231312 1.13468 0.1346836 -0.04128933 1.115611 0.2438793 -0.04821205 1.115611 0.1863976 -0.04128933 1.115611 0.1289158 -0.1052585 0.8982685 0.2580013 -0.1185512 0.8982685 0.1863976 -0.03974533 0.8982685 0.2580013 -0.04482222 0.8982685 0.1863976 -0.1052585 0.8982685 0.1147938 -0.03974533 0.8982685 0.1147938 -0.1228781 0.8381655 0.2580013 -0.1385775 0.8381655 0.1863976 -0.04550505 0.8381655 0.2580013 -0.05150223 0.8381655 0.1863976 -0.1228781 0.8381655 0.1147938 -0.04550505 0.8381655 0.1147938 -0.1087203 0.7767246 0.2580013 -0.1249332 0.7767246 0.1863976 -0.02881432 0.7767246 0.2580013 -0.03500748 0.7767246 0.1863976 -0.1087203 0.7767246 0.1147938 -0.02881432 0.7767246 0.1147938 0.1249328 0.7200706 0.1863976 0.1087198 0.7200706 0.2580013 0.02881384 0.7200706 0.2580013 0.03500652 0.7200706 0.1863976 0.1087198 0.7200706 0.1147938 0.02881384 0.7200706 0.1147938 -0.1087203 0.7200706 0.2580013 -0.1249332 0.7200706 0.1863976 -0.02881432 0.7200706 0.2580013 -0.03500748 0.7200706 0.1863976 -0.1087203 0.7200706 0.1147938 -0.02881432 0.7200706 0.1147938 0 1.431767 -0.4446564 0 1.431767 -0.3014488 0 1.505448 -0.3014488 0.04338074 1.491353 -0.3014488 0.07019091 1.454451 -0.3014488 0.07019091 1.408838 -0.3014488 0.04338074 1.371936 -0.3014488 0.02280569 1.361454 -0.3014488 0 1.505448 -0.4446564 0.04338074 1.491353 -0.4446564 0.07019091 1.454451 -0.4446564 0.07019091 1.408838 -0.4446564 0.04338074 1.371936 -0.4446564 0.02280569 1.361454 -0.4446564 0 1.5192 -0.3730526 0.0514636 1.502478 -0.3730526 0.0832696 1.458701 -0.3730526 0.0832696 1.404588 -0.3730526 0.0514636 1.36081 -0.3730526 0 1.23289 -0.4446564 0 1.23289 -0.3014488 0.02280569 1.30308 -0.3014488 0.04338074 1.292597 -0.3014488 0.07019091 1.255696 -0.3014488 0.07019091 1.210083 -0.3014488 0.04338074 1.173181 -0.3014488 0.02280569 1.162698 -0.3014488 0.02280569 1.30308 -0.4446564 0.04338074 1.292597 -0.4446564 0.07019091 1.255696 -0.4446564 0.07019091 1.210083 -0.4446564 0.04338074 1.173181 -0.4446564 0.02280569 1.162698 -0.4446564 0.0514636 1.303722 -0.3730526 0.0832696 1.259944 -0.3730526 0.0832696 1.205832 -0.3730526 0.0514636 1.162055 -0.3730526 0 1.033945 -0.4446564 0 1.033945 -0.3014488 0.02280569 1.104326 -0.3014488 0.04338074 1.093842 -0.3014488 0.07019091 1.05694 -0.3014488 0.07019091 1.011327 -0.3014488 0.05970764 0.9907525 -0.3014488 0.02280569 0.9639416 -0.3014488 0.02280569 1.104326 -0.4446564 0.04338074 1.093842 -0.4446564 0.07019091 1.05694 -0.4446564 0.07019091 1.011327 -0.4446564 0.05970764 0.9907525 -0.4446564 0.02280569 0.9639416 -0.4446564 0.0514636 1.104968 -0.3730526 0.0832696 1.06119 -0.3730526 0.0832696 1.007077 -0.3730526 0.07083368 0.9826705 -0.3730526 0.02705574 0.9508626 -0.3730526 0.04128885 1.351336 -0.3155689 0.02231264 1.332267 -0.3213387 0.04821157 1.351336 -0.3730526 0.02608061 1.332267 -0.3730526 0.04128885 1.351336 -0.4305344 0.02231264 1.332267 -0.4247665 0.04128885 1.313198 -0.3155689 0.04821157 1.313198 -0.3730526 0.04128885 1.313198 -0.4305344 0.04128885 1.15258 -0.3155689 0.02231264 1.133512 -0.3213387 0.04821157 1.15258 -0.3730526 0.02608061 1.133511 -0.3730526 0.04128885 1.15258 -0.4305344 0.02231264 1.133512 -0.4247665 0.04128885 1.114442 -0.3155689 0.04821157 1.114442 -0.3730526 0.04128885 1.114442 -0.4305344 0.1052575 0.8971004 -0.3014488 0.1185508 0.8971004 -0.3730526 0.03974485 0.8971004 -0.3014488 0.04482174 0.8971004 -0.3730526 0.1052575 0.8971004 -0.4446564 0.03974485 0.8971004 -0.4446564 0.1228766 0.8369966 -0.3014488 0.1385765 0.8369966 -0.3730526 0.04550457 0.8369966 -0.3014488 0.05150175 0.8369966 -0.3730526 0.1228766 0.8369966 -0.4446564 0.04550457 0.8369966 -0.4446564 0.1087198 0.7755556 -0.3014488 0.1249328 0.7755556 -0.3730526 0.02881384 0.7755556 -0.3014488 0.03500652 0.7755556 -0.3730526 0.1087198 0.7755556 -0.4446564 0.02881384 0.7755556 -0.4446564 -0.04338121 1.491353 -0.3014488 -0.07019138 1.454451 -0.3014488 -0.07019138 1.408838 -0.3014488 -0.04338121 1.371936 -0.3014488 -0.02280712 1.361454 -0.3014488 -0.04338121 1.491353 -0.4446564 -0.07019138 1.454451 -0.4446564 -0.07019138 1.408838 -0.4446564 -0.04338121 1.371936 -0.4446564 -0.02280712 1.361454 -0.4446564 -0.05146408 1.502478 -0.3730526 -0.08327007 1.458701 -0.3730526 -0.08327007 1.404588 -0.3730526 -0.05146408 1.36081 -0.3730526 -0.02280712 1.30308 -0.3014488 -0.04338121 1.292597 -0.3014488 -0.07019138 1.255696 -0.3014488 -0.07019138 1.210083 -0.3014488 -0.04338121 1.173181 -0.3014488 -0.02280712 1.162698 -0.3014488 -0.02280712 1.30308 -0.4446564 -0.04338121 1.292597 -0.4446564 -0.07019138 1.255696 -0.4446564 -0.07019138 1.210083 -0.4446564 -0.04338121 1.173181 -0.4446564 -0.02280712 1.162698 -0.4446564 -0.05146408 1.303722 -0.3730526 -0.08327007 1.259944 -0.3730526 -0.08327007 1.205832 -0.3730526 -0.05146408 1.162055 -0.3730526 -0.02280712 1.104326 -0.3014488 -0.04338121 1.093842 -0.3014488 -0.07019138 1.05694 -0.3014488 -0.07019138 1.011327 -0.3014488 -0.05970812 0.9907525 -0.3014488 -0.02280712 0.9639416 -0.3014488 -0.02280712 1.104326 -0.4446564 -0.04338121 1.093842 -0.4446564 -0.07019138 1.05694 -0.4446564 -0.07019138 1.011327 -0.4446564 -0.05970812 0.9907525 -0.4446564 -0.02280712 0.9639416 -0.4446564 -0.05146408 1.104968 -0.3730526 -0.08327007 1.06119 -0.3730526 -0.08327007 1.007077 -0.3730526 -0.07083416 0.9826705 -0.3730526 -0.02705622 0.9508626 -0.3730526 -0.04128933 1.351336 -0.3155689 -0.02231312 1.332267 -0.3213387 -0.04821205 1.351336 -0.3730526 -0.02608109 1.332267 -0.3730526 -0.04128933 1.351336 -0.4305344 -0.02231312 1.332267 -0.4247665 -0.04128933 1.313198 -0.3155689 -0.04821205 1.313198 -0.3730526 -0.04128933 1.313198 -0.4305344 -0.04128933 1.15258 -0.3155689 -0.02231312 1.133512 -0.3213387 -0.04821205 1.15258 -0.3730526 -0.02608109 1.133511 -0.3730526 -0.04128933 1.15258 -0.4305344 -0.02231312 1.133512 -0.4247665 -0.04128933 1.114442 -0.3155689 -0.04821205 1.114442 -0.3730526 -0.04128933 1.114442 -0.4305344 -0.1052585 0.8971004 -0.3014488 -0.1185512 0.8971004 -0.3730526 -0.03974533 0.8971004 -0.3014488 -0.04482222 0.8971004 -0.3730526 -0.1052585 0.8971004 -0.4446564 -0.03974533 0.8971004 -0.4446564 -0.1228781 0.8369966 -0.3014488 -0.1385775 0.8369966 -0.3730526 -0.04550505 0.8369966 -0.3014488 -0.05150223 0.8369966 -0.3730526 -0.1228781 0.8369966 -0.4446564 -0.04550505 0.8369966 -0.4446564 -0.1087203 0.7755556 -0.3014488 -0.1249332 0.7755556 -0.3730526 -0.02881432 0.7755556 -0.3014488 -0.03500748 0.7755556 -0.3730526 -0.1087203 0.7755556 -0.4446564 -0.02881432 0.7755556 -0.4446564 0.1249328 0.7189016 -0.3730526 0.1087198 0.7189016 -0.3014488 0.02881384 0.7189016 -0.3014488 0.03500652 0.7189016 -0.3730526 0.1087198 0.7189016 -0.4446564 0.02881384 0.7189016 -0.4446564 -0.1087203 0.7189016 -0.3014488 -0.1249332 0.7189016 -0.3730526 -0.02881432 0.7189016 -0.3014488 -0.03500748 0.7189016 -0.3730526 -0.1087203 0.7189016 -0.4446564 -0.02881432 0.7189016 -0.4446564 0 1.431767 -1.004105 0 1.431767 -0.8608971 0 1.505448 -0.8608971 0.04338074 1.491353 -0.8608971 0.07019091 1.454451 -0.8608971 0.07019091 1.408838 -0.8608971 0.04338074 1.371936 -0.8608971 0.02280569 1.361454 -0.8608971 0 1.505448 -1.004105 0.04338074 1.491353 -1.004105 0.07019091 1.454451 -1.004105 0.07019091 1.408838 -1.004105 0.04338074 1.371936 -1.004105 0.02280569 1.361454 -1.004105 0 1.5192 -0.9325008 0.0514636 1.502478 -0.9325008 0.0832696 1.458701 -0.9325008 0.0832696 1.404588 -0.9325008 0.0514636 1.36081 -0.9325008 0 1.23289 -1.004105 0 1.23289 -0.8608971 0.02280569 1.30308 -0.8608971 0.04338074 1.292597 -0.8608971 0.07019091 1.255696 -0.8608971 0.07019091 1.210083 -0.8608971 0.04338074 1.173181 -0.8608971 0.02280569 1.162698 -0.8608971 0.02280569 1.30308 -1.004105 0.04338074 1.292597 -1.004105 0.07019091 1.255696 -1.004105 0.07019091 1.210083 -1.004105 0.04338074 1.173181 -1.004105 0.02280569 1.162698 -1.004105 0.0514636 1.303722 -0.9325008 0.0832696 1.259944 -0.9325008 0.0832696 1.205832 -0.9325008 0.0514636 1.162055 -0.9325008 0 1.033945 -1.004105 0 1.033945 -0.8608971 0.02280569 1.104326 -0.8608971 0.04338074 1.093842 -0.8608971 0.07019091 1.05694 -0.8608971 0.07019091 1.011327 -0.8608971 0.05970764 0.9907525 -0.8608971 0.02280569 0.9639416 -0.8608971 0.02280569 1.104326 -1.004105 0.04338074 1.093842 -1.004105 0.07019091 1.05694 -1.004105 0.07019091 1.011327 -1.004105 0.05970764 0.9907525 -1.004105 0.02280569 0.9639416 -1.004105 0.0514636 1.104968 -0.9325008 0.0832696 1.06119 -0.9325008 0.0832696 1.007077 -0.9325008 0.07083368 0.9826705 -0.9325008 0.02705574 0.9508626 -0.9325008 0.04128885 1.351336 -0.8750191 0.02231264 1.332267 -0.8807869 0.04821157 1.351336 -0.9325008 0.02608061 1.332267 -0.9325008 0.04128885 1.351336 -0.9899845 0.02231264 1.332267 -0.9842148 0.04128885 1.313198 -0.8750191 0.04821157 1.313198 -0.9325008 0.04128885 1.313198 -0.9899845 0.04128885 1.15258 -0.8750191 0.02231264 1.133512 -0.8807869 0.04821157 1.15258 -0.9325008 0.02608061 1.133511 -0.9325008 0.04128885 1.15258 -0.9899845 0.02231264 1.133512 -0.9842148 0.04128885 1.114442 -0.8750191 0.04821157 1.114442 -0.9325008 0.04128885 1.114442 -0.9899845 0.1052575 0.8971004 -0.8608971 0.1185508 0.8971004 -0.9325008 0.03974485 0.8971004 -0.8608971 0.04482174 0.8971004 -0.9325008 0.1052575 0.8971004 -1.004105 0.03974485 0.8971004 -1.004105 0.1228766 0.8369966 -0.8608971 0.1385765 0.8369966 -0.9325008 0.04550457 0.8369966 -0.8608971 0.05150175 0.8369966 -0.9325008 0.1228766 0.8369966 -1.004105 0.04550457 0.8369966 -1.004105 0.1087198 0.7755556 -0.8608971 0.1249328 0.7755556 -0.9325008 0.02881384 0.7755556 -0.8608971 0.03500652 0.7755556 -0.9325008 0.1087198 0.7755556 -1.004105 0.02881384 0.7755556 -1.004105 -0.04338121 1.491353 -0.8608971 -0.07019138 1.454451 -0.8608971 -0.07019138 1.408838 -0.8608971 -0.04338121 1.371936 -0.8608971 -0.02280712 1.361454 -0.8608971 -0.04338121 1.491353 -1.004105 -0.07019138 1.454451 -1.004105 -0.07019138 1.408838 -1.004105 -0.04338121 1.371936 -1.004105 -0.02280712 1.361454 -1.004105 -0.05146408 1.502478 -0.9325008 -0.08327007 1.458701 -0.9325008 -0.08327007 1.404588 -0.9325008 -0.05146408 1.36081 -0.9325008 -0.02280712 1.30308 -0.8608971 -0.04338121 1.292597 -0.8608971 -0.07019138 1.255696 -0.8608971 -0.07019138 1.210083 -0.8608971 -0.04338121 1.173181 -0.8608971 -0.02280712 1.162698 -0.8608971 -0.02280712 1.30308 -1.004105 -0.04338121 1.292597 -1.004105 -0.07019138 1.255696 -1.004105 -0.07019138 1.210083 -1.004105 -0.04338121 1.173181 -1.004105 -0.02280712 1.162698 -1.004105 -0.05146408 1.303722 -0.9325008 -0.08327007 1.259944 -0.9325008 -0.08327007 1.205832 -0.9325008 -0.05146408 1.162055 -0.9325008 -0.02280712 1.104326 -0.8608971 -0.04338121 1.093842 -0.8608971 -0.07019138 1.05694 -0.8608971 -0.07019138 1.011327 -0.8608971 -0.05970812 0.9907525 -0.8608971 -0.02280712 0.9639416 -0.8608971 -0.02280712 1.104326 -1.004105 -0.04338121 1.093842 -1.004105 -0.07019138 1.05694 -1.004105 -0.07019138 1.011327 -1.004105 -0.05970812 0.9907525 -1.004105 -0.02280712 0.9639416 -1.004105 -0.05146408 1.104968 -0.9325008 -0.08327007 1.06119 -0.9325008 -0.08327007 1.007077 -0.9325008 -0.07083416 0.9826705 -0.9325008 -0.02705622 0.9508626 -0.9325008 -0.04128933 1.351336 -0.8750191 -0.02231312 1.332267 -0.8807869 -0.04821205 1.351336 -0.9325008 -0.02608109 1.332267 -0.9325008 -0.04128933 1.351336 -0.9899845 -0.02231312 1.332267 -0.9842148 -0.04128933 1.313198 -0.8750191 -0.04821205 1.313198 -0.9325008 -0.04128933 1.313198 -0.9899845 -0.04128933 1.15258 -0.8750191 -0.02231312 1.133512 -0.8807869 -0.04821205 1.15258 -0.9325008 -0.02608109 1.133511 -0.9325008 -0.04128933 1.15258 -0.9899845 -0.02231312 1.133512 -0.9842148 -0.04128933 1.114442 -0.8750191 -0.04821205 1.114442 -0.9325008 -0.04128933 1.114442 -0.9899845 -0.1052585 0.8971004 -0.8608971 -0.1185512 0.8971004 -0.9325008 -0.03974533 0.8971004 -0.8608971 -0.04482222 0.8971004 -0.9325008 -0.1052585 0.8971004 -1.004105 -0.03974533 0.8971004 -1.004105 -0.1228781 0.8369966 -0.8608971 -0.1385775 0.8369966 -0.9325008 -0.04550505 0.8369966 -0.8608971 -0.05150223 0.8369966 -0.9325008 -0.1228781 0.8369966 -1.004105 -0.04550505 0.8369966 -1.004105 -0.1087203 0.7755556 -0.8608971 -0.1249332 0.7755556 -0.9325008 -0.02881432 0.7755556 -0.8608971 -0.03500748 0.7755556 -0.9325008 -0.1087203 0.7755556 -1.004105 -0.02881432 0.7755556 -1.004105 0.1249328 0.7189016 -0.9325008 0.1087198 0.7189016 -0.8608971 0.02881384 0.7189016 -0.8608971 0.03500652 0.7189016 -0.9325008 0.1087198 0.7189016 -1.004105 0.02881384 0.7189016 -1.004105 -0.1087203 0.7189016 -0.8608971 -0.1249332 0.7189016 -0.9325008 -0.02881432 0.7189016 -0.8608971 -0.03500748 0.7189016 -0.9325008 -0.1087203 0.7189016 -1.004105 -0.02881432 0.7189016 -1.004105 -0.9989862 -0.2679846 0.1147938 -0.9989862 -0.2679846 0.2580013 -1.062795 -0.3048255 0.2580013 -1.072279 -0.2602084 0.2580013 -1.053726 -0.2185395 0.2580013 -1.014224 -0.1957324 0.2580013 -0.9688611 -0.2004993 0.2580013 -0.9494963 -0.2130764 0.2580013 -1.062795 -0.3048255 0.1147938 -1.072279 -0.2602084 0.1147938 -1.053726 -0.2185395 0.1147938 -1.014224 -0.1957324 0.1147938 -0.9688611 -0.2004993 0.1147938 -0.9494963 -0.2130764 0.1147938 -1.074705 -0.3117006 0.1863976 -1.085956 -0.2587717 0.1863976 -1.063946 -0.2093375 0.1863976 -1.017083 -0.1822805 0.1863976 -0.9632673 -0.1879375 0.1863976 -0.8267531 -0.1685455 0.1147938 -0.8267531 -0.1685455 0.2580013 -0.8989434 -0.1838894 0.2580013 -0.9001513 -0.1608305 0.2580013 -0.8815994 -0.1191614 0.2580013 -0.8420973 -0.09635448 0.2580013 -0.7967343 -0.1011224 0.2580013 -0.7773681 -0.1136985 0.2580013 -0.8989434 -0.1838894 0.1147938 -0.9001513 -0.1608305 0.1147938 -0.8815994 -0.1191614 0.1147938 -0.8420973 -0.09635448 0.1147938 -0.7967343 -0.1011224 0.1147938 -0.7773681 -0.1136985 0.1147938 -0.9138284 -0.1593935 0.1863976 -0.8918195 -0.1099594 0.1863976 -0.8449564 -0.08290339 0.1863976 -0.7911401 -0.08855939 0.1863976 -0.6544623 -0.06907344 0.1147938 -0.6544623 -0.06907344 0.2580013 -0.7268162 -0.08451247 0.2580013 -0.7280245 -0.06145334 0.2580013 -0.7094722 -0.0197835 0.2580013 -0.6699691 0.003022432 0.2580013 -0.6469111 0.004231453 0.2580013 -0.6052413 -0.01432157 0.2580013 -0.7268162 -0.08451247 0.1147938 -0.7280245 -0.06145334 0.1147938 -0.7094722 -0.0197835 0.1147938 -0.66997 0.003023624 0.1147938 -0.6469111 0.004231453 0.1147938 -0.6052413 -0.01432157 0.1147938 -0.7417011 -0.06001544 0.1863976 -0.7196913 -0.01058149 0.1863976 -0.6728292 0.01647449 0.1863976 -0.6454744 0.01790762 0.1863976 -0.5960393 -0.004101515 0.1863976 -0.9499755 -0.1920125 0.2438793 -0.9239731 -0.1989105 0.2381096 -0.9534373 -0.1860166 0.1863976 -0.9258571 -0.1956475 0.1863976 -0.9499755 -0.1920125 0.1289158 -0.9239731 -0.1989105 0.1346836 -0.9169464 -0.1729424 0.2438793 -0.9204082 -0.1669464 0.1863976 -0.9169464 -0.1729424 0.1289158 -0.7778473 -0.09263444 0.2438793 -0.7518463 -0.09953356 0.2381096 -0.7813091 -0.08663845 0.1863976 -0.7537293 -0.09626937 0.1863976 -0.7778473 -0.09263444 0.1289158 -0.7518463 -0.09953356 0.1346836 -0.7448182 -0.07356453 0.2438793 -0.7482815 -0.06756949 0.1863976 -0.7448182 -0.07356453 0.1289158 -0.5885801 0.0905056 0.2580013 -0.5952272 0.1020176 0.1863976 -0.5558233 0.03376865 0.2580013 -0.5583625 0.03816652 0.1863976 -0.5885801 0.0905056 0.1147938 -0.5558233 0.03376865 0.1147938 -0.5453382 0.1358156 0.2580013 -0.5531883 0.1494114 0.1863976 -0.5066524 0.06880951 0.2580013 -0.5096502 0.0740025 0.1863976 -0.5453382 0.1358156 0.1147938 -0.5066524 0.06880951 0.1147938 -0.4850512 0.1542757 0.2580013 -0.4931574 0.1683166 0.1863976 -0.4450984 0.08507466 0.2580013 -0.448194 0.09043765 0.1863976 -0.4850512 0.1542757 0.1147938 -0.4450984 0.08507466 0.1147938 -1.028898 -0.3353465 0.2580013 -0.9835353 -0.3401134 0.2580013 -0.9440331 -0.3173072 0.2580013 -0.9254804 -0.2756374 0.2580013 -0.9266891 -0.2525785 0.2580013 -1.028898 -0.3353465 0.1147938 -0.9835353 -0.3401134 0.1147938 -0.9440331 -0.3173072 0.1147938 -0.9254804 -0.2756374 0.1147938 -0.9266891 -0.2525785 0.1147938 -1.034492 -0.3479083 0.1863976 -0.9806762 -0.3535655 0.1863976 -0.9338131 -0.3265083 0.1863976 -0.9118042 -0.2770746 0.1863976 -0.8761373 -0.2233922 0.2580013 -0.8567715 -0.2359684 0.2580013 -0.811408 -0.2407362 0.2580013 -0.7719064 -0.2179296 0.2580013 -0.7533531 -0.1762595 0.2580013 -0.7545614 -0.1532004 0.2580013 -0.8761373 -0.2233922 0.1147938 -0.8567715 -0.2359684 0.1147938 -0.811408 -0.2407362 0.1147938 -0.7719064 -0.2179296 0.1147938 -0.7533531 -0.1762595 0.1147938 -0.7545614 -0.1532004 0.1147938 -0.8623643 -0.2485316 0.1863976 -0.8085485 -0.2541873 0.1863976 -0.7616863 -0.2271316 0.1863976 -0.7396774 -0.1776974 0.1863976 -0.7040105 -0.1240144 0.2580013 -0.6846442 -0.1365905 0.2580013 -0.6392803 -0.1413584 0.2580013 -0.5997782 -0.1185515 0.2580013 -0.5872021 -0.09918642 0.2580013 -0.5824342 -0.05382252 0.2580013 -0.7040105 -0.1240144 0.1147938 -0.6846442 -0.1365905 0.1147938 -0.6392803 -0.1413584 0.1147938 -0.5997782 -0.1185515 0.1147938 -0.5872021 -0.09918642 0.1147938 -0.5824342 -0.05382252 0.1147938 -0.690237 -0.1491535 0.1863976 -0.6364222 -0.1548095 0.1863976 -0.5895591 -0.1277535 0.1863976 -0.5746403 -0.1047804 0.1863976 -0.5689831 -0.0509634 0.1863976 -0.9086862 -0.2635267 0.2438793 -0.9016604 -0.2375576 0.2381096 -0.9052253 -0.2695215 0.1863976 -0.8997765 -0.2408216 0.1863976 -0.9086862 -0.2635267 0.1289158 -0.9016604 -0.2375576 0.1346836 -0.8756571 -0.2444565 0.2438793 -0.8721962 -0.2504523 0.1863976 -0.8756571 -0.2444565 0.1289158 -0.7365594 -0.1641486 0.2438793 -0.7295332 -0.1381805 0.2381096 -0.7330971 -0.1701434 0.1863976 -0.7276483 -0.1414435 0.1863976 -0.7365594 -0.1641486 0.1289158 -0.7295332 -0.1381805 0.1346836 -0.7035303 -0.1450784 0.2438793 -0.7000694 -0.1510744 0.1863976 -0.7035303 -0.1450784 0.1289158 -0.4833221 -0.09180737 0.2580013 -0.476675 -0.1033194 0.1863976 -0.5160794 -0.03507042 0.2580013 -0.5135403 -0.03946853 0.1863976 -0.4833221 -0.09180737 0.1147938 -0.5160794 -0.03507042 0.1147938 -0.422461 -0.07701445 0.2580013 -0.4146113 -0.0906105 0.1863976 -0.4611473 -0.01000738 0.2580013 -0.4581494 -0.01520157 0.1863976 -0.422461 -0.07701445 0.1147938 -0.4611473 -0.01000738 0.1147938 -0.3763313 -0.03403354 0.2580013 -0.3682241 -0.04807448 0.1863976 -0.4162841 0.03516746 0.2580013 -0.413187 0.02980351 0.1863976 -0.3763313 -0.03403354 0.1147938 -0.4162841 0.03516746 0.1147938 -0.4440932 0.1966436 0.1863976 -0.435986 0.1826026 0.2580013 -0.3960342 0.1134017 0.2580013 -0.3991303 0.1187646 0.1863976 -0.435986 0.1826026 0.1147938 -0.3960342 0.1134017 0.1147938 -0.3272672 -0.005706549 0.2580013 -0.3191605 -0.0197475 0.1863976 -0.3672204 0.06349444 0.2580013 -0.3641233 0.05813146 0.1863976 -0.3272672 -0.005706549 0.1147938 -0.3672204 0.06349444 0.1147938 -0.9989862 -0.2679846 -0.4446564 -0.9989862 -0.2679846 -0.3014488 -1.062795 -0.3048255 -0.3014488 -1.072279 -0.2602084 -0.3014488 -1.053726 -0.2185395 -0.3014488 -1.014224 -0.1957324 -0.3014488 -0.9688611 -0.2004993 -0.3014488 -0.9494963 -0.2130764 -0.3014488 -1.062795 -0.3048255 -0.4446564 -1.072279 -0.2602084 -0.4446564 -1.053726 -0.2185395 -0.4446564 -1.014224 -0.1957324 -0.4446564 -0.9688611 -0.2004993 -0.4446564 -0.9494963 -0.2130764 -0.4446564 -1.074705 -0.3117006 -0.3730526 -1.085956 -0.2587717 -0.3730526 -1.063946 -0.2093375 -0.3730526 -1.017083 -0.1822805 -0.3730526 -0.9632673 -0.1879375 -0.3730526 -0.8267531 -0.1685455 -0.4446564 -0.8267531 -0.1685455 -0.3014488 -0.8989434 -0.1838894 -0.3014488 -0.9001513 -0.1608305 -0.3014488 -0.8815994 -0.1191614 -0.3014488 -0.8420973 -0.09635448 -0.3014488 -0.7967343 -0.1011224 -0.3014488 -0.7773681 -0.1136985 -0.3014488 -0.8989434 -0.1838894 -0.4446564 -0.9001513 -0.1608305 -0.4446564 -0.8815994 -0.1191614 -0.4446564 -0.8420973 -0.09635448 -0.4446564 -0.7967343 -0.1011224 -0.4446564 -0.7773681 -0.1136985 -0.4446564 -0.9138284 -0.1593935 -0.3730526 -0.8918195 -0.1099594 -0.3730526 -0.8449564 -0.08290339 -0.3730526 -0.7911401 -0.08855939 -0.3730526 -0.6544623 -0.06907344 -0.4446564 -0.6544623 -0.06907344 -0.3014488 -0.7268162 -0.08451247 -0.3014488 -0.7280245 -0.06145334 -0.3014488 -0.7094722 -0.0197835 -0.3014488 -0.6699691 0.003022432 -0.3014488 -0.6469111 0.004231453 -0.3014488 -0.6052413 -0.01432157 -0.3014488 -0.7268162 -0.08451247 -0.4446564 -0.7280245 -0.06145334 -0.4446564 -0.7094722 -0.0197835 -0.4446564 -0.66997 0.003023624 -0.4446564 -0.6469111 0.004231453 -0.4446564 -0.6052413 -0.01432157 -0.4446564 -0.7417011 -0.06001544 -0.3730526 -0.7196913 -0.01058149 -0.3730526 -0.6728292 0.01647449 -0.3730526 -0.6454744 0.01790762 -0.3730526 -0.5960393 -0.004101515 -0.3730526 -0.9499755 -0.1920125 -0.3155689 -0.9239731 -0.1989105 -0.3213387 -0.9534373 -0.1860166 -0.3730526 -0.9258571 -0.1956475 -0.3730526 -0.9499755 -0.1920125 -0.4305344 -0.9239731 -0.1989105 -0.4247665 -0.9169464 -0.1729424 -0.3155689 -0.9204082 -0.1669464 -0.3730526 -0.9169464 -0.1729424 -0.4305344 -0.7778473 -0.09263444 -0.3155689 -0.7518463 -0.09953356 -0.3213387 -0.7813091 -0.08663845 -0.3730526 -0.7537293 -0.09626937 -0.3730526 -0.7778473 -0.09263444 -0.4305344 -0.7518463 -0.09953356 -0.4247665 -0.7448182 -0.07356453 -0.3155689 -0.7482815 -0.06756949 -0.3730526 -0.7448182 -0.07356453 -0.4305344 -0.5885801 0.0905056 -0.3014488 -0.5952272 0.1020176 -0.3730526 -0.5558233 0.03376865 -0.3014488 -0.5583625 0.03816652 -0.3730526 -0.5885801 0.0905056 -0.4446564 -0.5558233 0.03376865 -0.4446564 -0.5453382 0.1358156 -0.3014488 -0.5531883 0.1494114 -0.3730526 -0.5066524 0.06880951 -0.3014488 -0.5096502 0.0740025 -0.3730526 -0.5453382 0.1358156 -0.4446564 -0.5066524 0.06880951 -0.4446564 -0.4850512 0.1542757 -0.3014488 -0.4931574 0.1683166 -0.3730526 -0.4450984 0.08507466 -0.3014488 -0.448194 0.09043765 -0.3730526 -0.4850512 0.1542757 -0.4446564 -0.4450984 0.08507466 -0.4446564 -1.028898 -0.3353465 -0.3014488 -0.9835353 -0.3401134 -0.3014488 -0.9440331 -0.3173072 -0.3014488 -0.9254804 -0.2756374 -0.3014488 -0.9266891 -0.2525785 -0.3014488 -1.028898 -0.3353465 -0.4446564 -0.9835353 -0.3401134 -0.4446564 -0.9440331 -0.3173072 -0.4446564 -0.9254804 -0.2756374 -0.4446564 -0.9266891 -0.2525785 -0.4446564 -1.034492 -0.3479083 -0.3730526 -0.9806762 -0.3535655 -0.3730526 -0.9338131 -0.3265083 -0.3730526 -0.9118042 -0.2770746 -0.3730526 -0.8761373 -0.2233922 -0.3014488 -0.8567715 -0.2359684 -0.3014488 -0.811408 -0.2407362 -0.3014488 -0.7719064 -0.2179296 -0.3014488 -0.7533531 -0.1762595 -0.3014488 -0.7545614 -0.1532004 -0.3014488 -0.8761373 -0.2233922 -0.4446564 -0.8567715 -0.2359684 -0.4446564 -0.811408 -0.2407362 -0.4446564 -0.7719064 -0.2179296 -0.4446564 -0.7533531 -0.1762595 -0.4446564 -0.7545614 -0.1532004 -0.4446564 -0.8623643 -0.2485316 -0.3730526 -0.8085485 -0.2541873 -0.3730526 -0.7616863 -0.2271316 -0.3730526 -0.7396774 -0.1776974 -0.3730526 -0.7040105 -0.1240144 -0.3014488 -0.6846442 -0.1365905 -0.3014488 -0.6392803 -0.1413584 -0.3014488 -0.5997782 -0.1185515 -0.3014488 -0.5872021 -0.09918642 -0.3014488 -0.5824342 -0.05382252 -0.3014488 -0.7040105 -0.1240144 -0.4446564 -0.6846442 -0.1365905 -0.4446564 -0.6392803 -0.1413584 -0.4446564 -0.5997782 -0.1185515 -0.4446564 -0.5872021 -0.09918642 -0.4446564 -0.5824342 -0.05382252 -0.4446564 -0.690237 -0.1491535 -0.3730526 -0.6364222 -0.1548095 -0.3730526 -0.5895591 -0.1277535 -0.3730526 -0.5746403 -0.1047804 -0.3730526 -0.5689831 -0.0509634 -0.3730526 -0.9086862 -0.2635267 -0.3155689 -0.9016604 -0.2375576 -0.3213387 -0.9052253 -0.2695215 -0.3730526 -0.8997765 -0.2408216 -0.3730526 -0.9086862 -0.2635267 -0.4305344 -0.9016604 -0.2375576 -0.4247665 -0.8756571 -0.2444565 -0.3155689 -0.8721962 -0.2504523 -0.3730526 -0.8756571 -0.2444565 -0.4305344 -0.7365594 -0.1641486 -0.3155689 -0.7295332 -0.1381805 -0.3213387 -0.7330971 -0.1701434 -0.3730526 -0.7276483 -0.1414435 -0.3730526 -0.7365594 -0.1641486 -0.4305344 -0.7295332 -0.1381805 -0.4247665 -0.7035303 -0.1450784 -0.3155689 -0.7000694 -0.1510744 -0.3730526 -0.7035303 -0.1450784 -0.4305344 -0.4833221 -0.09180737 -0.3014488 -0.476675 -0.1033194 -0.3730526 -0.5160794 -0.03507042 -0.3014488 -0.5135403 -0.03946853 -0.3730526 -0.4833221 -0.09180737 -0.4446564 -0.5160794 -0.03507042 -0.4446564 -0.422461 -0.07701445 -0.3014488 -0.4146113 -0.0906105 -0.3730526 -0.4611473 -0.01000738 -0.3014488 -0.4581494 -0.01520157 -0.3730526 -0.422461 -0.07701445 -0.4446564 -0.4611473 -0.01000738 -0.4446564 -0.3763313 -0.03403354 -0.3014488 -0.3682241 -0.04807448 -0.3730526 -0.4162841 0.03516746 -0.3014488 -0.413187 0.02980351 -0.3730526 -0.3763313 -0.03403354 -0.4446564 -0.4162841 0.03516746 -0.4446564 -0.4440932 0.1966436 -0.3730526 -0.435986 0.1826026 -0.3014488 -0.3960342 0.1134017 -0.3014488 -0.3991303 0.1187646 -0.3730526 -0.435986 0.1826026 -0.4446564 -0.3960342 0.1134017 -0.4446564 -0.3272672 -0.005706549 -0.3014488 -0.3191605 -0.0197475 -0.3730526 -0.3672204 0.06349444 -0.3014488 -0.3641233 0.05813146 -0.3730526 -0.3272672 -0.005706549 -0.4446564 -0.3672204 0.06349444 -0.4446564 -0.9989862 -0.2679846 -1.004105 -0.9989862 -0.2679846 -0.8608971 -1.062795 -0.3048255 -0.8608971 -1.072279 -0.2602084 -0.8608971 -1.053726 -0.2185395 -0.8608971 -1.014224 -0.1957324 -0.8608971 -0.9688611 -0.2004993 -0.8608971 -0.9494963 -0.2130764 -0.8608971 -1.062795 -0.3048255 -1.004105 -1.072279 -0.2602084 -1.004105 -1.053726 -0.2185395 -1.004105 -1.014224 -0.1957324 -1.004105 -0.9688611 -0.2004993 -1.004105 -0.9494963 -0.2130764 -1.004105 -1.074705 -0.3117006 -0.9325008 -1.085956 -0.2587717 -0.9325008 -1.063946 -0.2093375 -0.9325008 -1.017083 -0.1822805 -0.9325008 -0.9632673 -0.1879375 -0.9325008 -0.8267531 -0.1685455 -1.004105 -0.8267531 -0.1685455 -0.8608971 -0.8989434 -0.1838894 -0.8608971 -0.9001513 -0.1608305 -0.8608971 -0.8815994 -0.1191614 -0.8608971 -0.8420973 -0.09635448 -0.8608971 -0.7967343 -0.1011224 -0.8608971 -0.7773681 -0.1136985 -0.8608971 -0.8989434 -0.1838894 -1.004105 -0.9001513 -0.1608305 -1.004105 -0.8815994 -0.1191614 -1.004105 -0.8420973 -0.09635448 -1.004105 -0.7967343 -0.1011224 -1.004105 -0.7773681 -0.1136985 -1.004105 -0.9138284 -0.1593935 -0.9325008 -0.8918195 -0.1099594 -0.9325008 -0.8449564 -0.08290339 -0.9325008 -0.7911401 -0.08855939 -0.9325008 -0.6544623 -0.06907344 -1.004105 -0.6544623 -0.06907344 -0.8608971 -0.7268162 -0.08451247 -0.8608971 -0.7280245 -0.06145334 -0.8608971 -0.7094722 -0.0197835 -0.8608971 -0.6699691 0.003022432 -0.8608971 -0.6469111 0.004231453 -0.8608971 -0.6052413 -0.01432157 -0.8608971 -0.7268162 -0.08451247 -1.004105 -0.7280245 -0.06145334 -1.004105 -0.7094722 -0.0197835 -1.004105 -0.66997 0.003023624 -1.004105 -0.6469111 0.004231453 -1.004105 -0.6052413 -0.01432157 -1.004105 -0.7417011 -0.06001544 -0.9325008 -0.7196913 -0.01058149 -0.9325008 -0.6728292 0.01647449 -0.9325008 -0.6454744 0.01790762 -0.9325008 -0.5960393 -0.004101515 -0.9325008 -0.9499755 -0.1920125 -0.8750191 -0.9239731 -0.1989105 -0.8807869 -0.9534373 -0.1860166 -0.9325008 -0.9258571 -0.1956475 -0.9325008 -0.9499755 -0.1920125 -0.9899845 -0.9239731 -0.1989105 -0.9842148 -0.9169464 -0.1729424 -0.8750191 -0.9204082 -0.1669464 -0.9325008 -0.9169464 -0.1729424 -0.9899845 -0.7778473 -0.09263444 -0.8750191 -0.7518463 -0.09953356 -0.8807869 -0.7813091 -0.08663845 -0.9325008 -0.7537293 -0.09626937 -0.9325008 -0.7778473 -0.09263444 -0.9899845 -0.7518463 -0.09953356 -0.9842148 -0.7448182 -0.07356453 -0.8750191 -0.7482815 -0.06756949 -0.9325008 -0.7448182 -0.07356453 -0.9899845 -0.5885801 0.0905056 -0.8608971 -0.5952272 0.1020176 -0.9325008 -0.5558233 0.03376865 -0.8608971 -0.5583625 0.03816652 -0.9325008 -0.5885801 0.0905056 -1.004105 -0.5558233 0.03376865 -1.004105 -0.5453382 0.1358156 -0.8608971 -0.5531883 0.1494114 -0.9325008 -0.5066524 0.06880951 -0.8608971 -0.5096502 0.0740025 -0.9325008 -0.5453382 0.1358156 -1.004105 -0.5066524 0.06880951 -1.004105 -0.4850512 0.1542757 -0.8608971 -0.4931574 0.1683166 -0.9325008 -0.4450984 0.08507466 -0.8608971 -0.448194 0.09043765 -0.9325008 -0.4850512 0.1542757 -1.004105 -0.4450984 0.08507466 -1.004105 -1.028898 -0.3353465 -0.8608971 -0.9835353 -0.3401134 -0.8608971 -0.9440331 -0.3173072 -0.8608971 -0.9254804 -0.2756374 -0.8608971 -0.9266891 -0.2525785 -0.8608971 -1.028898 -0.3353465 -1.004105 -0.9835353 -0.3401134 -1.004105 -0.9440331 -0.3173072 -1.004105 -0.9254804 -0.2756374 -1.004105 -0.9266891 -0.2525785 -1.004105 -1.034492 -0.3479083 -0.9325008 -0.9806762 -0.3535655 -0.9325008 -0.9338131 -0.3265083 -0.9325008 -0.9118042 -0.2770746 -0.9325008 -0.8761373 -0.2233922 -0.8608971 -0.8567715 -0.2359684 -0.8608971 -0.811408 -0.2407362 -0.8608971 -0.7719064 -0.2179296 -0.8608971 -0.7533531 -0.1762595 -0.8608971 -0.7545614 -0.1532004 -0.8608971 -0.8761373 -0.2233922 -1.004105 -0.8567715 -0.2359684 -1.004105 -0.811408 -0.2407362 -1.004105 -0.7719064 -0.2179296 -1.004105 -0.7533531 -0.1762595 -1.004105 -0.7545614 -0.1532004 -1.004105 -0.8623643 -0.2485316 -0.9325008 -0.8085485 -0.2541873 -0.9325008 -0.7616863 -0.2271316 -0.9325008 -0.7396774 -0.1776974 -0.9325008 -0.7040105 -0.1240144 -0.8608971 -0.6846442 -0.1365905 -0.8608971 -0.6392803 -0.1413584 -0.8608971 -0.5997782 -0.1185515 -0.8608971 -0.5872021 -0.09918642 -0.8608971 -0.5824342 -0.05382252 -0.8608971 -0.7040105 -0.1240144 -1.004105 -0.6846442 -0.1365905 -1.004105 -0.6392803 -0.1413584 -1.004105 -0.5997782 -0.1185515 -1.004105 -0.5872021 -0.09918642 -1.004105 -0.5824342 -0.05382252 -1.004105 -0.690237 -0.1491535 -0.9325008 -0.6364222 -0.1548095 -0.9325008 -0.5895591 -0.1277535 -0.9325008 -0.5746403 -0.1047804 -0.9325008 -0.5689831 -0.0509634 -0.9325008 -0.9086862 -0.2635267 -0.8750191 -0.9016604 -0.2375576 -0.8807869 -0.9052253 -0.2695215 -0.9325008 -0.8997765 -0.2408216 -0.9325008 -0.9086862 -0.2635267 -0.9899845 -0.9016604 -0.2375576 -0.9842148 -0.8756571 -0.2444565 -0.8750191 -0.8721962 -0.2504523 -0.9325008 -0.8756571 -0.2444565 -0.9899845 -0.7365594 -0.1641486 -0.8750191 -0.7295332 -0.1381805 -0.8807869 -0.7330971 -0.1701434 -0.9325008 -0.7276483 -0.1414435 -0.9325008 -0.7365594 -0.1641486 -0.9899845 -0.7295332 -0.1381805 -0.9842148 -0.7035303 -0.1450784 -0.8750191 -0.7000694 -0.1510744 -0.9325008 -0.7035303 -0.1450784 -0.9899845 -0.4833221 -0.09180737 -0.8608971 -0.476675 -0.1033194 -0.9325008 -0.5160794 -0.03507042 -0.8608971 -0.5135403 -0.03946853 -0.9325008 -0.4833221 -0.09180737 -1.004105 -0.5160794 -0.03507042 -1.004105 -0.422461 -0.07701445 -0.8608971 -0.4146113 -0.0906105 -0.9325008 -0.4611473 -0.01000738 -0.8608971 -0.4581494 -0.01520157 -0.9325008 -0.422461 -0.07701445 -1.004105 -0.4611473 -0.01000738 -1.004105 -0.3763313 -0.03403354 -0.8608971 -0.3682241 -0.04807448 -0.9325008 -0.4162841 0.03516746 -0.8608971 -0.413187 0.02980351 -0.9325008 -0.3763313 -0.03403354 -1.004105 -0.4162841 0.03516746 -1.004105 -0.4440932 0.1966436 -0.9325008 -0.435986 0.1826026 -0.8608971 -0.3960342 0.1134017 -0.8608971 -0.3991303 0.1187646 -0.9325008 -0.435986 0.1826026 -1.004105 -0.3960342 0.1134017 -1.004105 -0.3272672 -0.005706549 -0.8608971 -0.3191605 -0.0197475 -0.9325008 -0.3672204 0.06349444 -0.8608971 -0.3641233 0.05813146 -0.9325008 -0.3272672 -0.005706549 -1.004105 -0.3672204 0.06349444 -1.004105 1.000382 -0.2679846 -1.005463 1.000382 -0.2679846 -0.8622551 1.064193 -0.3048255 -0.8622551 1.030295 -0.3353465 -0.8622551 0.9849329 -0.3401134 -0.8622551 0.9454308 -0.3173072 -0.8622551 0.926878 -0.2756374 -0.8622551 0.9280863 -0.2525785 -0.8622551 1.064193 -0.3048255 -1.005463 1.030295 -0.3353465 -1.005463 0.9849329 -0.3401134 -1.005463 0.9454308 -0.3173072 -1.005463 0.926878 -0.2756374 -1.005463 0.9280863 -0.2525785 -1.005463 1.076103 -0.3117006 -0.9338589 1.03589 -0.3479083 -0.9338589 0.9820738 -0.3535655 -0.9338589 0.9352112 -0.3265083 -0.9338589 0.9132013 -0.2770746 -0.9338589 0.8281498 -0.1685455 -1.005463 0.8281498 -0.1685455 -0.8622551 0.8775349 -0.2233922 -0.8622551 0.8581676 -0.2359684 -0.8622551 0.8128061 -0.2407362 -0.8622551 0.773304 -0.2179296 -0.8622551 0.7547512 -0.1762595 -0.8622551 0.7559586 -0.1532004 -0.8622551 0.8775349 -0.2233922 -1.005463 0.8581676 -0.2359684 -1.005463 0.8128061 -0.2407362 -1.005463 0.773304 -0.2179296 -1.005463 0.7547512 -0.1762595 -1.005463 0.7559586 -0.1532004 -1.005463 0.8637619 -0.2485316 -0.9338589 0.8099461 -0.2541873 -0.9338589 0.7630835 -0.2271316 -0.9338589 0.7410746 -0.1776974 -0.9338589 0.655859 -0.06907344 -1.005463 0.655859 -0.06907344 -0.8622551 0.7054081 -0.1240144 -0.8622551 0.6860409 -0.1365905 -0.8622551 0.6406775 -0.1413584 -0.8622551 0.6011753 -0.1185515 -0.8622551 0.5886002 -0.09918642 -0.8622551 0.5838318 -0.05382252 -0.8622551 0.7054081 -0.1240144 -1.005463 0.6860409 -0.1365905 -1.005463 0.6406775 -0.1413584 -1.005463 0.6011753 -0.1185515 -1.005463 0.5886002 -0.09918642 -1.005463 0.5838318 -0.05382252 -1.005463 0.6916351 -0.1491535 -0.9338589 0.6378183 -0.1548095 -0.9338589 0.5909567 -0.1277535 -0.9338589 0.5760374 -0.1047804 -0.9338589 0.5703812 -0.0509634 -0.9338589 0.9100838 -0.2635267 -0.8763771 0.9030581 -0.2375576 -0.8821449 0.9066229 -0.2695215 -0.9338589 0.9011736 -0.2408216 -0.9338589 0.9100838 -0.2635267 -0.9913425 0.9030581 -0.2375576 -0.9855728 0.8770552 -0.2444565 -0.8763771 0.8735933 -0.2504523 -0.9338589 0.8770552 -0.2444565 -0.9913425 0.737956 -0.1641486 -0.8763771 0.7309303 -0.1381805 -0.8821449 0.7344952 -0.1701434 -0.9338589 0.7290459 -0.1414435 -0.9338589 0.737956 -0.1641486 -0.9913425 0.7309303 -0.1381805 -0.9855728 0.7049265 -0.1450784 -0.8763771 0.7014666 -0.1510744 -0.9338589 0.7049265 -0.1450784 -0.9913425 0.4847193 -0.09180737 -0.8622551 0.4780731 -0.1033194 -0.9338589 0.517477 -0.03507042 -0.8622551 0.5149374 -0.03946853 -0.9338589 0.4847193 -0.09180737 -1.005463 0.517477 -0.03507042 -1.005463 0.4238586 -0.07701445 -0.8622551 0.4160089 -0.0906105 -0.9338589 0.4625444 -0.01000738 -0.8622551 0.4595461 -0.01520157 -0.9338589 0.4238586 -0.07701445 -1.005463 0.4625444 -0.01000738 -1.005463 0.3777275 -0.03403354 -0.8622551 0.3696213 -0.04807448 -0.9338589 0.4176807 0.03516746 -0.8622551 0.4145851 0.02980351 -0.9338589 0.3777275 -0.03403354 -1.005463 0.4176807 0.03516746 -1.005463 1.073677 -0.2602084 -0.8622551 1.055123 -0.2185395 -0.8622551 1.015622 -0.1957324 -0.8622551 0.9702587 -0.2004993 -0.8622551 0.9508924 -0.2130764 -0.8622551 1.073677 -0.2602084 -1.005463 1.055123 -0.2185395 -1.005463 1.015622 -0.1957324 -1.005463 0.9702587 -0.2004993 -1.005463 0.9508924 -0.2130764 -1.005463 1.087353 -0.2587717 -0.9338589 1.065344 -0.2093375 -0.9338589 1.01848 -0.1822805 -0.9338589 0.9646645 -0.1879375 -0.9338589 0.900341 -0.1838894 -0.8622551 0.9015484 -0.1608305 -0.8622551 0.8829966 -0.1191614 -0.8622551 0.8434944 -0.09635448 -0.8622551 0.7981319 -0.1011224 -0.8622551 0.7787657 -0.1136985 -0.8622551 0.900341 -0.1838894 -1.005463 0.9015484 -0.1608305 -1.005463 0.8829966 -0.1191614 -1.005463 0.8434944 -0.09635448 -1.005463 0.7981319 -0.1011224 -1.005463 0.7787657 -0.1136985 -1.005463 0.915226 -0.1593935 -0.9338589 0.8932161 -0.1099594 -0.9338589 0.8463535 -0.08290339 -0.9338589 0.7925377 -0.08855939 -0.9338589 0.7282133 -0.08451247 -0.8622551 0.7294216 -0.06145334 -0.8622551 0.7108698 -0.0197835 -0.8622551 0.6713667 0.003022432 -0.8622551 0.6483078 0.004231453 -0.8622551 0.6066389 -0.01432157 -0.8622551 0.7282133 -0.08451247 -1.005463 0.7294216 -0.06145334 -1.005463 0.7108698 -0.0197835 -1.005463 0.6713667 0.003022432 -1.005463 0.6483078 0.004231453 -1.005463 0.6066389 -0.01432157 -1.005463 0.7430992 -0.06001544 -0.9338589 0.7210884 -0.01058149 -0.9338589 0.6742268 0.01647449 -0.9338589 0.6468706 0.01790762 -0.9338589 0.5974369 -0.004101515 -0.9338589 0.9513731 -0.1920125 -0.8763771 0.9253693 -0.1989105 -0.8821449 0.954834 -0.1860166 -0.9338589 0.9272537 -0.1956475 -0.9338589 0.9513731 -0.1920125 -0.9913425 0.9253693 -0.1989105 -0.9855728 0.9183435 -0.1729424 -0.8763771 0.9218044 -0.1669464 -0.9338589 0.9183435 -0.1729424 -0.9913425 0.7792444 -0.09263444 -0.8763771 0.7532425 -0.09953356 -0.8821449 0.7827063 -0.08663845 -0.9338589 0.755127 -0.09626937 -0.9338589 0.7792444 -0.09263444 -0.9913425 0.7532425 -0.09953356 -0.9855728 0.7462158 -0.07356453 -0.8763771 0.7496777 -0.06756949 -0.9338589 0.7462158 -0.07356453 -0.9913425 0.5899773 0.0905056 -0.8622551 0.5966244 0.1020176 -0.9338589 0.5572205 0.03376865 -0.8622551 0.5597601 0.03816652 -0.9338589 0.5899773 0.0905056 -1.005463 0.5572205 0.03376865 -1.005463 0.5467358 0.1358156 -0.8622551 0.5545855 0.1494114 -0.9338589 0.50805 0.06880951 -0.8622551 0.5110474 0.0740025 -0.9338589 0.5467358 0.1358156 -1.005463 0.50805 0.06880951 -1.005463 0.4864473 0.1542757 -0.8622551 0.4945545 0.1683166 -0.9338589 0.4464951 0.08507466 -0.8622551 0.4495916 0.09043765 -0.9338589 0.4864473 0.1542757 -1.005463 0.4464951 0.08507466 -1.005463 0.3205576 -0.0197475 -0.9338589 0.3286638 -0.005706549 -0.8622551 0.3686171 0.06349444 -0.8622551 0.3655205 0.05813146 -0.9338589 0.3286638 -0.005706549 -1.005463 0.3686171 0.06349444 -1.005463 0.4373837 0.1826026 -0.8622551 0.4454908 0.1966436 -0.9338589 0.3974304 0.1134017 -0.8622551 0.400528 0.1187646 -0.9338589 0.4373837 0.1826026 -1.005463 0.3974304 0.1134017 -1.005463 1.000382 -0.2679846 -0.4446564 1.000382 -0.2679846 -0.3014488 1.064193 -0.3048255 -0.3014488 1.030295 -0.3353465 -0.3014488 0.9849329 -0.3401134 -0.3014488 0.9454308 -0.3173072 -0.3014488 0.926878 -0.2756374 -0.3014488 0.9280863 -0.2525785 -0.3014488 1.064193 -0.3048255 -0.4446564 1.030295 -0.3353465 -0.4446564 0.9849329 -0.3401134 -0.4446564 0.9454308 -0.3173072 -0.4446564 0.926878 -0.2756374 -0.4446564 0.9280863 -0.2525785 -0.4446564 1.076103 -0.3117006 -0.3730526 1.03589 -0.3479083 -0.3730526 0.9820738 -0.3535655 -0.3730526 0.9352112 -0.3265083 -0.3730526 0.9132013 -0.2770746 -0.3730526 0.8281498 -0.1685455 -0.4446564 0.8281498 -0.1685455 -0.3014488 0.8775349 -0.2233922 -0....
 
[truncated message content]

[Vegastrike-cvs] SF.net SVN: vegastrike:[13674] trunk/data/modules/unit.py

From: <kla...@us...> - 2014-03-09 04:13:24

Revision: 13674
          http://sourceforge.net/p/vegastrike/code/13674
Author:   klaussfreire
Date:     2014-03-09 04:13:21 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Fix another typo

Modified Paths:
--------------
    trunk/data/modules/unit.py

Modified: trunk/data/modules/unit.py
===================================================================
--- trunk/data/modules/unit.py	2014-03-07 18:34:51 UTC (rev 13673)
+++ trunk/data/modules/unit.py	2014-03-09 04:13:21 UTC (rev 13674)
@@ -119,7 +119,7 @@
     res = []
     i = VS.getUnitList()
     if sig: 
-        i.advanceNSiginficant(0)
+        i.advanceNSignificant(0)
         while (not i.isDone()):
             res.append(i.current())
             i.advanceSignificant()

[Vegastrike-cvs] SF.net SVN: vegastrike:[13673] trunk/data/modules/unit.py

From: <kla...@us...> - 2014-03-07 18:34:54

Revision: 13673
          http://sourceforge.net/p/vegastrike/code/13673
Author:   klaussfreire
Date:     2014-03-07 18:34:51 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
Fix typo

Modified Paths:
--------------
    trunk/data/modules/unit.py

Modified: trunk/data/modules/unit.py
===================================================================
--- trunk/data/modules/unit.py	2014-03-05 19:30:05 UTC (rev 13672)
+++ trunk/data/modules/unit.py	2014-03-07 18:34:51 UTC (rev 13673)
@@ -119,7 +119,7 @@
     res = []
     i = VS.getUnitList()
     if sig: 
-        i.advanceNSignficant(0)
+        i.advanceNSiginficant(0)
         while (not i.isDone()):
             res.append(i.current())
             i.advanceSignificant()

[Vegastrike-cvs] SF.net SVN: vegastrike:[13672] trunk/vegastrike/src/gfxlib_struct.h

From: <kla...@us...> - 2014-03-05 19:30:11

Revision: 13672
          http://sourceforge.net/p/vegastrike/code/13672
Author:   klaussfreire
Date:     2014-03-05 19:30:05 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
Fix bug in previous patch: setMaterialX wouldn't make any effective
change

Modified Paths:
--------------
    trunk/vegastrike/src/gfxlib_struct.h

Modified: trunk/vegastrike/src/gfxlib_struct.h
===================================================================
--- trunk/vegastrike/src/gfxlib_struct.h	2014-03-04 00:53:52 UTC (rev 13671)
+++ trunk/vegastrike/src/gfxlib_struct.h	2014-03-05 19:30:05 UTC (rev 13672)
@@ -940,79 +940,79 @@
     float power;
 };
 
-inline void setMaterialAmbient( GFXMaterial mat, float r,float g,float b,float a ) {
+inline void setMaterialAmbient( GFXMaterial &mat, float r,float g,float b,float a ) {
     mat.ar=r;
     mat.ag=g;
     mat.ab=b;
     mat.aa=a;
 }
-inline void setMaterialDiffuse( GFXMaterial mat, float r,float g,float b,float a ) {
+inline void setMaterialDiffuse( GFXMaterial &mat, float r,float g,float b,float a ) {
     mat.dr=r;
     mat.dg=g;
     mat.db=b;
     mat.da=a;
 }
-inline void setMaterialSpecular( GFXMaterial mat, float r,float g,float b,float a ) {
+inline void setMaterialSpecular( GFXMaterial &mat, float r,float g,float b,float a ) {
     mat.sr=r;
     mat.sg=g;
     mat.sb=b;
     mat.sa=a;
 }
-inline void setMaterialEmissive( GFXMaterial mat, float r,float g,float b,float a ) {
+inline void setMaterialEmissive( GFXMaterial &mat, float r,float g,float b,float a ) {
     mat.er=r;
     mat.eg=g;
     mat.eb=b;
     mat.ea=a;
 }
 
-inline void setMaterialAmbient( GFXMaterial mat, float rgba ) {
+inline void setMaterialAmbient( GFXMaterial &mat, float rgba ) {
     mat.ar=mat.ag=mat.ab=mat.aa=rgba;
 }
-inline void setMaterialDiffuse( GFXMaterial mat, float rgba ) {
+inline void setMaterialDiffuse( GFXMaterial &mat, float rgba ) {
     mat.dr=mat.dg=mat.db=mat.da=rgba;
 }
-inline void setMaterialSpecular( GFXMaterial mat, float rgba ) {
+inline void setMaterialSpecular( GFXMaterial &mat, float rgba ) {
     mat.sr=mat.sg=mat.sb=mat.sa=rgba;
 }
-inline void setMaterialEmissive( GFXMaterial mat, float rgba ) {
+inline void setMaterialEmissive( GFXMaterial &mat, float rgba ) {
     mat.er=mat.eg=mat.eb=mat.ea=rgba;
 }
 
-inline void setMaterialAmbient( GFXMaterial mat, GFXColor col ) {
+inline void setMaterialAmbient( GFXMaterial &mat, const GFXColor &col ) {
     mat.ar=col.r;
     mat.ag=col.g;
     mat.ab=col.b;
     mat.aa=col.a;
 }
-inline void setMaterialDiffuse( GFXMaterial mat, GFXColor col ) {
+inline void setMaterialDiffuse( GFXMaterial &mat, const GFXColor &col ) {
     mat.dr=col.r;
     mat.dg=col.g;
     mat.db=col.b;
     mat.da=col.a;
 }
-inline void setMaterialSpecular( GFXMaterial mat, GFXColor col ) {
+inline void setMaterialSpecular( GFXMaterial &mat, const GFXColor &col ) {
     mat.sr=col.r;
     mat.sg=col.g;
     mat.sb=col.b;
     mat.sa=col.a;
 }
-inline void setMaterialEmissive( GFXMaterial mat, GFXColor col ) {
+inline void setMaterialEmissive( GFXMaterial &mat, const GFXColor &col ) {
     mat.er=col.r;
     mat.eg=col.g;
     mat.eb=col.b;
     mat.ea=col.a;
 }
 
-inline GFXColor getMaterialAmbient( GFXMaterial mat ) {
+inline GFXColor getMaterialAmbient( const GFXMaterial &mat ) {
     return GFXColor ( mat.ar, mat.ag, mat.ab, mat.aa );
 }
-inline GFXColor getMaterialDiffuse( GFXMaterial mat ) {
+inline GFXColor getMaterialDiffuse( const GFXMaterial &mat ) {
     return GFXColor ( mat.dr, mat.dg, mat.db, mat.da );
 }
-inline GFXColor getMaterialSpecular( GFXMaterial mat ) {
+inline GFXColor getMaterialSpecular( const GFXMaterial &mat ) {
     return GFXColor ( mat.sr, mat.sg, mat.sb, mat.sa );
 }
-inline GFXColor getMaterialEmissive( GFXMaterial mat ) {
+inline GFXColor getMaterialEmissive( const GFXMaterial &mat ) {
     return GFXColor ( mat.er, mat.eg, mat.eb, mat.ea );
 }

[Vegastrike-cvs] SF.net SVN: vegastrike:[13671] trunk/vegastrike/src

From: <kla...@us...> - 2014-03-04 00:53:57

Revision: 13671
          http://sourceforge.net/p/vegastrike/code/13671
Author:   klaussfreire
Date:     2014-03-04 00:53:52 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Patch #68 part 3 by Turbo Beholder: move relation color and comm-related
functions from AI to comm, rewrite comm color code to be configurable

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/ai/aggressive.cpp
    trunk/vegastrike/src/cmd/ai/communication.cpp
    trunk/vegastrike/src/cmd/ai/communication.h
    trunk/vegastrike/src/gfx/vdu.cpp

Modified: trunk/vegastrike/src/cmd/ai/aggressive.cpp
===================================================================
--- trunk/vegastrike/src/cmd/ai/aggressive.cpp	2014-03-02 19:49:50 UTC (rev 13670)
+++ trunk/vegastrike/src/cmd/ai/aggressive.cpp	2014-03-04 00:53:52 UTC (rev 13671)
@@ -184,67 +184,6 @@
                                             personalityseed );
 }
 
-inline std::string GetRelationshipColor( float rel )
-{
-    if (rel >= 1)
-        return "#00FF00";
-    if (rel <= -1)
-        return "#FF0000";
-    rel += 1.;
-    rel /= 2.;
-    char str[20];     //Just in case all 8 digits of both #s end up inside the string for some reason.
-    sprintf( str, "#%2X%2X00", (int) ( (1-rel)*256 ), (int) (rel*256) );
-    return str;
-}
-
-unsigned int DoSpeech( Unit *un, Unit *player_un, const FSM::Node &node )
-{
-    unsigned int dummy = 0;
-    string speech = node.GetMessage( dummy );
-    string myname( "[Static]" );
-    if (un != NULL) {
-        myname = un->isUnit() == PLANETPTR ? un->name : un->getFullname();
-        Flightgroup *fg = un->getFlightgroup();
-        if (fg && fg->name != "base" && fg->name != "Base")
-            myname = fg->name+" "+XMLSupport::tostring( un->getFgSubnumber() )+", "+un->getFullname();
-        else if (myname.length() == 0)
-            myname = un->name;
-        if (player_un != NULL) {
-            if (player_un == un) {
-                myname = std::string( "#0033FF" )+myname+"#000000";
-            } else {
-                float rel = un->getRelation( player_un );
-                myname = GetRelationshipColor( rel )+myname+"#000000";
-            }
-        }
-    }
-    mission->msgcenter->add( myname, "all", GetRelationshipColor( node.messagedelta*10 )+speech+"#000000" );     //multiply by 2 so colors are easier to tell
-    return dummy;
-}
-
-void LeadMe( Unit *un, string directive, string speech, bool changetarget )
-{
-    if (un != NULL) {
-        for (unsigned int i = 0; i < _Universe->numPlayers(); i++) {
-            Unit *pun = _Universe->AccessCockpit( i )->GetParent();
-            if (pun)
-                if ( pun->getFlightgroup() == un->getFlightgroup() )
-                    DoSpeech( un, pun, FSM::Node::MakeNode( speech, .1 ) );
-        }
-        Flightgroup *fg = un->getFlightgroup();
-        if (fg) {
-            if (fg->leader.GetUnit() != un)
-                if ( ( !_Universe->isPlayerStarship( fg->leader.GetUnit() ) ) || _Universe->isPlayerStarship( un ) )
-                    fg->leader.SetUnit( un );
-            fg->directive = directive;
-            if (changetarget)
-                fg->target.SetUnit( un->Target() );
-            if ( (directive == "") )
-                fg->target.SetUnit( NULL );
-        }
-    }
-}
-
 static float aggressivity = 2.01;
 static int   randomtemp;
 AggressiveAI::AggressiveAI( const char *filename, Unit *target ) : FireAt()

Modified: trunk/vegastrike/src/cmd/ai/communication.cpp
===================================================================
--- trunk/vegastrike/src/cmd/ai/communication.cpp	2014-03-02 19:49:50 UTC (rev 13670)
+++ trunk/vegastrike/src/cmd/ai/communication.cpp	2014-03-04 00:53:52 UTC (rev 13671)
@@ -418,3 +418,103 @@
     assert( this->curstate >= 0 );
 }
 
+char tohexdigit( int x )
+{
+    if (x <= 9 && x >= 0)
+        return (char) (x+'0');
+    else
+        return (char) (x-10+'A');
+}
+
+RGBstring colToString( GFXColor col )
+{
+    unsigned char r = (unsigned char) (col.r*255);
+    unsigned char g = (unsigned char) (col.g*255);
+    unsigned char b = (unsigned char) (col.b*255);
+    RGBstring   ret;
+    ret.str[0] = '#';
+    ret.str[7] = '\0';
+    ret.str[1] = tohexdigit( r/16 );
+    ret.str[2] = tohexdigit( r%16 );
+    ret.str[3] = tohexdigit( g/16 );
+    ret.str[4] = tohexdigit( g%16 );
+    ret.str[5] = tohexdigit( b/16 );
+    ret.str[6] = tohexdigit( b%16 );
+    return ret;
+}
+
+RGBstring GetRelationshipRGBstring( float rel )
+{
+    static GFXColor col_enemy   = vs_config->getColor( "relation_enemy",   vs_config->getColor( "enemy",
+                                                                            GFXColor(1.0 ,0.0,0.0,1.0) )); // red   - like target
+    static GFXColor col_friend  = vs_config->getColor( "relation_friend",  vs_config->getColor( "friend",
+                                                                            GFXColor(0.0 ,1.0,0.0,1.0) )); // green - like target
+    static GFXColor col_neutral = vs_config->getColor( "relation_neutral", vs_config->getColor( "black_and_white",
+                                                                            GFXColor(1.0 ,1.0,1.0,1.0) )); // white - NOT like target
+    GFXColor col;
+    if (rel==0)
+        col = col_neutral;
+    else {
+        if (rel<0) {
+            rel = -rel;
+            col = col_enemy;
+        } else {
+            col = col_friend;
+        }
+        if (rel<1.0)
+            col = colLerp (col_neutral, col, rel);
+    }
+    return colToString( col );
+}
+
+unsigned int DoSpeech( Unit *un, Unit *player_un, const FSM::Node &node )
+{
+    static float scale_rel_color =
+        XMLSupport::parse_float( vs_config->getVariable( "graphics", "hud", "scale_relationship_color", "10.0" ) );
+    static std::string ownname_RGBstr = colToString( vs_config->getColor( "player_name", GFXColor( 0.0 ,0.2, 1.0 ) ) ).str; // bluish
+    unsigned int dummy = 0;
+    string speech = node.GetMessage( dummy );
+    string myname( "[Static]" );
+    if (un != NULL) {
+        myname = un->isUnit() == PLANETPTR ? un->name : un->getFullname();
+        Flightgroup *fg = un->getFlightgroup();
+        if (fg && fg->name != "base" && fg->name != "Base")
+            myname = fg->name+" "+XMLSupport::tostring( un->getFgSubnumber() )+", "+un->getFullname();
+        else if (myname.length() == 0)
+            myname = un->name;
+        if (player_un != NULL) {
+            if (player_un == un) {
+                myname = ownname_RGBstr+myname+"#000000";
+            } else {
+                float rel = un->getRelation( player_un );
+                myname = GetRelationshipColorString( rel )+myname+"#000000";
+            }
+        }
+    }
+    mission->msgcenter->add( myname, "all",
+                            GetRelationshipColorString( node.messagedelta*scale_rel_color )+speech+"#000000" );     //multiply by 2 so colors are easier to tell
+    return dummy;
+}
+
+void LeadMe( Unit *un, string directive, string speech, bool changetarget )
+{
+    if (un != NULL) {
+        for (unsigned int i = 0; i < _Universe->numPlayers(); i++) {
+            Unit *pun = _Universe->AccessCockpit( i )->GetParent();
+            if (pun)
+                if ( pun->getFlightgroup() == un->getFlightgroup() )
+                    DoSpeech( un, pun, FSM::Node::MakeNode( speech, .1 ) );
+        }
+        Flightgroup *fg = un->getFlightgroup();
+        if (fg) {
+            if (fg->leader.GetUnit() != un)
+                if ( ( !_Universe->isPlayerStarship( fg->leader.GetUnit() ) ) || _Universe->isPlayerStarship( un ) )
+                    fg->leader.SetUnit( un );
+            fg->directive = directive;
+            if (changetarget)
+                fg->target.SetUnit( un->Target() );
+            if ( (directive == "") )
+                fg->target.SetUnit( NULL );
+        }
+    }
+}

Modified: trunk/vegastrike/src/cmd/ai/communication.h
===================================================================
--- trunk/vegastrike/src/cmd/ai/communication.h	2014-03-02 19:49:50 UTC (rev 13670)
+++ trunk/vegastrike/src/cmd/ai/communication.h	2014-03-04 00:53:52 UTC (rev 13671)
@@ -1,6 +1,7 @@
 #ifndef _COMMUNICATION_H_
 #define _COMMUNICATION_H_
 #include "cmd/unit_generic.h"
+#include "gfxlib_struct.h"
 
 class FSM
 {
@@ -100,5 +101,20 @@
         return fsm->getDeltaRelation( prevstate, curstate );
     }
 };
+
+struct RGBstring
+{
+    char str[8];
+};
+
+RGBstring colToString( GFXColor col );
+RGBstring GetRelationshipRGBstring( float rel );
+
+inline std::string GetRelationshipColorString( float rel ) {
+    return GetRelationshipRGBstring( rel ).str;
+}
+
+unsigned int DoSpeech( Unit *un, Unit *player_un, const FSM::Node &node );
+
 #endif
 

Modified: trunk/vegastrike/src/gfx/vdu.cpp
===================================================================
--- trunk/vegastrike/src/gfx/vdu.cpp	2014-03-02 19:49:50 UTC (rev 13670)
+++ trunk/vegastrike/src/gfx/vdu.cpp	2014-03-04 00:53:52 UTC (rev 13671)
@@ -21,6 +21,7 @@
 #include "universe_util.h"
 #include "networking/netclient.h"
 #include "vsfilesystem.h"
+#include "cmd/ai/communication.h"
 
 template < typename T >
 inline T mymin( T a, T b )
@@ -145,36 +146,6 @@
     return retval;
 }
 
-char tohexdigit( int x )
-{
-    if (x <= 9 && x >= 0)
-        return (char) (x+'0');
-    else
-        return (char) (x-10+'A');
-}
-
-struct colorstring
-{
-    char str[8];
-};
-
-colorstring colToString( GFXColor col )
-{
-    unsigned char r = (unsigned char) (col.r*255);
-    unsigned char g = (unsigned char) (col.g*255);
-    unsigned char b = (unsigned char) (col.b*255);
-    colorstring   ret;
-    ret.str[0] = '#';
-    ret.str[7] = '\0';
-    ret.str[1] = tohexdigit( r/16 );
-    ret.str[2] = tohexdigit( r%16 );
-    ret.str[3] = tohexdigit( g/16 );
-    ret.str[4] = tohexdigit( g%16 );
-    ret.str[5] = tohexdigit( b/16 );
-    ret.str[6] = tohexdigit( b%16 );
-    return ret;
-}
-
 VDU::VDU( const char *file, TextPlane *textp, unsigned short modes, short rwws, short clls, float *ma,
           float *mh ) : VSSprite( file )
     , tp( textp )
@@ -1327,7 +1298,7 @@
     static GFXColor cdestroyed = vs_config->getColor( "default", "hud_repair_destroyed",
                                                     GFXColor( .2, .2, .2, 1 ) );
 
-    colorstring   fpstring = colToString( cfullpower);
+    RGBstring   fpstring = colToString( cfullpower);
     static string damage_report_heading =
         XMLSupport::escaped_string( vs_config->getVariable( "graphics", "hud", "damage_report_heading",
                                                             "#00ff00DAMAGE REPORT\n\n" ) );
@@ -1625,7 +1596,7 @@
         } else {
             if ( (parent->mounts[i].status != Mount::UNCHOSEN) || do_list_empty_mounts ) {
                 GFXColor mountcolor( average.r/numave, average.g/numave, average.b/numave, average.a/numave );
-                string baseweaponreport = string( colToString( mountcolor ).str );
+                string baseweaponreport = colToString( mountcolor ).str;
                 if (parent->mounts[i].status == Mount::UNCHOSEN)
                     baseweaponreport += list_empty_mounts_as;
                 else

[Vegastrike-cvs] SF.net SVN: vegastrike:[13670] trunk/vegastrike/src

From: <kla...@us...> - 2014-03-02 19:49:53

Revision: 13670
          http://sourceforge.net/p/vegastrike/code/13670
Author:   klaussfreire
Date:     2014-03-02 19:49:50 +0000 (Sun, 02 Mar 2014)
Log Message:
-----------
Patch 68 part 2 from Turbo Beholder: tidy up colLerp

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/planet.cpp
    trunk/vegastrike/src/gfx/vdu.cpp
    trunk/vegastrike/src/gfx/vdu.h
    trunk/vegastrike/src/gfxlib_struct.cpp
    trunk/vegastrike/src/gfxlib_struct.h
    trunk/vegastrike/src/star_system_xml.cpp
    trunk/vegastrike/src/universe.cpp

Modified: trunk/vegastrike/src/cmd/planet.cpp
===================================================================
--- trunk/vegastrike/src/cmd/planet.cpp	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/cmd/planet.cpp	2014-03-02 19:49:50 UTC (rev 13670)
@@ -42,19 +42,14 @@
 
 static void SetFogMaterialColor( Mesh *thus, const GFXColor &color, const GFXColor &dcolor )
 {
+    static float emm  = XMLSupport::parse_float( vs_config->getVariable( "graphics", "atmosphere_emmissive", "1" ) );
+    static float diff = XMLSupport::parse_float( vs_config->getVariable( "graphics", "atmosphere_diffuse", "1" ) );
     GFXMaterial  m;
-    m.ar    = m.ag = m.ab = m.aa = m.sr = m.sg = m.sb = m.sa = 0;
+    setMaterialAmbient( m, 0.0);
+    setMaterialDiffuse( m, diff*dcolor);
+    setMaterialSpecular( m, 0.0);
+    setMaterialEmissive(m, emm*color);
     m.power = 0;
-    static float emm  = XMLSupport::parse_float( vs_config->getVariable( "graphics", "atmosphere_emmissive", "1" ) );
-    static float diff = XMLSupport::parse_float( vs_config->getVariable( "graphics", "atmosphere_diffuse", "1" ) );
-    m.er    = emm*color.r;
-    m.eg    = emm*color.g;
-    m.eb    = emm*color.b;
-    m.ea    = emm*color.a;
-    m.dr    = diff*dcolor.r;
-    m.dg    = diff*dcolor.g;
-    m.db    = diff*dcolor.b;
-    m.da    = diff*dcolor.a;
     thus->SetMaterial( m );
 }
 Mesh * MakeFogMesh( const AtmosphericFogMesh &f, float radius )
@@ -151,14 +146,13 @@
         meshdata.push_back( NULL );
     Mesh *shield = meshdata.back();
     meshdata.pop_back();
+    static float materialweight    = XMLSupport::parse_float( vs_config->getVariable( "graphics", "city_light_strength", "10" ) );
+    static float daymaterialweight = XMLSupport::parse_float( vs_config->getVariable( "graphics", "day_city_light_strength", "0" ) );
     GFXMaterial  m;
-    m.ar = m.ag = m.ab = m.aa = 0.0;
-    static float materialweight    = XMLSupport::parse_float( vs_config->getVariable( "graphics", "city_light_strength", "10" ) );
-    static float daymaterialweight =
-        XMLSupport::parse_float( vs_config->getVariable( "graphics", "day_city_light_strength", "0" ) );
-    m.dr    = m.dg = m.db = m.da = materialweight;
-    m.sr    = m.sg = m.sb = m.sa = 0.0;
-    m.er    = m.eg = m.eb = m.ea = daymaterialweight;
+    setMaterialAmbient( m, 0.0);
+    setMaterialDiffuse( m, materialweight );
+    setMaterialSpecular(m, 0.0);
+    setMaterialEmissive(m, daymaterialweight );
     m.power = 0.0;
     static int stacks = XMLSupport::parse_int( vs_config->getVariable( "graphics", "planet_detail", "24" ) );
     meshdata.push_back( new CityLights( radius, stacks, stacks, texture.c_str(), numwrapx, numwrapy, inside_out, ONE, ONE,
@@ -327,7 +321,7 @@
         static float glowradius =
             XMLSupport::parse_float( vs_config->getVariable( "graphics", "star_glow_radius", "1.33" ) )/bodyradius;
         if (drawglow) {
-            GFXColor    c( ourmat.er, ourmat.eg, ourmat.eb, ourmat.ea );
+            GFXColor    c = getMaterialEmissive( ourmat );
             static bool spec = XMLSupport::parse_bool( vs_config->getVariable( "graphics", "glow_ambient_star_light", "false" ) );
             static bool diff = XMLSupport::parse_bool( vs_config->getVariable( "graphics", "glow_diffuse_star_light", "false" ) );
             if (diff)

Modified: trunk/vegastrike/src/gfx/vdu.cpp
===================================================================
--- trunk/vegastrike/src/gfx/vdu.cpp	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/gfx/vdu.cpp	2014-03-02 19:49:50 UTC (rev 13670)
@@ -153,15 +153,6 @@
         return (char) (x-10+'A');
 }
 
-GFXColor colLerp( GFXColor a, GFXColor b, float bweight )
-{
-    float aweight = 1-bweight;
-    return GFXColor( a.r*aweight+b.r*bweight,
-                     a.g*aweight+b.g*bweight,
-                     a.b*aweight+b.b*bweight,
-                     a.a*aweight+b.a*bweight );
-}
-
 struct colorstring
 {
     char str[8];

Modified: trunk/vegastrike/src/gfx/vdu.h
===================================================================
--- trunk/vegastrike/src/gfx/vdu.h	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/gfx/vdu.h	2014-03-02 19:49:50 UTC (rev 13670)
@@ -1,7 +1,6 @@
 #ifndef _GFX_VDU_H_
 #define _GFX_VDU_H_
 
-#include "cockpit_generic.h"
 #include "cmd/unit_generic.h"
 #include "sprite.h"
 #include <string>
@@ -97,7 +96,6 @@
 
 int parse_vdu_type( const char *s );
 
-GFXColor colLerp( GFXColor a, GFXColor b, float bweight );
 GFXColor MountColor( Mount *mnt );
 #endif
 

Modified: trunk/vegastrike/src/gfxlib_struct.cpp
===================================================================
--- trunk/vegastrike/src/gfxlib_struct.cpp	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/gfxlib_struct.cpp	2014-03-02 19:49:50 UTC (rev 13670)
@@ -12,8 +12,6 @@
 
 #include <vector>
 
-
-
 GLenum PolyLookup( POLYTYPE poly )
 {
     switch (poly)

Modified: trunk/vegastrike/src/gfxlib_struct.h
===================================================================
--- trunk/vegastrike/src/gfxlib_struct.h	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/gfxlib_struct.h	2014-03-02 19:49:50 UTC (rev 13670)
@@ -212,6 +212,21 @@
     return GFXColor( c0.r-c1.r, c0.g-c1.g, c0.b-c1.b, c0.a-c1.a );
 }
 
+inline bool operator==( const GFXColor &c0, const GFXColor &c1 )
+{
+    return (c0.r==c1.r)&&(c0.g==c1.g)&&(c0.b==c1.b)&&(c0.a==c1.a);
+}
+
+inline GFXColor colLerp( GFXColor a, GFXColor b, float bweight )
+{
+    float aweight = 1.0f-bweight;
+    return GFXColor( a.r*aweight+b.r*bweight,
+                     a.g*aweight+b.g*bweight,
+                     a.b*aweight+b.b*bweight,
+                     a.a*aweight+b.a*bweight );
+}
+
+
 ///This vertex is used for the interleaved array argument for color based arrays T2F_C4F_N3F_V3F
 struct GFXColorVertex
 {
@@ -924,6 +939,83 @@
     /// specular power
     float power;
 };
+
+inline void setMaterialAmbient( GFXMaterial mat, float r,float g,float b,float a ) {
+    mat.ar=r;
+    mat.ag=g;
+    mat.ab=b;
+    mat.aa=a;
+}
+inline void setMaterialDiffuse( GFXMaterial mat, float r,float g,float b,float a ) {
+    mat.dr=r;
+    mat.dg=g;
+    mat.db=b;
+    mat.da=a;
+}
+inline void setMaterialSpecular( GFXMaterial mat, float r,float g,float b,float a ) {
+    mat.sr=r;
+    mat.sg=g;
+    mat.sb=b;
+    mat.sa=a;
+}
+inline void setMaterialEmissive( GFXMaterial mat, float r,float g,float b,float a ) {
+    mat.er=r;
+    mat.eg=g;
+    mat.eb=b;
+    mat.ea=a;
+}
+
+inline void setMaterialAmbient( GFXMaterial mat, float rgba ) {
+    mat.ar=mat.ag=mat.ab=mat.aa=rgba;
+}
+inline void setMaterialDiffuse( GFXMaterial mat, float rgba ) {
+    mat.dr=mat.dg=mat.db=mat.da=rgba;
+}
+inline void setMaterialSpecular( GFXMaterial mat, float rgba ) {
+    mat.sr=mat.sg=mat.sb=mat.sa=rgba;
+}
+inline void setMaterialEmissive( GFXMaterial mat, float rgba ) {
+    mat.er=mat.eg=mat.eb=mat.ea=rgba;
+}
+
+inline void setMaterialAmbient( GFXMaterial mat, GFXColor col ) {
+    mat.ar=col.r;
+    mat.ag=col.g;
+    mat.ab=col.b;
+    mat.aa=col.a;
+}
+inline void setMaterialDiffuse( GFXMaterial mat, GFXColor col ) {
+    mat.dr=col.r;
+    mat.dg=col.g;
+    mat.db=col.b;
+    mat.da=col.a;
+}
+inline void setMaterialSpecular( GFXMaterial mat, GFXColor col ) {
+    mat.sr=col.r;
+    mat.sg=col.g;
+    mat.sb=col.b;
+    mat.sa=col.a;
+}
+inline void setMaterialEmissive( GFXMaterial mat, GFXColor col ) {
+    mat.er=col.r;
+    mat.eg=col.g;
+    mat.eb=col.b;
+    mat.ea=col.a;
+}
+
+inline GFXColor getMaterialAmbient( GFXMaterial mat ) {
+    return GFXColor ( mat.ar, mat.ag, mat.ab, mat.aa );
+}
+inline GFXColor getMaterialDiffuse( GFXMaterial mat ) {
+    return GFXColor ( mat.dr, mat.dg, mat.db, mat.da );
+}
+inline GFXColor getMaterialSpecular( GFXMaterial mat ) {
+    return GFXColor ( mat.sr, mat.sg, mat.sb, mat.sa );
+}
+inline GFXColor getMaterialEmissive( GFXMaterial mat ) {
+    return GFXColor ( mat.er, mat.eg, mat.eb, mat.ea );
+}
+
 //Textures may only be cube maps, Texture1d, Texture2d or Texture3d
 enum TEXTURE_TARGET
 {

Modified: trunk/vegastrike/src/star_system_xml.cpp
===================================================================
--- trunk/vegastrike/src/star_system_xml.cpp	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/star_system_xml.cpp	2014-03-02 19:49:50 UTC (rev 13670)
@@ -502,22 +502,10 @@
                                            GFXColor( 0.0,0.0,0.0,1.0 ) );
     GFXMaterial ourmat;
     GFXGetMaterial( 0, ourmat );
-    ourmat.ar=planet_mat_ambient.r;
-    ourmat.ag=planet_mat_ambient.g;
-    ourmat.ab=planet_mat_ambient.b;
-    ourmat.aa=planet_mat_ambient.a;
-    ourmat.dr=planet_mat_diffuse.r;
-    ourmat.dg=planet_mat_diffuse.g;
-    ourmat.db=planet_mat_diffuse.b;
-    ourmat.da=planet_mat_diffuse.a;
-    ourmat.sr=planet_mat_specular.r;
-    ourmat.sg=planet_mat_specular.g;
-    ourmat.sb=planet_mat_specular.b;
-    ourmat.sa=planet_mat_specular.a;
-    ourmat.sr=planet_mat_emissive.r;
-    ourmat.sg=planet_mat_emissive.g;
-    ourmat.sb=planet_mat_emissive.b;
-    ourmat.sa=planet_mat_emissive.a;
+    setMaterialAmbient(ourmat, planet_mat_ambient);
+    setMaterialDiffuse(ourmat, planet_mat_diffuse);
+    setMaterialSpecular(ourmat, planet_mat_specular);
+    setMaterialEmissive(ourmat, planet_mat_emissive);
 
     int     numwraps = 1;
     float   scalex   = 1;

Modified: trunk/vegastrike/src/universe.cpp
===================================================================
--- trunk/vegastrike/src/universe.cpp	2014-03-01 23:01:22 UTC (rev 13669)
+++ trunk/vegastrike/src/universe.cpp	2014-03-02 19:49:50 UTC (rev 13670)
@@ -136,25 +136,10 @@
 {
     GFXBeginScene();
     GFXMaterial mat;
-    mat.ar    = 1.00F;
-    mat.ag    = 1.00F;
-    mat.ab    = 1.00F;
-    mat.aa    = 1.00F;
-
-    mat.dr    = 1.00F;
-    mat.dg    = 1.00F;
-    mat.db    = 1.00F;
-    mat.da    = 1.00F;
-
-    mat.sr    = 1.00F;
-    mat.sg    = 1.00F;
-    mat.sb    = 1.00F;
-    mat.sa    = 1.00F;
-
-    mat.er    = 0.0F;
-    mat.eg    = 0.0F;
-    mat.eb    = 0.0F;
-    mat.ea    = 1.0F;
+    setMaterialAmbient( mat, 1.0, 1.0, 1.0, 1.0 );
+    setMaterialDiffuse( mat, 1.0, 1.0, 1.0, 1.0 );
+    setMaterialSpecular( mat, 1.0, 1.0, 1.0, 1.0 );
+    setMaterialEmissive( mat, 0.0, 0.0, 0.0, 1.0 );
     mat.power = 60.0F;
     unsigned int tmp;
     GFXSetMaterial( tmp, mat );

[Vegastrike-cvs] SF.net SVN: vegastrike:[13669] trunk/vegastrike/src

From: <kla...@us...> - 2014-03-01 23:01:25

Revision: 13669
          http://sourceforge.net/p/vegastrike/code/13669
Author:   klaussfreire
Date:     2014-03-01 23:01:22 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Patch #56 by Turbo Beholder: Tracking/Locking functions improvement, makes "physics/must_lock_to_autotrack" confvar obeyed properly

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/unit.cpp
    trunk/vegastrike/src/cmd/unit_generic.cpp
    trunk/vegastrike/src/cmd/unit_generic.h
    trunk/vegastrike/src/gfx/radar/track.cpp

Modified: trunk/vegastrike/src/cmd/unit.cpp
===================================================================
--- trunk/vegastrike/src/cmd/unit.cpp	2014-03-01 21:45:37 UTC (rev 13668)
+++ trunk/vegastrike/src/cmd/unit.cpp	2014-03-01 23:01:22 UTC (rev 13669)
@@ -544,7 +544,7 @@
                 this->mounts[i].ref.gun->Draw( *ct, wmat,
                                                ( (this->mounts[i].size&weapon_info::AUTOTRACKING)
                                                 && (this->mounts[i].time_to_lock <= 0)
-                                                && (this->computer.radar.trackingactive) ) ? Unit::Target() : NULL, 
+                                                && Unit::TargetTracked() ) ? Unit::Target() : NULL, 
                                                this->computer.radar.trackingcone );
     }
     if ( On_Screen && (phalos->NumHalos() > 0) && !( this->docked&(UnitType::DOCKED|UnitType::DOCKED_INSIDE) ) && (Apparent_Size > 5.0f) ) {

Modified: trunk/vegastrike/src/cmd/unit_generic.cpp
===================================================================
--- trunk/vegastrike/src/cmd/unit_generic.cpp	2014-03-01 21:45:37 UTC (rev 13668)
+++ trunk/vegastrike/src/cmd/unit_generic.cpp	2014-03-01 23:01:22 UTC (rev 13669)
@@ -275,7 +275,7 @@
     if (cone && computer.radar.maxcone > -.98) {
         QVector delta( target->Position()-Position() );
         mm = delta.Magnitude();
-        if ( (!lock) || ( !(TargetLocked() && computer.target == target) ) ) {
+        if ( (!lock) || ( !TargetLocked(target) ) ) {
             double tempmm = mm-target->rSize();
             if (tempmm > 0.0001)
                 if ( (ToLocalCoordinates( Vector( delta.i, delta.j, delta.k ) ).k/tempmm) < computer.radar.maxcone && cone )
@@ -2421,13 +2421,10 @@
         }
         if (mounts[i].type->type == weapon_info::BEAM) {
             if (mounts[i].ref.gun) {
-                static bool must_lock_to_autotrack =
-                    XMLSupport::parse_bool( vs_config->getVariable( "physics", "must_lock_to_autotrack", "true" ) );
                 Unit *autotarg     =
                     (   (mounts[i].size&weapon_info::AUTOTRACKING) 
                      && (mounts[i].time_to_lock <= 0)
-                     && (player_cockpit == NULL || TargetLocked() || !must_lock_to_autotrack)
-                     && (computer.radar.trackingactive)  ) ? target : NULL;
+                     && TargetTracked() ) ? target : NULL;
                 float trackingcone = computer.radar.trackingcone;
                 if ( CloseEnoughToAutotrack( this, target, trackingcone ) ) {
                     if (autotarg)
@@ -2454,14 +2451,9 @@
             t1.Compose( trans, transmat );
             t1.to_matrix( m1 );
             int autotrack = 0;
-            static bool must_lock_to_autotrack =
-                XMLSupport::parse_bool( vs_config->getVariable( "physics", "must_lock_to_autotrack", "true" ) );
             if (   ( 0 != (mounts[i].size&weapon_info::AUTOTRACKING) )
-                && computer.radar.trackingactive
                 && (   (Network != NULL && !SERVER) 
-                     || player_cockpit == NULL
-                     || TargetLocked()
-                     || !must_lock_to_autotrack )  )
+                    || TargetTracked() )  )
                 autotrack = computer.itts ? 2 : 1;
             float trackingcone = computer.radar.trackingcone;
             if ( CloseEnoughToAutotrack( this, target, trackingcone ) ) {
@@ -5314,6 +5306,31 @@
         computer.radar.locked = false;
 }
 
+bool Unit::TargetLocked( const Unit *checktarget ) const
+{
+    if (!computer.radar.locked)
+        return false;
+    return (checktarget == NULL) || (computer.target == checktarget);
+}
+
+bool Unit::TargetTracked( const Unit *checktarget )
+{
+    static bool must_lock_to_autotrack = XMLSupport::parse_bool( 
+        vs_config->getVariable( "physics", "must_lock_to_autotrack", "true" ) );
+    bool we_do_track = computer.radar.trackingactive
+        && ( !_Universe->isPlayerStarship(this) || TargetLocked() || !must_lock_to_autotrack);
+    if (!we_do_track)
+        return false;
+    if (checktarget == NULL)
+        return true;
+    if (computer.target != checktarget)
+        return false;
+    float mycone = computer.radar.trackingcone;
+    we_do_track = CloseEnoughToAutotrack( this, computer.target.GetUnit(), mycone ); 
+    return we_do_track;
+}
+
+
 void Unit::Target( Unit *targ )
 {
     if (targ == this)

Modified: trunk/vegastrike/src/cmd/unit_generic.h
===================================================================
--- trunk/vegastrike/src/cmd/unit_generic.h	2014-03-01 21:45:37 UTC (rev 13668)
+++ trunk/vegastrike/src/cmd/unit_generic.h	2014-03-01 23:01:22 UTC (rev 13669)
@@ -1178,10 +1178,8 @@
     void setAverageGunSpeed();
     int LockMissile() const;             //-1 is no lock necessary 1 is locked
     void LockTarget( bool myboo );
-    bool TargetLocked() const
-    {
-        return computer.radar.locked;
-    }
+    bool TargetLocked( const Unit *checktarget = NULL ) const;
+    bool TargetTracked( const Unit *checktarget = NULL );
     float TrackingGuns( bool &missileLock );
 //Changes currently selected weapon
     void ToggleWeapon( bool Missile, bool forward = true );

Modified: trunk/vegastrike/src/gfx/radar/track.cpp
===================================================================
--- trunk/vegastrike/src/gfx/radar/track.cpp	2014-03-01 21:45:37 UTC (rev 13668)
+++ trunk/vegastrike/src/gfx/radar/track.cpp	2014-03-01 23:01:22 UTC (rev 13669)
@@ -105,9 +105,10 @@
 
 bool Track::HasWeaponLock() const
 {
+    assert(player);
     assert(target);
 
-    return (HasLock() && target->TargetLocked());
+    return (target->TargetLocked(player));
 }
 
 Track::Type::Value Track::IdentifyType() const

[Vegastrike-cvs] SF.net SVN: vegastrike:[13668] trunk/vegastrike/src

From: <kla...@us...> - 2014-03-01 21:45:41

Revision: 13668
          http://sourceforge.net/p/vegastrike/code/13668
Author:   klaussfreire
Date:     2014-03-01 21:45:37 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Patch #68 patch 1 by Turbo Beholder - refactor color config functions
to make better use of GFXColor.

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/base_interface.cpp
    trunk/vegastrike/src/cmd/basecomputer.cpp
    trunk/vegastrike/src/cmd/unit_xml.cpp
    trunk/vegastrike/src/configxml.cpp
    trunk/vegastrike/src/configxml.h
    trunk/vegastrike/src/gamemenu.cpp
    trunk/vegastrike/src/gfx/cockpit.cpp
    trunk/vegastrike/src/gfx/nav/drawgalaxy.cpp
    trunk/vegastrike/src/gfx/nav/drawlist.cpp
    trunk/vegastrike/src/gfx/nav/drawsystem.cpp
    trunk/vegastrike/src/gfx/nav/navscreen.cpp
    trunk/vegastrike/src/gfx/radar/sensor.cpp
    trunk/vegastrike/src/gfx/sphere.cpp
    trunk/vegastrike/src/gfx/vdu.cpp
    trunk/vegastrike/src/gldrv/gl_init.cpp
    trunk/vegastrike/src/gui/guidefs.cpp
    trunk/vegastrike/src/gui/guidefs.h
    trunk/vegastrike/src/star_system_xml.cpp

Modified: trunk/vegastrike/src/cmd/base_interface.cpp
===================================================================
--- trunk/vegastrike/src/cmd/base_interface.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/cmd/base_interface.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -1088,10 +1088,10 @@
 extern void ExecuteDirector();
 
 BaseInterface::BaseInterface( const char *basefile, Unit *base, Unit *un ) :
-    curtext( getConfigColor( "Base_Text_Color_Foreground",
-                            GFXColor( 0, 1, 0, 1 ) ), getConfigColor( "Base_Text_Color_Background", GFXColor( 0, 0, 0, 1 ) ) )
-    , othtext( getConfigColor( "Fixer_Text_Color_Foreground",
-                              GFXColor( 1, 1, .5, 1 ) ), getConfigColor( "FixerTextColor_Background", GFXColor( 0, 0, 0, 1 ) ) )
+    curtext( vs_config->getColor( "Base_Text_Color_Foreground",  GFXColor( 0, 1, 0 , 1 ) ),
+             vs_config->getColor( "Base_Text_Color_Background",  GFXColor( 0, 0, 0 , 1 ) ) ),
+    othtext( vs_config->getColor( "Fixer_Text_Color_Foreground", GFXColor( 1, 1, .5, 1 ) ),
+             vs_config->getColor( "FixerTextColor_Background",   GFXColor( 0, 0, 0 , 1 ) ) )
 {
     CurrentBase    = this;
     CallComp       = false;

Modified: trunk/vegastrike/src/cmd/basecomputer.cpp
===================================================================
--- trunk/vegastrike/src/cmd/basecomputer.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/cmd/basecomputer.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -139,44 +139,44 @@
 
 static GFXColor NO_MONEY_COLOR()
 {
-    static GFXColor NMC = getConfigColor( "no_money", GFXColor( 1, 1, .3, 1 ) );
+    static GFXColor NMC = vs_config->getColor( "no_money", GFXColor( 1, 1, .3, 1 ) );
     return NMC;       //Start out with bogus color.
 }
 
 //Make the variable static, so it won't print so many annoying messages!
 static GFXColor PROHIBITED_COLOR()
 {
-    static GFXColor PU = getConfigColor( "prohibited_upgrade", GFXColor( 1, .1, 0, 1 ) );
+    static GFXColor PU = vs_config->getColor( "prohibited_upgrade", GFXColor( 1, .1, 0, 1 ) );
     return PU;
 }
 
 static GFXColor DOWNGRADE_OR_NONCOMPAT_COLOR()
 {
-    static GFXColor DNC = getConfigColor( "downgrade_or_noncompatible", GFXColor( .75, .5, .5, 1 ) );
+    static GFXColor DNC = vs_config->getColor( "downgrade_or_noncompatible", GFXColor( .75, .5, .5, 1 ) );
     return DNC;
 }
 
 static GFXColor NO_ROOM_COLOR()
 {
-    static GFXColor NRFU = getConfigColor( "no_room_for_upgrade", GFXColor( 1, 0, 1, 1 ) );
+    static GFXColor NRFU = vs_config->getColor( "no_room_for_upgrade", GFXColor( 1, 0, 1, 1 ) );
     return NRFU;
 }
 
 static GFXColor ITEM_DESTROYED_COLOR()
 {
-    static GFXColor IDC = getConfigColor( "upgrade_item_destroyed", GFXColor( 0.2, 0.2, 0.2, 1 ) );
+    static GFXColor IDC = vs_config->getColor( "upgrade_item_destroyed", GFXColor( 0.2, 0.2, 0.2, 1 ) );
     return IDC;
 }
 
 //Color of the text of a category.
 static GFXColor CATEGORY_TEXT_COLOR()
 {
-    static GFXColor CTC = getConfigColor( "base_category_color", GFXColor( 0, .75, 0, 1 ) );
+    static GFXColor CTC = vs_config->getColor( "base_category_color", GFXColor( 0, .75, 0, 1 ) );
     return CTC;
 }
 static GFXColor MISSION_COLOR()
 {
-    static GFXColor MiC = getConfigColor( "base_mission_color", GFXColor( .66, .2, 0, 1 ) );
+    static GFXColor MiC = vs_config->getColor( "base_mission_color", GFXColor( .66, .2, 0, 1 ) );
     return MiC;
 }
 
@@ -185,7 +185,7 @@
 //Default color in CargoColor.
 static GFXColor DEFAULT_UPGRADE_COLOR()
 {
-    static GFXColor DuC = getConfigColor( "base_upgrade_color", GFXColor( 1, 1, 1, 1 ) );
+    static GFXColor DuC = vs_config->getColor( "base_upgrade_color", GFXColor( 1, 1, 1, 1 ) );
     return DuC;
 }
 
@@ -513,7 +513,7 @@
         StaticDisplay  *baseTitle     = new StaticDisplay;
         baseTitle->setRect( Rect( -.96, .76, 1.9, .08 ) );
         baseTitle->setText( "ERROR" );
-        static GFXColor baseNameColor = getConfigColor( "base_name_color", GFXColor( .1, .8, .1 ) );
+        static GFXColor baseNameColor = vs_config->getColor( "base_name_color", GFXColor( .1, .8, .1 ) );
         baseTitle->setTextColor( baseNameColor );
         baseTitle->setColor( GUI_CLEAR );
         baseTitle->setFont( Font( .07, 1.75 ) );
@@ -523,7 +523,7 @@
 
         //Player info title.
         StaticDisplay  *playerTitle     = new StaticDisplay;
-        static GFXColor basePlayerColor = getConfigColor( "base_player_color", GFXColor( .7, .7, .9 ) );
+        static GFXColor basePlayerColor = vs_config->getColor( "base_player_color", GFXColor( .7, .7, .9 ) );
         playerTitle->setRect( Rect( -.96, .69, 1.9, .07 ) );
         playerTitle->setTextColor( basePlayerColor );
         playerTitle->setColor( GUI_CLEAR );
@@ -532,7 +532,7 @@
         //Put it on the window.
         window()->addControl( playerTitle );
 
-        static GFXColor saveLoadColor = getConfigColor( "base_save_load_color", GFXColor( .75, 0, 0 ) );
+        static GFXColor saveLoadColor = vs_config->getColor( "base_save_load_color", GFXColor( .75, 0, 0 ) );
         //Options button.
         NewButton *options = new NewButton;
         options->setRect( Rect( .64, .85, .32, .1 ) );
@@ -552,7 +552,7 @@
         //Put the button on the window.
         window()->addControl( options );
     }
-    static GFXColor doneColor = getConfigColor( "base_done_color", GFXColor( .75, 0, 0 ) );
+    static GFXColor doneColor = vs_config->getColor( "base_done_color", GFXColor( .75, 0, 0 ) );
     //Done button.
     NewButton *done = new NewButton;
     done->setRect( Rect( .74, .71, .22, .1 ) );
@@ -568,7 +568,7 @@
 
     //Mode button.
     NewButton *mode = new NewButton;
-    static GFXColor mode_color = getConfigColor( "base_mode_color", GFXColor( 0, .5, 0 ) );
+    static GFXColor mode_color = vs_config->getColor( "base_mode_color", GFXColor( 0, .5, 0 ) );
     mode->setRect( Rect( -.96, .86, .24, .09 ) );
     mode->setLabel( "ERROR" );
     mode->setColor( GFXColor( mode_color.r, mode_color.g, mode_color.b, .25 ) );
@@ -1542,7 +1542,7 @@
         NewButton      *playerInfo = new NewButton;
         playerInfo->setRect( Rect( -.40, .52, .27, .09 ) );
         playerInfo->setLabel( "Player Info" );
-        static GFXColor pinfo_col  = getConfigColor( "player_info", GFXColor( 0, .4, 0 ) );
+        static GFXColor pinfo_col  = vs_config->getColor( "player_info", GFXColor( 0, .4, 0 ) );
         playerInfo->setCommand( "ShowPlayerInfo" );
 
         playerInfo->setColor( GFXColor( pinfo_col.r, pinfo_col.g, pinfo_col.b, .25 ) );

Modified: trunk/vegastrike/src/cmd/unit_xml.cpp
===================================================================
--- trunk/vegastrike/src/cmd/unit_xml.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/cmd/unit_xml.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -561,7 +561,7 @@
     unsigned int dirfrac = 0;
     float   fbrltb[6]    = {-1};
     AttributeList::const_iterator iter;
-    float   halocolor[4];
+    GFXColor halocolor; //FIXME it's set, but not actually used
     int     ammo   = -1; //short fix
     int     mntsiz = weapon_info::NOWEAP;
     string  light_type;
@@ -832,7 +832,7 @@
         break;
     case MESHLIGHT:
         ADDTAG;
-        vs_config->gethColor( "unit", "engine", halocolor, 0xffffffff );
+        halocolor = vs_config->getColor( "unit", "engine", GFXColor( 1, 1, 1, 1 ) );
         assert( xml->unitlevel == 1 );
         xml->unitlevel++;
         P   = QVector( 1, 0, 0 );

Modified: trunk/vegastrike/src/configxml.cpp
===================================================================
--- trunk/vegastrike/src/configxml.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/configxml.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -173,6 +173,9 @@
     string  hashname = prefix+name;
 
     vColor *color;
+    color    = new vColor;
+    vColor &vc = map_colors[hashname];
+
     if ( node->attr_value( "ref" ).empty() ) {
         string r = node->attr_value( "r" );
         string g = node->attr_value( "g" );
@@ -187,21 +190,17 @@
         float   bf = atof( b.c_str() );
         float   af = atof( a.c_str() );
 
-        vColor &vc = map_colors[hashname];
         vc.name.erase();
         vc.r     = rf;
         vc.g     = gf;
         vc.b     = bf;
         vc.a     = af;
 
-        color    = new vColor;
-
         color->r = rf;
         color->g = gf;
         color->b = bf;
         color->a = af;
     } else {
-        float  refcol[4];
 
         string ref_section = node->attr_value( "section" );
         string ref_name    = node->attr_value( "ref" );
@@ -209,24 +208,21 @@
             cout<<"you have to give a referenced section when referencing colors"<<endl;
             ref_section = "default";
         }
-        getColor( ref_section, ref_name, refcol );
+        GFXColor refcol;
+        refcol = getColor( ref_section, ref_name, refcol );
 
-        vColor &vc = map_colors[hashname];
         vc.name  = ref_section+"/"+ref_name;
-        vc.r     = refcol[0];
-        vc.g     = refcol[1];
-        vc.b     = refcol[2];
-        vc.a     = refcol[3];
+        vc.r     = refcol.r;
+        vc.g     = refcol.g;
+        vc.b     = refcol.b;
+        vc.a     = refcol.a;
 
-        color    = new vColor;
-
-        color->r = refcol[0];
-        color->g = refcol[1];
-        color->b = refcol[2];
-        color->a = refcol[3];
+        color->r = refcol.r;
+        color->g = refcol.g;
+        color->b = refcol.b;
+        color->a = refcol.a;
     }
-    color->name = node->attr_value( "name" );
-
+    color->name = name;
     node->color = color;
 
     return true;
@@ -299,61 +295,30 @@
     return defaultval;
 }
 
-/* *********************************************************** */
-
-void VegaConfig::gethColor( string section, string name, float color[4], int hexcolor )
+GFXColor VegaConfig::getColor( string section, string name, GFXColor default_color )
 {
-    color[3] = ( (float) (hexcolor&0xff) )/256.0;
-    color[2] = ( (float) ( (hexcolor&0xff00)>>8 ) )/256.0;
-    color[1] = ( (float) ( (hexcolor&0xff0000)>>16 ) )/256.0;
-    color[0] = ( (float) ( (hexcolor&0xff000000)>>24 ) )/256.0;
-
-    getColor( section, name, color, true );
-}
-
-/* *********************************************************** */
-
-void VegaConfig::getColor( string section, string name, float color[4], bool have_color )
-{
     string hashname = section+"/"+name;
     std::map< string, vColor >::iterator it;
-    if ( ( it = map_colors.find( hashname ) ) != map_colors.end() ) {
-        color[0] = (*it).second.r;
-        color[1] = (*it).second.g;
-        color[2] = (*it).second.b;
-        color[3] = (*it).second.a;
-    } else if (!have_color) {
-        color[0] = color[1] = color[2] = color[3] = 1.0f;
+    if ( ( it = map_colors.find( hashname ) ) != map_colors.end() )
+        return GFXColor( (*it).second.r, (*it).second.g, (*it).second.b, (*it).second.a );
+    else
+        return default_color;
     }
-}
 
 /* *********************************************************** */
 
-void VegaConfig::getColor( configNode *node, string name, float color[4], bool have_color )
+GFXColor VegaConfig::getColor( configNode *node, string name, GFXColor default_color )
 {
     vector< easyDomNode* >::const_iterator siter;
     for (siter = node->subnodes.begin(); siter != node->subnodes.end(); siter++) {
         configNode *cnode = (configNode*) (*siter);
-        if ( (cnode)->attr_value( "name" ) == name ) {
-            color[0] = (cnode)->color->r;
-            color[1] = (cnode)->color->g;
-            color[2] = (cnode)->color->b;
-            color[3] = (cnode)->color->a;
-            return;
+        if ( (cnode)->attr_value( "name" ) == name )
+            return GFXColor( (cnode)->color->r, (cnode)->color->g, (cnode)->color->b, (cnode)->color->a );
         }
+    cout<<"WARNING: color "<<name<<" not defined, using default"<<endl;
+    return default_color;
     }
-    if (have_color == false) {
-        color[0] = 1.0;
-        color[1] = 1.0;
-        color[2] = 1.0;
-        color[3] = 1.0;
 
-        cout<<"WARNING: color "<<name<<" not defined, using default (white)"<<endl;
-    } else {
-        cout<<"WARNING: color "<<name<<" not defined, using default (hexcolor)"<<endl;
-    }
-}
-
 /* *********************************************************** */
 
 configNode* VegaConfig::findEntry( string name, configNode *startnode )

Modified: trunk/vegastrike/src/configxml.h
===================================================================
--- trunk/vegastrike/src/configxml.h	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/configxml.h	2014-03-01 21:45:37 UTC (rev 13668)
@@ -31,6 +31,7 @@
 #include "xml_support.h"
 #include "easydom.h"
 #include <map>
+#include "gfxlib_struct.h"
 
 using std::string;
 using std::map;
@@ -70,12 +71,11 @@
     float hatswitch_margin[MAX_HATSWITCHES];
     int   hatswitch_axis[MAX_HATSWITCHES];
     int   hatswitch_joystick[MAX_HATSWITCHES];
-    void getColor( configNode*node, string name, float color[4], bool have_color = false );
-    void getColor( string section, string name, float color[4], bool have_color = false );
-    void gethColor( string section, string name, float color[4], int hexcolor );
-    void getColor( string name, float color[4], bool have_color = false )
+    GFXColor getColor( configNode*node, string name, GFXColor default_color = GFXColor( 1, 1, 1, 1 ) );
+    GFXColor getColor( string section, string name, GFXColor default_color = GFXColor( 1, 1, 1, 1 ) );
+    inline GFXColor getColor( string name, GFXColor default_color = GFXColor( 1, 1, 1, 1 ) )
     {
-        getColor( "default", name, color, have_color );
+        return getColor( "default", name, default_color );
     }
     string getVariable( string section, string name, string defaultvalue );
     string getVariable( string section, string subsection, string name, string defaultvalue );

Modified: trunk/vegastrike/src/gamemenu.cpp
===================================================================
--- trunk/vegastrike/src/gamemenu.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gamemenu.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -281,7 +281,7 @@
     StaticDisplay  *baseTitle     = new StaticDisplay;
     baseTitle->setRect( Rect( -.96, .83, 1.9, .1 ) );
     baseTitle->setText( "Vega Strike menu" );
-    static GFXColor baseNameColor = getConfigColor( "base_name_color", GFXColor( .1, .8, .1 ) );
+    static GFXColor baseNameColor = vs_config->getColor( "base_name_color", GFXColor( .1, .8, .1 ) );
     baseTitle->setTextColor( baseNameColor );
     baseTitle->setColor( GUI_CLEAR );
     baseTitle->setFont( Font( .07, 2 ) );

Modified: trunk/vegastrike/src/gfx/cockpit.cpp
===================================================================
--- trunk/vegastrike/src/gfx/cockpit.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/cockpit.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -56,6 +56,7 @@
 #include "cmd/unit_const_cache.h"
 #include "options.h"
 #include "soundcontainer_aldrv.h"
+#include "configxml.h"
 
 
 
@@ -70,12 +71,6 @@
 /*so that znear/zfar are not too close to max/min values, and account for off-center cockpits */
 #define COCKPITZ_HEADROOM (1.01f)
 
-static GFXColor RetrColor( const string &name, GFXColor def = GFXColor( 1, 1, 1, 1 ) )
-{
-    vs_config->getColor( name, &def.r );
-    return def;
-}
-
 static soundContainer disableautosound;
 static soundContainer enableautosound;
 
@@ -130,12 +125,12 @@
 {
     static float crossthick =
         XMLSupport::parse_float( vs_config->getVariable( "graphics", "hud", "NavCrossLineThickness", "1" ) );                        //1.05;
-    
+
     GFXLineWidth( crossthick );
     size = .125*size;
     GFXBlendMode( SRCALPHA, INVSRCALPHA );
     GFXEnable( SMOOTH );
-    
+
     static VertexBuilder<> verts;
     verts.clear();
     verts.insert( Loc+P*size );
@@ -159,7 +154,7 @@
     verts.insert( Loc-.9*Q*size+.125*P*size );
     verts.insert( Loc-.9*Q*size-.125*P*size );
     GFXDraw( GFXLINE, verts );
-    
+
     GFXDisable( SMOOTH );
     GFXLineWidth( 1 );
 }
@@ -274,7 +269,7 @@
             float r = rSize < absmin ? absmin : rSize;
 
             verts.clear();
-            
+
             verts.insert( Loc+CamP*(innerdis*r) );
             verts.insert( Loc+CamP*(outerdis*r) );
 
@@ -326,13 +321,13 @@
 
             TLockBox *= r1Size;
             SLockBox *= r1Size;
-            
+
             max *= rSize*.75*endreticle;
             verts.clear();
             if (lock_percent == 0) {
                 const QVector qCamP(CamP.Cast());
                 const QVector qCamQ(CamQ.Cast());
-                
+
                 verts.insert( Loc+qCamQ*max*lockline );
                 verts.insert( Loc+qCamQ*max );
                 verts.insert( Loc+Origin+TLockBox );
@@ -353,13 +348,13 @@
                 verts.insert( Loc-Origin1+SLockBox );
                 verts.insert( Loc-Origin1 );
                 verts.insert( Loc-Origin1-TLockBox );
-                
+
                 static const unsigned char indices[] = {
                     0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8,
                     8, 9, 9, 10, 10, 11, 11, 12, 12, 11, 11, 13, 13, 14,
                     14, 15, 15, 5, 16, 7, 7, 17, 17, 18, 18, 19, 19, 1
                 };
-                
+
                 GFXDrawElements( GFXLINE, verts, indices, sizeof(indices) / sizeof(*indices) );
             } else {
                 verts.insert( Loc+Origin+TLockBox );
@@ -374,11 +369,11 @@
                 verts.insert( Loc-Origin1+SLockBox );
                 verts.insert( Loc-Origin1 );
                 verts.insert( Loc-Origin1-TLockBox );
-                
+
                 static const unsigned char indices[] = {
                     0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11
                 };
-                
+
                 GFXDrawElements( GFXLINE, verts, indices, sizeof(indices) / sizeof(*indices) );
             }
         }
@@ -387,30 +382,24 @@
     GFXDisable( SMOOTH );
 }
 
-static GFXColor DockBoxColor( const string &name, GFXColor deflt = GFXColor(1,1,1,1) )
-{
-    vs_config->getColor( name, &deflt.r, true );
-    return deflt;
-}
-
 inline void DrawDockingBoxes( Unit *un, const Unit *target, const Vector &CamP, const Vector &CamQ, const Vector &CamR )
 {
     if ( target->IsCleared( un ) ) {
         GFXBlendMode( SRCALPHA, INVSRCALPHA );
-        static GFXColor dockboxstop = DockBoxColor( "docking_box_halt", GFXColor(1,0,0,1) );
-        static GFXColor dockboxgo   = DockBoxColor( "docking_box_proceed", GFXColor(0,1,.5,1) );
+        static GFXColor dockboxstop = vs_config->getColor( "docking_box_halt", GFXColor(1,0,0,1) );
+        static GFXColor dockboxgo   = vs_config->getColor( "docking_box_proceed", GFXColor(0,1,.5,1) );
+        static GFXColor waypointcolor = vs_config->getColor( "docking_box_waypoint", GFXColor(0, 1, 1, 0.3) );
         const vector< DockingPorts >d = target->DockingPortLocations();
         for (unsigned int i = 0; i < d.size(); i++)
         {
             float rad = d[i].GetRadius() / sqrt( 2.0 );
-            QVector dockpos = Transform( 
+            QVector dockpos = Transform(
                     target->GetTransformation(),
-                    d[i].GetPosition().Cast() 
+                    d[i].GetPosition().Cast()
                 ) - _Universe->AccessCamera()->GetPosition();
 
             if (!d[i].IsDockable())
             {
-                static GFXColor waypointcolor = DockBoxColor( "docking_box_waypoint", GFXColor(0, 1, 1, 0.3) );
                 if (waypointcolor.a > 0.01) {
                     GFXColorf( waypointcolor );
                     DrawOneTargetBox( dockpos, rad, CamP, CamQ, CamR, 1,
@@ -418,7 +407,6 @@
                 }
                 continue;
             }
-            
             GFXDisable( DEPTHTEST );
             GFXDisable( DEPTHWRITE );
             GFXColorf( dockboxstop );
@@ -499,7 +487,7 @@
     GFXEnable( SMOOTH );
     GFXBlendMode( SRCALPHA, INVSRCALPHA );
     const float verts[2 * 3] = {
-        fromLoc.x, fromLoc.y, fromLoc.z, 
+        fromLoc.x, fromLoc.y, fromLoc.z,
         aimLoc.x,   aimLoc.y,  aimLoc.z,
     };
     GFXDraw( GFXLINE, verts, 2 );
@@ -562,15 +550,15 @@
         if (draw_line_to_targets_target && targets_target != NULL) {
             QVector ttLoc = targets_target->Position();
             const float verts[3 * 3] = {
-                myLoc.x, myLoc.y, myLoc.z, 
-                Loc.x,   Loc.y,   Loc.z, 
+                myLoc.x, myLoc.y, myLoc.z,
+                Loc.x,   Loc.y,   Loc.z,
                 ttLoc.x, ttLoc.x, ttLoc.x,
             };
             GFXDraw( GFXLINESTRIP, verts, 3 );
         } else {
             const float verts[2 * 3] = {
-                myLoc.x, myLoc.y, myLoc.z, 
-                Loc.x,   Loc.y,   Loc.z, 
+                myLoc.x, myLoc.y, myLoc.z,
+                Loc.x,   Loc.y,   Loc.z,
             };
             GFXDraw( GFXLINESTRIP, verts, 2 );
         }
@@ -624,7 +612,7 @@
         if (ITTS_averageguns) {
             player->getAverageGunSpeed( speed, range, mrange );
             iLoc = target->PositionITTS( PlayerPosition, PlayerVelocity, speed, steady_itts ) - offs;
-            if (draw_line_to_itts) 
+            if (draw_line_to_itts)
                 DrawITTSLine(Loc, iLoc, trackcolor);
             DrawITTSMark(scatter, p, q, iLoc, trackcolor);
         }
@@ -632,7 +620,7 @@
             int nummounts = player->GetNumMounts();
             if (draw_line_to_itts) {
                 for (int i = 0; i < nummounts; i++) {
-                    if ( (player->mounts[i].status == Mount::ACTIVE) 
+                    if ( (player->mounts[i].status == Mount::ACTIVE)
                         && (ITTS_for_beams || (player->mounts[i].type->type != weapon_info::BEAM))
                         && (ITTS_for_locks || (player->mounts[i].type->LockTime == 0)) )
                     {
@@ -643,7 +631,7 @@
             }
             for (int i = 0; i < nummounts; i++) {
                 if ( (player->mounts[i].status == Mount::ACTIVE)
-                    && (ITTS_for_beams || (player->mounts[i].type->type != weapon_info::BEAM)) 
+                    && (ITTS_for_beams || (player->mounts[i].type->type != weapon_info::BEAM))
                     && (ITTS_for_locks || (player->mounts[i].type->LockTime == 0)) )
                 {
                     mntcolor = MountColor( &player->mounts[i] );
@@ -663,7 +651,7 @@
     for (unsigned int i = 0; i < vdu.size(); ++i) {
         Unit *target = vdu[i]->GetCommunicating();
         if (target) {
-            GFXColor black_and_white = DockBoxColor( "communicating" );
+            static GFXColor black_and_white = vs_config->getColor( "communicating" );
             QVector Loc( target->Position()-_Universe->AccessCamera()->GetPosition() );
             GFXDisable( TEXTURE0 );
             GFXDisable( TEXTURE1 );
@@ -689,7 +677,7 @@
     GFXDisable( DEPTHTEST );
     GFXDisable( DEPTHWRITE );
     GFXDisable( LIGHTING );
-    
+
     static VertexBuilder<> verts;
 
     //This avoids rendering the same target box more than once
@@ -739,9 +727,9 @@
 
         verts.insert( Loc+(-CamQ).Cast()*rSize*1.3 );
         verts.insert( Loc+(-CamQ).Cast()*rSize*.8 );
-        
+
         GFXDraw( GFXLINESTRIP, verts );
-        
+
         GFXDisable( SMOOTH );
     }
 }
@@ -795,7 +783,7 @@
         verts.insert( Loc+( (CamP).Cast()+(CamQ).Cast() )*rSize*(foci-fudge) );
 
         GFXDraw( GFXLINE, verts );
-        
+
         glLineWidth( (int) 1 );         //temp
     }
 }
@@ -1163,7 +1151,7 @@
 
     case UnitImages< void >::WARPFIELDSTRENGTH:
         return target->graphicOptions.WarpFieldStrength;
-    
+
     case UnitImages< void >::MAXWARPFIELDSTRENGTH:
         return target->GetMaxWarpFieldStrength();
 
@@ -1414,16 +1402,16 @@
 GameCockpit::LastState::LastState()
 {
     processing_time = 0;
-    
-    jumpok = jumpnotok = 
+
+    jumpok = jumpnotok =
     specon = specoff =
     asapon = asapoff =
     asap_dockon = asap_dockoff =
     asap_dock_avail =
     dock =
-    dock_avail = 
-    lock = missilelock = 
-    eject = 
+    dock_avail =
+    lock = missilelock =
+    eject =
     flightcompon = flightcompoff = false;
 }
 
@@ -1434,7 +1422,7 @@
         return;
     else
         last.processing_time = curtime;
-    
+
     VSFileSystem::vs_dprintf(3, "Processing events\n");
     for (EVENTID event = EVENTID_FIRST; event < NUM_EVENTS; event = (EVENTID)(event+1)) {
         GameSoundContainer *sound = static_cast<GameSoundContainer*>(GetSoundForEvent(event));
@@ -1456,13 +1444,13 @@
                             sound->stop(); \
                     } \
                 } while(0)
-            
+
             #define MODAL_IMAGE_TRIGGER(image, itrigger, btrigger, lastvar) \
                 MODAL_TRIGGER(#image, btrigger, LookupUnitStat(UnitImages< void >::image, un) == UnitImages< void >::itrigger, lastvar)
-            
+
             #define MODAL_RAWIMAGE_TRIGGER(image, itrigger, btrigger, lastvar) \
                 MODAL_TRIGGER(#image, btrigger, LookupUnitStat(UnitImages< void >::image, un) itrigger, lastvar)
-            
+
             switch((int)event) {
             case WARP_READY:
                 MODAL_RAWIMAGE_TRIGGER(MAXWARPFIELDSTRENGTH, >= 2, true, warpready);
@@ -1497,18 +1485,18 @@
             case ASAP_DOCKING_ENGAGED:
                 {
                     float candock = LookupUnitStat(UnitImages< void >::CANDOCK_MODAL, un);
-                    MODAL_TRIGGER("ASAP_DOCKING", true, 
-                                (un->autopilotactive && (   candock == UnitImages< void >::READY 
-                                                         || candock == UnitImages< void >::AUTOREADY)), 
+                    MODAL_TRIGGER("ASAP_DOCKING", true,
+                                (un->autopilotactive && (   candock == UnitImages< void >::READY
+                                                         || candock == UnitImages< void >::AUTOREADY)),
                                 asap_dockon);
                 }
                 break;
             case ASAP_DOCKING_DISENGAGED:
                 {
                     float candock = LookupUnitStat(UnitImages< void >::CANDOCK_MODAL, un);
-                    MODAL_TRIGGER("ASAP_DOCKING", false, 
-                                (un->autopilotactive && (   candock == UnitImages< void >::READY 
-                                                         || candock == UnitImages< void >::AUTOREADY)), 
+                    MODAL_TRIGGER("ASAP_DOCKING", false,
+                                (un->autopilotactive && (   candock == UnitImages< void >::READY
+                                                         || candock == UnitImages< void >::AUTOREADY)),
                                 asap_dockoff);
                 }
                 break;
@@ -1885,21 +1873,13 @@
 
     oaccel     = Vector( 0, 0, 0 );
 
-    friendly   = GFXColor( -1, -1, -1, -1 );
-    enemy      = GFXColor( -1, -1, -1, -1 );
-    neutral    = GFXColor( -1, -1, -1, -1 );
-    targeted   = GFXColor( -1, -1, -1, -1 );
-    targetting = GFXColor( -1, -1, -1, -1 );
-    planet     = GFXColor( -1, -1, -1, -1 );
+    enemy      = vs_config->getColor( "enemy",           GFXColor(1.0 ,0.0,0.0,1.0) ); // red
+    friendly   = vs_config->getColor( "friend",          GFXColor(0.0 ,1.0,0.0,1.0) ); // green
+    neutral    = vs_config->getColor( "neutral",         GFXColor(1.0 ,1.0,0.0,1.0) ); // yellow
+    targeted   = vs_config->getColor( "target",          GFXColor(1.0 ,0.0,1.0,1.0) ); // violet
+    targetting = vs_config->getColor( "targetting_ship", GFXColor( .68, .9,1.0,1.0) ); // light-blue
+    planet     = vs_config->getColor( "planet",          GFXColor(1.0 ,1.0, .6,1.0) ); //
     soundfile  = -1;
-    if (friendly.r == -1) {
-        vs_config->getColor( "enemy", &enemy.r );
-        vs_config->getColor( "friend", &friendly.r );
-        vs_config->getColor( "neutral", &neutral.r );
-        vs_config->getColor( "target", &targeted.r );
-        vs_config->getColor( "targetting_ship", &targetting.r );
-        vs_config->getColor( "planet", &planet.r );
-    }
     InitStatic();
     updateRadar(parent);
 }
@@ -2176,10 +2156,13 @@
     flashes[0] = shieldflash;
     flashes[1] = armorflash;
     flashes[2] = hullflash;
-    float fallbackcolor[numtypes][4] = {
-        {0, 1, .5, .2}, {1, 0, .2, .25}, {1, 0, 0, .5}
+    static GFXColor fallbackcolor[numtypes] = {
+        vs_config->getColor( "shield_flash", GFXColor(0, 1, .5, .2 ) ),
+        vs_config->getColor( "armor_flash" , GFXColor(1, 0, .2, .25) ),
+        vs_config->getColor( "hull_flash"  , GFXColor(1, 0, 0 , .5 ) )
     };
 
+
     static bool init = false;
     static Animation *aflashes[numtypes];
     static bool doflash[numtypes];
@@ -2192,9 +2175,6 @@
             else
                 aflashes[i] = NULL;
         }
-        vs_config->getColor( "shield_flash", fallbackcolor[0] );
-        vs_config->getColor( "armor_flash", fallbackcolor[1] );
-        vs_config->getColor( "hull_flash", fallbackcolor[2] );
     }
     if (dtype < numtypes) {
         int i = dtype;
@@ -2209,7 +2189,7 @@
             if ( aflashes[i]->LoadSuccess() ) {
                 aflashes[i]->MakeActive();
                 GFXColor4f( 1, 1, 1, 1 );
-                
+
                 static const float verts[4 * (3 + 2)] = {
                    -1.0f, -1.0f, 1.0f,  0.0f, 1.0f,    //lower left
                     1.0f, -1.0f, 1.0f,  1.0f, 1.0f,    //upper left
@@ -2218,10 +2198,10 @@
                 };
                 GFXDraw( GFXQUAD, verts, 4, 3, 0, 2 );
             } else {
-                GFXColor4f( fallbackcolor[i][0],
-                            fallbackcolor[i][1],
-                            fallbackcolor[i][2],
-                            fallbackcolor[i][3] );
+                GFXColor4f( fallbackcolor[i].r,
+                            fallbackcolor[i].g,
+                            fallbackcolor[i].b,
+                            fallbackcolor[i].a );
                 GFXDisable( TEXTURE0 );
 
                 static const float verts[4 * 3] = {
@@ -2231,7 +2211,7 @@
                     1.0f, -1.0f, 1.0f,
                 };
                 GFXDraw( GFXQUAD, verts, 4 );
-                
+
                 GFXEnable( TEXTURE0 );
             }
             GFXPopBlendMode();
@@ -2264,7 +2244,7 @@
     const Unit * u = cp.GetParent();
     const Camera * cam = cp.AccessCamera();
     bool drawv = true;
-    
+
     // heading direction (unit fwd direction)
     Vector d = u->GetTransformation().getR();
 
@@ -2321,7 +2301,7 @@
     GFXCircle( x, y, wid/4, hei/4 );
     GFXCircle( x, y, wid/7, hei/7 );
     GFXDisable( SMOOTH );
-    
+
     const float verts[12 * 3] = {
         x-(wid/2.f), y, 0,
         x-(wid/6.f), y, 0,
@@ -2337,7 +2317,7 @@
         x-.001f, y-.001f, 0,
     };
     GFXDraw( GFXLINE, verts, 12 );
-    
+
     GFXEnable( TEXTURE0 );
 }
 
@@ -2351,7 +2331,7 @@
     static bool drawHeadingMarker = parse_bool( vs_config->getVariable( "graphics", "draw_heading_marker", "false" ) );
     static bool     draw_star_destination_arrow =
         XMLSupport::parse_bool( vs_config->getVariable( "graphics", "hud", "draw_star_direction", "true" ) );
-    static GFXColor destination_system_color    = DockBoxColor( "destination_system_color" );
+    static GFXColor destination_system_color    = vs_config->getColor( "destination_system_color" );
     Vector destination_system_location( 0, 0, 0 );
     cockpit_time += GetElapsedTime();
     if (cockpit_time >= 100000)
@@ -2407,7 +2387,7 @@
                                 destination_system_color.b,
                                 destination_system_color.a );
 
-                    static GFXColor suncol = RetrColor( "remote_star", GFXColor( 0, 1, 1, .8 ) );
+                    static GFXColor suncol = vs_config->getColor( "remote_star", GFXColor( 0, 1, 1, .8 ) );
                     GFXColorf( suncol );
                     DrawNavigationSymbol( delta.Cast(), P, Q, delta.Magnitude()*nav_symbol_size );
 
@@ -3252,10 +3232,10 @@
         un->UpdateHudMatrix( CP_BACK );
         un->UpdateHudMatrix( CP_CHASE );
         un->UpdateHudMatrix( CP_PANINSIDE );
-        
+
         insidePanYaw += insidePanYawSpeed * GetElapsedTime();
         insidePanPitch += insidePanPitchSpeed * GetElapsedTime();
-        
+
         Vector p, q, r, tmp;
         _Universe->AccessCamera( CP_FRONT )->GetOrientation( p, q, r );
         _Universe->AccessCamera( CP_LEFT )->SetOrientation( r, q, -p );
@@ -3273,7 +3253,7 @@
             Transform(panMatrix, p),
             Transform(panMatrix, q),
             Transform(panMatrix, r) );
-        
+
         tgt = un->Target();
         if (tgt) {
             un->GetOrientation( p, q, r );
@@ -3537,7 +3517,7 @@
         s,    t,    0,
     };
     GFXDraw( GFXLINESTRIP, verts, 4 );
-    
+
     GFXColor4f( 1, 1, 1, 1 );
     GFXDisable( SMOOTH );
 }
@@ -3591,7 +3571,7 @@
 }
 void GameCockpit::SetParent( Unit *unit, const char *filename, const char *unitmodname, const QVector &startloc ){
     this->Cockpit::SetParent(unit,filename,unitmodname,startloc);
-    updateRadar(unit);    
+    updateRadar(unit);
 }
 void GameCockpit::OnDockEnd(Unit *station, Unit *ship)
 {

Modified: trunk/vegastrike/src/gfx/nav/drawgalaxy.cpp
===================================================================
--- trunk/vegastrike/src/gfx/nav/drawgalaxy.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/nav/drawgalaxy.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -117,19 +117,8 @@
     if (willclick == true && mouseover == false)
         //Perhaps some key binding or mouseclick will be set in the future to do this.
         mouseover = true;
-    static bool     inited = false;
-    static GFXColor highlighted_tail_col;
-    static GFXColor highlighted_tail_text;
-    if (!inited) {
-        float col1[4] = {1, .3, .3, .8};
-        vs_config->getColor( "nav", "highlighted_unit_on_tail", col1, true );
-        highlighted_tail_col = GFXColor( col1[0], col1[1], col1[2], col1[3] );
-
-        float col2[4] = {1, 1, .7, 1};
-        vs_config->getColor( "nav", "highlighted_text_on_tail", col2, true );
-        highlighted_tail_text = GFXColor( col2[0], col2[1], col2[2], col2[3] );
-        inited = true;
-    }
+    static GFXColor highlighted_tail_col  = vs_config->getColor( "nav", "highlighted_unit_on_tail", GFXColor(1, .3, .3, .8) ) ;
+    static GFXColor highlighted_tail_text = vs_config->getColor( "nav", "highlighted_text_on_tail", GFXColor(1,1  , .7,1  ) ) ;
     if (color == 'm')
         race = GrayColor;
     if (mouseover) {

Modified: trunk/vegastrike/src/gfx/nav/drawlist.cpp
===================================================================
--- trunk/vegastrike/src/gfx/nav/drawlist.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/nav/drawlist.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -175,26 +175,24 @@
     return tail->source;
 }
 
-#define INIT_COL_ARRAY( col, r, g, b, a ) do{ col[0] = r; col[1] = g; col[2] = b; col[3] = a; }while(0)
+//#define INIT_COL_ARRAY( col, r, g, b, a ) do{ col[0] = r; col[1] = g; col[2] = b; col[3] = a; }while(0)
 
-static GFXColor getUnitTypeColor( std::string name, bool text, float col[4], float unselectedalpha )
+static GFXColor getUnitTypeColor( std::string name, bool text, GFXColor def, float unselectedalpha )
 {
-    vs_config->getColor( "nav", (std::string( "unhighlighted_" )+name)+(text ? "_text" : ""), col, true );
-    if (col[3] == 0) {
-        if (name != "unit" && col[0] == 0 && col[1] == 0 && col[2] == 0) {
+    GFXColor col = vs_config->getColor( "nav", (std::string( "unhighlighted_" )+name)+(text ? "_text" : ""), def );
+    if (col.a == 0) {
+        if (name != "unit" && col.r == 0 && col.g == 0 && col.b == 0) {
             if (!text) {
-                INIT_COL_ARRAY( col, 1, 1, .7, 1 );
-                return getUnitTypeColor( "unit", text, col, unselectedalpha );
+                return getUnitTypeColor( "unit", false, GFXColor (1, 1, .7, 1 ), unselectedalpha );
             } else {
-                INIT_COL_ARRAY( col, .2, 1, .5, 0 );
-                GFXColor temp = getUnitTypeColor( "unit", text, col, unselectedalpha );
+                GFXColor temp = getUnitTypeColor( "unit", true, GFXColor(.2, 1, .5, 0 ) , unselectedalpha );
                 temp.a = unselectedalpha;
                 return temp;
             }
         }
-        col[3] = unselectedalpha;
+        col.a = unselectedalpha;
     }
-    return GFXColor( col[0], col[1], col[2], col[3] );
+    return col;
 }
 
 void drawlistitem( int type,
@@ -209,6 +207,12 @@
                    GFXColor *factioncolours )
 {
     float relation = 0.0;
+    
+    //Get a color from the config
+    static bool inited = false;
+    static GFXColor highlighted_tail_col;
+    static GFXColor highlighted_tail_text;
+    static GFXColor highlighted_untail_col;
     static GFXColor unhighlighted_sun_col;
     static GFXColor unhighlighted_sun_text;
     static GFXColor unhighlighted_planet_text;
@@ -224,83 +228,42 @@
     static GFXColor unhighlighted_jump_text;
     static GFXColor unhighlighted_station_text;
     static GFXColor unhighlighted_fighter_text;
+    static GFXColor unhighlighted_capship_text;
     static GFXColor unhighlighted_unit_text;
-    static GFXColor highlighted_tail_col;
-    static GFXColor highlighted_tail_text;
-    static GFXColor highlighted_untail_col;
-    static GFXColor unhighlighted_capship_text;
-    static bool     init = false;
-    if (!init) {
-        //Get a color from the config
-        float col[4];
 
-        INIT_COL_ARRAY( col, 1, .3, .3, .8 );
-        vs_config->getColor( "nav", "highlighted_unit_on_tail", col, true );
-        highlighted_tail_col = GFXColor( col[0], col[1], col[2], col[3] );
-
-        INIT_COL_ARRAY( col, 1, 1, .7, 1 );
-        vs_config->getColor( "nav", "highlighted_text_on_tail", col, true );
-        highlighted_tail_text = GFXColor( col[0], col[1], col[2], col[3] );
-
-        INIT_COL_ARRAY( col, 1, 1, 1, .8 );
-        vs_config->getColor( "nav", "highlighted_unit_off_tail", col, true );
-        highlighted_untail_col = GFXColor( col[0], col[1], col[2], col[3] );
-
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );         //If not found, use defaults
-        unhighlighted_sun_col  = getUnitTypeColor( "sun", false, col, unselectedalpha );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_sun_text = getUnitTypeColor( "sun", true, col, unselectedalpha );
-
+    if (!inited) {
+        inited = true;
+        
+        highlighted_tail_col   = vs_config->getColor( "nav", "highlighted_unit_on_tail", GFXColor( 1, .3, .3, .8 ) );
+        highlighted_tail_text  = vs_config->getColor( "nav", "highlighted_text_on_tail", GFXColor( 1, 1, .7, 1 ) );
+        highlighted_untail_col = vs_config->getColor( "nav", "highlighted_unit_off_tail", GFXColor( 1, 1, 1, .8 ) );
+        unhighlighted_sun_col       = getUnitTypeColor( "sun", false, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_sun_text      = getUnitTypeColor( "sun", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        
         //Planet color is the relation color, so is not defined here.
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_planet_text   = getUnitTypeColor( "planet", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, .3, .3, 1, .8 );         //If not found, use defaults
-        unhighlighted_c_player_col  = getUnitTypeColor( "curplayer", false, col, .8 );
-        INIT_COL_ARRAY( col, .3, .3, 1, 0 );
-        unhighlighted_c_player_text = getUnitTypeColor( "curplayer", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, .3, .3, 1, .8 );         //If not found, use defaults
-        unhighlighted_player_col    = getUnitTypeColor( "player", false, col, .8 );
-        INIT_COL_ARRAY( col, .3, .3, 1, 0 );
-        unhighlighted_player_text   = getUnitTypeColor( "player", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, .3, .3, 1, .8 );         //If not found, use defaults
-        unhighlighted_player_col    = getUnitTypeColor( "player", false, col, .8 );
-        INIT_COL_ARRAY( col, .3, .3, 1, 0 );
-        unhighlighted_player_text   = getUnitTypeColor( "player", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, 1, .8, .8, .6 );         //If not found, use defaults
-        unhighlighted_asteroid_col  = getUnitTypeColor( "asteroid", false, col, .6 );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_asteroid_text = getUnitTypeColor( "asteroid", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, 1, .5, 1, .6 );         //If not found, use defaults
-        unhighlighted_nebula_col    = getUnitTypeColor( "nebula", false, col, .6 );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_nebula_text   = getUnitTypeColor( "nebula", true, col, unselectedalpha );
-
-        INIT_COL_ARRAY( col, .5, .9, .9, .6 );         //If not found, use defaults
-        unhighlighted_jump_col  = getUnitTypeColor( "jump", false, col, .6 );
-        INIT_COL_ARRAY( col, .3, 1, .8, 0 );
-        unhighlighted_jump_text = getUnitTypeColor( "jump", true, col, unselectedalpha );
-
+        unhighlighted_planet_text   = getUnitTypeColor( "planet", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_c_player_col  = getUnitTypeColor( "curplayer", false, GFXColor( .3, .3, 1, .8 ), .8 );
+        unhighlighted_c_player_text = getUnitTypeColor( "curplayer", true, GFXColor( .3, .3, 1, 0), unselectedalpha );
+        unhighlighted_player_col    = getUnitTypeColor( "player", false, GFXColor( .3, .3, 1, .8 ), .8 );
+        unhighlighted_player_text   = getUnitTypeColor( "player", true, GFXColor( .3, .3, 1, 0 ), unselectedalpha );
+        unhighlighted_asteroid_col  = getUnitTypeColor( "asteroid", false, GFXColor( 1, .8, .8, .6 ), .6 );
+        unhighlighted_asteroid_text = getUnitTypeColor( "asteroid", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_nebula_col    = getUnitTypeColor( "nebula", false, GFXColor( 1, .5, 1, .6 ), .6 );
+        unhighlighted_nebula_text   = getUnitTypeColor( "nebula", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_jump_col      = getUnitTypeColor( "jump", false, GFXColor(.5, .9, .9, .6 ), .6 );
+        unhighlighted_jump_text     = getUnitTypeColor( "jump", true, GFXColor( .3, 1, .8, 0 ), unselectedalpha );
+        
         //Basic unit types:
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_station_text = getUnitTypeColor( "station", true, col, unselectedalpha );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_fighter_text = getUnitTypeColor( "fighter", true, col, unselectedalpha );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_capship_text = getUnitTypeColor( "capship", true, col, unselectedalpha );
-        INIT_COL_ARRAY( col, 0, 0, 0, 0 );
-        unhighlighted_unit_text    = getUnitTypeColor( "unit", true, col, unselectedalpha );
-
-        init = true;
+        unhighlighted_station_text = getUnitTypeColor( "station", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_fighter_text = getUnitTypeColor( "fighter", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_capship_text = getUnitTypeColor( "capship", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha );
+        unhighlighted_unit_text = getUnitTypeColor( "unit", true, GFXColor( 0, 0, 0, 0 ), unselectedalpha  );
     }
-//if(source != NULL)
-//relation =      FactionUtil::GetIntRelation( ( UniverseUtil::getPlayerX(UniverseUtil::getCurrentPlayer()) )->faction ,source->faction);
-//else
-//relation = 0;
+    
+    //if(source != NULL)
+    //relation =      FactionUtil::GetIntRelation( ( UniverseUtil::getPlayerX(UniverseUtil::getCurrentPlayer()) )->faction ,source->faction);
+    //else
+    //relation = 0;
     //the realtime relationship
     if (source != NULL)
         relation = source->getRelation( UniverseUtil::getPlayerX( UniverseUtil::getCurrentPlayer() ) );
@@ -309,9 +272,9 @@
     relation = relation*0.5;
     relation = relation+0.5;
 
-//to avoid duplicate code
+    //to avoid duplicate code
     GFXColor relColor( (1.0-relation), relation, ( 1.0-( 2.0*Delta( relation, 0.5 ) ) ), .7 );
-//GFXColor((1.0-relation),relation,(1.0-(2.0*Delta(relation, 0.5))),1)
+    //GFXColor((1.0-relation),relation,(1.0-(2.0*Delta(relation, 0.5))),1)
     if (type == navsun) {
         if (!inmouserange) {
             NavigationSystem::DrawCircle( x, y, size, unhighlighted_sun_col );

Modified: trunk/vegastrike/src/gfx/nav/drawsystem.cpp
===================================================================
--- trunk/vegastrike/src/gfx/nav/drawsystem.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/nav/drawsystem.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -347,14 +347,9 @@
         insert_size *= system_item_scale_temp;
         if ( _Universe->AccessCockpit()->GetParent()->Target() == (*blah) ) {
             //Get a color from the config
-            static float col[4] = {1, 0.3, 0.3, 0.8};
-            static bool  init   = false;
-            if (!init) {
-                vs_config->getColor( "nav", "targeted_unit", col, true );
-                init = true;
+            static GFXColor col = vs_config->getColor( "nav", "targetted_unit", GFXColor(1, 0.3, 0.3, 0.8) );
+            DrawTargetCorners( the_x, the_y, insert_size, col );
             }
-            DrawTargetCorners( the_x, the_y, insert_size, GFXColor( col[0], col[1], col[2], col[3] ) );
-        }
         bool tests_in_range = 0;
         if (insert_type == navstation)
             tests_in_range = TestIfInRangeBlk( the_x, the_y, insert_size, mouse_x_current, mouse_y_current );

Modified: trunk/vegastrike/src/gfx/nav/navscreen.cpp
===================================================================
--- trunk/vegastrike/src/gfx/nav/navscreen.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/nav/navscreen.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -329,19 +329,14 @@
     screenoccupation = new navscreenoccupied( screenskipby4[0], screenskipby4[1], screenskipby4[2], screenskipby4[3], 1 );
 
     //Get special colors from the config
-    float tempcol1[4] = {1, 0.3, 0.3, 1.0};
-    vs_config->getColor( "nav", "current_system", tempcol1, true );
-    currentcol     = GFXColor( tempcol1[0], tempcol1[1], tempcol1[2], tempcol1[3] );
-    float tempcol2[4] = {1, 0.77, 0.3, 1.0};
-    vs_config->getColor( "nav", "destination_system", tempcol2, true );
-    destinationcol = GFXColor( tempcol2[0], tempcol2[1], tempcol2[2], tempcol2[3] );
-    float tempcol3[4] = {0.3, 1, 0.3, 1.0};
-    vs_config->getColor( "nav", "selection_system", tempcol3, true );
-    selectcol = GFXColor( tempcol3[0], tempcol3[1], tempcol3[2], tempcol3[3] );
-    float tempcol4[4] = {1, 0.3, 0.3, 1.0};
-    vs_config->getColor( "nav", "path_system", tempcol4, true );
-    pathcol   = GFXColor( tempcol4[0], tempcol4[1], tempcol4[2], tempcol4[3] );
-
+    static GFXColor currentcol = vs_config->getColor( "nav", "current_system",
+                                           GFXColor( 1, 0.3, 0.3, 1.0 ) );
+    static GFXColor destinationcol = vs_config->getColor( "nav", "destination_system",
+                                           GFXColor( 1, 0.77, 0.3, 1.0 ) );
+    static GFXColor selectcol = vs_config->getColor( "nav", "selection_system",
+                                           GFXColor( 0.3, 1, 0.3, 1.0 ) );
+    static GFXColor pathcol = vs_config->getColor( "nav", "path_system",
+                                           GFXColor( 1, 0.3, 0.3, 1.0 ) );
     navcomp->init();
 }
 

Modified: trunk/vegastrike/src/gfx/radar/sensor.cpp
===================================================================
--- trunk/vegastrike/src/gfx/radar/sensor.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/radar/sensor.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -8,17 +8,6 @@
 
 extern Unit *getTopLevelOwner(); // WTF... located in star_system_generic.cpp
 
-namespace
-{
-
-GFXColor RetrColor( const std::string &name, GFXColor def = GFXColor( 1, 1, 1, 1 ) )
-{
-    vs_config->getColor( name, &def.r );
-    return def;
-}
-
-} // anonymous namespace
-
 namespace Radar
 {
 
@@ -273,16 +262,16 @@
 {
     assert(player);
 
-    static GFXColor friendColor  = RetrColor("friend", GFXColor(-1, -1, -1, -1));
-    static GFXColor enemyColor   = RetrColor("enemy", GFXColor(-1, -1, -1, -1));
-    static GFXColor neutralColor = RetrColor("neutral", GFXColor(-1, -1, -1, -1));
-    static GFXColor baseColor    = RetrColor("base", GFXColor( -1, -1, -1, -1 ));
-    static GFXColor planetColor  = RetrColor("planet", GFXColor( -1, -1, -1, -1 ));
-    static GFXColor jumpColor    = RetrColor("jump", GFXColor( 0, 1, 1, .8 ));
-    static GFXColor starColor    = RetrColor("star", GFXColor( 1, 1, 1, 1 ));
-    static GFXColor missileColor = RetrColor("missile", GFXColor( .25, 0, .5, 1 ));
-    static GFXColor cargoColor   = RetrColor("cargo", GFXColor( .6, .2, 0, 1 ));
-    static GFXColor noColor      = RetrColor("black_and_white", GFXColor( .5, .5, .5 ));
+    static GFXColor friendColor  = vs_config->getColor("friend", GFXColor(-1, -1, -1, -1));
+    static GFXColor enemyColor   = vs_config->getColor("enemy", GFXColor(-1, -1, -1, -1));
+    static GFXColor neutralColor = vs_config->getColor("neutral", GFXColor(-1, -1, -1, -1));
+    static GFXColor baseColor    = vs_config->getColor("base", GFXColor( -1, -1, -1, -1 ));
+    static GFXColor planetColor  = vs_config->getColor("planet", GFXColor( -1, -1, -1, -1 ));
+    static GFXColor jumpColor    = vs_config->getColor("jump", GFXColor( 0, 1, 1, .8 ));
+    static GFXColor starColor    = vs_config->getColor("star", GFXColor( 1, 1, 1, 1 ));
+    static GFXColor missileColor = vs_config->getColor("missile", GFXColor( .25, 0, .5, 1 ));
+    static GFXColor cargoColor   = vs_config->getColor("cargo", GFXColor( .6, .2, 0, 1 ));
+    static GFXColor noColor      = vs_config->getColor("black_and_white", GFXColor( .5, .5, .5 ));
 
     Track::Type::Value trackType = track.GetType();
     ThreatLevel::Value threatLevel = IdentifyThreat(track);

Modified: trunk/vegastrike/src/gfx/sphere.cpp
===================================================================
--- trunk/vegastrike/src/gfx/sphere.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/sphere.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -12,17 +12,9 @@
 
 using XMLSupport::tostring;
 
-static GFXColor getSphereColor()
-{
-    float    color[4];
-    vs_config->getColor( "planet_ambient", color );
-    GFXColor tmp( color[0], color[1], color[2], color[3] );
-    return tmp;
-}
-
 void SphereMesh::ProcessDrawQueue( int whichpass, int whichdrawqueue, bool zsort, const QVector &sortctr )
 {
-    static GFXColor spherecol( getSphereColor() );
+    static GFXColor spherecol = vs_config->getColor( "planet_ambient" );
     GFXColor tmpcol( 0, 0, 0, 1 );
     GFXGetLightContextAmbient( tmpcol );
     GFXLightContextAmbient( spherecol );

Modified: trunk/vegastrike/src/gfx/vdu.cpp
===================================================================
--- trunk/vegastrike/src/gfx/vdu.cpp	2014-02-26 05:03:54 UTC (rev 13667)
+++ trunk/vegastrike/src/gfx/vdu.cpp	2014-03-01 21:45:37 UTC (rev 13668)
@@ -211,26 +211,18 @@
 
 GFXColor getDamageColor( float armor, bool gradient = false )
 {
-    static bool  init = false;
-    static float damaged[4] = {1, 0, 0, 1};
-    static float half_damaged[4] = {1, 1, 0, 1};
-    static float full[4]    = {1, 1, 1, 1};
-    if (!init) {
-        vs_config->getColor( "default", "hud_target_damaged", damaged, true );
-        vs_config->getColor( "default", "hud_target_half_damaged", half_damaged, true );
-        vs_config->getColor( "default", "hud_target_full", full, true );
-        init = true;
-    }
+    static GFXColor damaged = vs_config->getColor( "default", "hud_target_damaged",
+                                           GFXColor( 1, 0, 0, 1 ) );
+    static GFXColor half_damaged = vs_config->getColor( "default", "hud_target_half_damaged",
+                                           GFXColor( 1, 1, 0, 1 ) );
+    static GFXColor full = vs_config->getColor( "default", "hud_target_full",
+                                           GFXColor( 1, 1, 1, 1 ) );
     if (armor >= .9)
-        return GFXColor( full[0], full[1], full[2], full[3] );
+        return full;
     float avghalf    = armor >= .3 ? 1 : 0;
     if (gradient && armor >= .3)
         avghalf = (armor-.3)/.6;
-    float avgdamaged = 1-avghalf;
-    return GFXColor( half_damaged[0]*avghalf+damaged[0]*avgdamaged,
-                     half_damaged[1]*avghalf+damaged[1]*avgdamaged,
-                     half_damaged[2]*avghalf+damaged[2]*avgdamaged,
-                     half_damaged[3]*avghalf+damaged[3]*avgdamaged );
+    return colLerp( damaged, half_damaged, avghalf );
 }
 
 static void DrawHUDSprite( VDU *thus,
@@ -321,7 +313,7 @@
                 mul.x, mul.y, mul.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point_small, middle_point_small,
                 mll.x, mll.y, mll.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point_small, middle_point,
 
-                mul.x, mul.y, mul.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point_small, middle_point_small, 
+                mul.x, mul.y, mul.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point_small, middle_point_small,
                 mur.x, mur.y, mur.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point, middle_point_small,
                 mlr.x, mlr.y, mlr.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point, middle_point,
                 mll.x, mll.y, mll.z, c[2].r, c[2].g, c[2].b, c[2].a, middle_point_small, middle_point,
@@ -1309,7 +1301,7 @@
     ecmstatus[0] = '\0';
     static bool print_ecm = XMLSupport::parse_bool( vs_config->getVariable( "graphics", "print_ecm_status", "true" ) );
     if (print_ecm) {
-        if (UnitUtil::getECM(parent) > 0) { 
+        if (UnitUtil::getECM(parent) > 0) {
             GFXColor4f( 0, 1, 0, .5 );
             strcpy( ecmstatus, "ECM Active" );
             static float s = 0;
@@ -1335,19 +1327,16 @@
     //char hullval[128];
     //sprintf (hullval,"%.3f",parent->GetHull());
     //string retval (fullname+"\nHull: "+hullval+"\n");
-    static float cfullpower[4] = {1, 1, 1, 1};
-    static float cdamaged[4]   = {1, 0, 0, 1};
-    static float chdamaged[4]  = {1, 1, 0, 1};
-    static float cdestroyed[4] = {.2, .2, .2, 1};
-    static bool  init = false;
-    if (!init) {
-        init = true;
-        vs_config->getColor( "default", "hud_repair_repaired", cfullpower, true );
-        vs_config->getColor( "default", "hud_repair_half_damaged", chdamaged, true );
-        vs_config->getColor( "default", "hud_repair_damaged", cdamaged, true );
-        vs_config->getColor( "default", "hud_repair_destroyed", cdestroyed, true );
-    }
-    colorstring   fpstring = colToString( GFXColor( cfullpower[0], cfullpower[1], cfullpower[2], cfullpower[3] ) );
+    static GFXColor cfullpower = vs_config->getColor( "default", "hud_repair_repaired",
+                                                    GFXColor( 1,  1,  1,  1 ) );
+    static GFXColor chdamaged  = vs_config->getColor( "default", "hud_repair_half_damaged",
+                                                    GFXColor( 1,  1,  0,  1 ) );
+    static GFXColor cdamaged   = vs_config->getColor( "default", "hud_repair_damaged",
+                                                    GFXColor( 1,  0,  0,  1 ) );
+    static GFXColor cdestroyed = vs_config->getColor( "default", "hud_repair_destroyed",
+                                                    GFXColor( .2, .2, .2, 1 ) );
+
+    colorstring   fpstring = colToString( cfullpower);
     static string damage_report_heading =
         XMLSupport::escaped_string( vs_config->getVariable( "graphics", "hud", "damage_report_heading",
                                                             "#00ff00DAMAGE REPORT\n\n" ) );
@@ -1364,12 +1353,9 @@
 
 #define REPORTITEM(percent_working, max_functionality, print_percent_working, component_string) \
     do { \
-        GFXColor final_color( (chdamaged[0]*percent_working)+( cdamaged[0]*(1.0-percent_working) ), \
-                              (chdamaged[1]*percent_working)+( cdamaged[1]*(1.0-percent_working) ), \
-                              (chdamaged[2]*percent_working)+( cdamaged[2]*(1.0-percent_working) ), \
-                              (chdamaged[3]*percent_working)+( cdamaged[3]*(1.0-percent_working) ) ); \
+        GFXColor final_color = colLerp( cdamaged, chdamaged, percent_working ); \
         if (percent_working == 0.0) \
-            final_color = GFXColor( cdestroyed[0], cdestroyed[1], cdestroyed[2], cdestroyed[3] ); /*dead = grey*/ \
+            final_color = cdestroyed; /*dead = grey*/ \
         std::string trailer; \
         if (percent_working < max_functionality) \
             retval += colToString( final_color ).str; \
@@ -1381,7 +1367,7 @@
             retval += string( " (" )+tostring( int(percent_working*100) )+string( "%)" ); \
         retval += trailer+std::string( "\n" ); \
     } while(0)
-    
+
 #define REPORTINTEGRATED(which, which_key, which_name_default) \
     do { \
         static string name = vs_config->getVariable( "graphics", "hud", which_key, which_name_default ); \
@@ -1404,16 +1390,16 @@
         } \
     } while(0)
 
-        
+
     for (unsigned int i = 0; i < numCargo; i++) {
         percent_working = 0.88;         //cargo.damage
         Cargo &the_cargo = parent->GetCargo( i );
         bool   damaged   = the_cargo.GetCategory().find( DamagedCategory ) == 0;
         if ( damaged
-            || (   the_cargo.GetCategory().find( "upgrades/" ) == 0 
+            || (   the_cargo.GetCategory().find( "upgrades/" ) == 0
                 && the_cargo.installed
                 && the_cargo.GetContent().find( "mult_" ) != 0
-                && the_cargo.GetContent().find( "add_" ) != 0 
+                && the_cargo.GetContent().find( "add_" ) != 0
                 && non_repair_screen_cargo.find( the_cargo.GetContent() )
                 == std::string::npos) ) {
             percent_working = UnitUtil::PercentOperational( parent, the_cargo.content, the_cargo.category, false );
@@ -1427,7 +1413,7 @@
         REPORTINTEGRATED(fireControl, "damage.names.fire_control", "Fire Control");
         REPORTINTEGRATED(SPECDrive, "damage.names.spec_drive", "SPEC Drive");
         REPORTINTEGRATED(Comm, "damage.names.comm", "Comm");
-        
+
         // Integrated system with boolean damage flags
         REPORTINTEGRATEDFLAG(Unit::LIMITS_DAMAGED, "damage.names.limits_name", "Thrusters");
         REPORTINTEGRATEDFLAG(Unit::SHIELD_DAMAGED, "damage.names.shield_name", ""); // default invisible, is an upgrade
@@ -1435,7 +1421,7 @@
         REPORTINTEGRATEDFLAG(Unit::JUMP_DAMAGED, "damage.names.jump_name", ""); // default invisible, is an upgrade
         REPORTINTEGRATEDFLAG(Unit::CLOAK_DAMAGED, "damage.names.cloak_name", ""); // default invisible, is an upgrade
     }
-        
+
     retval += ecmstatus;
     static float bac...
 
[truncated message content]

[Vegastrike-cvs] SF.net SVN: vegastrike:[13667] trunk/data

From: <kla...@us...> - 2014-02-26 05:04:03

Revision: 13667
          http://sourceforge.net/p/vegastrike/code/13667
Author:   klaussfreire
Date:     2014-02-26 05:03:54 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
Update python builtins archives

Modified Paths:
--------------
    trunk/data/py27_modules.7z
    trunk/data/py3_modules.7z

Modified: trunk/data/py27_modules.7z
===================================================================
(Binary files differ)

Modified: trunk/data/py3_modules.7z
===================================================================
(Binary files differ)

[Vegastrike-cvs] SF.net SVN: vegastrike:[13665] trunk/data/modules

From: <kla...@us...> - 2013-11-29 05:07:50

Revision: 13665
          http://sourceforge.net/p/vegastrike/code/13665
Author:   klaussfreire
Date:     2013-11-29 05:07:46 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Turn debug.warn into traceback-less, leave error with tracebacks, use
debug.warn in ship_uprgades instead of bare prints.

Modified Paths:
--------------
    trunk/data/modules/debug.py
    trunk/data/modules/ship_upgrades.py

Modified: trunk/data/modules/debug.py
===================================================================
--- trunk/data/modules/debug.py	2013-11-28 05:05:48 UTC (rev 13664)
+++ trunk/data/modules/debug.py	2013-11-29 05:07:46 UTC (rev 13665)
@@ -38,7 +38,7 @@
 
 fatal = _fatal # Really bad error... Kill the script.  Same as a call to raise()
 
-warn = _warn   # Anything that shouldn't happen, but shouldn't cause a crash either.
+warn = _withlineno   # Anything that shouldn't happen, but shouldn't cause a crash either.
 error = _warn  # Different name for the same thing.
 
 # Less important messages that happen a lot.
@@ -48,3 +48,6 @@
 # For release, we can disable unimportant messages:
 info = _devnull
 debug = _devnull
+#info = _withlineno
+#debug = _withlineno
+

Modified: trunk/data/modules/ship_upgrades.py
===================================================================
--- trunk/data/modules/ship_upgrades.py	2013-11-28 05:05:48 UTC (rev 13664)
+++ trunk/data/modules/ship_upgrades.py	2013-11-29 05:07:46 UTC (rev 13665)
@@ -168,10 +168,10 @@
     list=VS.getRandCargo(1,cat)#try to get a cargo from said category
     if (list.GetQuantity()<=0):#if no such cargo exists in this cateogry
         if (parentcat!=None):
-            print("Python Upgrade Error: finding %s using %s instead" % (cat,parentcat))
+            debug.warn("Python Upgrade Error: finding %s using %s instead", cat, parentcat)
             list=VS.getRandCargo(1,parentcat)#get it from the parent category
         if (list.GetQuantity()<=0):#otherwise get cargo from upgrades category
-            print("Python UpgradeError: category %s -- getting random instead" % (cat))
+            debug.warn("Python Upgrade Error: category %s -- getting random instead", cat)
             list=VS.getRandCargo(1,"upgrades")#this always succeeds
     return list

[Vegastrike-cvs] SF.net SVN: vegastrike:[13664] trunk/vegastrike/src/cmd/csv.cpp

From: <kla...@us...> - 2013-11-28 05:05:52

Revision: 13664
          http://sourceforge.net/p/vegastrike/code/13664
Author:   klaussfreire
Date:     2013-11-28 05:05:48 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
Fix strip_white bug that broke CSV merging

Modified Paths:
--------------
    trunk/vegastrike/src/cmd/csv.cpp

Modified: trunk/vegastrike/src/cmd/csv.cpp
===================================================================
--- trunk/vegastrike/src/cmd/csv.cpp	2013-11-27 03:41:50 UTC (rev 13663)
+++ trunk/vegastrike/src/cmd/csv.cpp	2013-11-28 05:05:48 UTC (rev 13664)
@@ -158,9 +158,9 @@
     
     string::size_type end = s.find_last_not_of(" \t\r\n");
     if (end == string::npos)
-        end = s.length();
-    
-    return s.substr(start, end-start);
+        return s.substr(start);
+    else
+        return s.substr(start, end+1-start);
 }
 
 void 
@@ -184,6 +184,7 @@
             std::cerr << "WTF column " << it->second << "?" << std::endl;
             abort();
         }
+        VSFileSystem::vs_dprintf(2, "  %s (%d) -> %d\n", it->first.c_str(), it->second, local->second);
         colmap[it->second] = local->second;
     }
     
@@ -192,7 +193,7 @@
         std::vector<std::string> orig_table;
         orig_table.swap(table);
         std::vector<std::string>::const_iterator orig_it = orig_table.begin();
-        std::string empty;
+        const std::string empty;
         
         VSFileSystem::vs_dprintf(1, "Reshaping %d columns into %d\n", orig_cols, columns.size());
         table.reserve(rows.size() * key.size());

[Vegastrike-cvs] SF.net SVN: vegastrike:[13663] trunk/vegastrike/src/universe_util_generic. cpp

From: <kla...@us...> - 2013-11-27 03:41:53

Revision: 13663
          http://sourceforge.net/p/vegastrike/code/13663
Author:   klaussfreire
Date:     2013-11-27 03:41:50 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
Debug message when a MPL entry is missing

Modified Paths:
--------------
    trunk/vegastrike/src/universe_util_generic.cpp

Modified: trunk/vegastrike/src/universe_util_generic.cpp
===================================================================
--- trunk/vegastrike/src/universe_util_generic.cpp	2013-11-26 00:03:05 UTC (rev 13662)
+++ trunk/vegastrike/src/universe_util_generic.cpp	2013-11-27 03:41:50 UTC (rev 13663)
@@ -189,6 +189,8 @@
         if (Begin < End) {
             unsigned int i = Begin+( rand()%(End-Begin) );
             ret = &mpl->GetCargo( i );
+        } else {
+            VSFileSystem::vs_dprintf(1, "Cargo category %s not found\n", category.c_str());
         }
     } else if ( mpl->numCargo() ) {
         for (unsigned int i = 0; i < 500; ++i) {

[Vegastrike-cvs] SF.net SVN: vegastrike:[13662] trunk/data/bases

From: <kla...@us...> - 2013-11-26 00:03:10

Revision: 13662
          http://sourceforge.net/p/vegastrike/code/13662
Author:   klaussfreire
Date:     2013-11-26 00:03:05 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Remove bogus executable bits from base scripts

Property Changed:
----------------
    trunk/data/bases/Commerce_Center__rlaan.py
    trunk/data/bases/Fighter_Barracks__rlaan.py
    trunk/data/bases/Lava.py
    trunk/data/bases/Medical__rlaan.py
    trunk/data/bases/MiningBase__rlaan.py
    trunk/data/bases/Shaper_Bio_Adaptation.py
    trunk/data/bases/Starfortress__rlaan.py
    trunk/data/bases/bar.py
    trunk/data/bases/bartender_frigidmud.py
    trunk/data/bases/forest.py
    trunk/data/bases/frigid_mud.py
    trunk/data/bases/rock.py

Index: trunk/data/bases/Commerce_Center__rlaan.py
===================================================================
--- trunk/data/bases/Commerce_Center__rlaan.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Commerce_Center__rlaan.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Commerce_Center__rlaan.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/Fighter_Barracks__rlaan.py
===================================================================
--- trunk/data/bases/Fighter_Barracks__rlaan.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Fighter_Barracks__rlaan.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Fighter_Barracks__rlaan.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/Lava.py
===================================================================
--- trunk/data/bases/Lava.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Lava.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Lava.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/Medical__rlaan.py
===================================================================
--- trunk/data/bases/Medical__rlaan.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Medical__rlaan.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Medical__rlaan.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/MiningBase__rlaan.py
===================================================================
--- trunk/data/bases/MiningBase__rlaan.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/MiningBase__rlaan.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/MiningBase__rlaan.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/Shaper_Bio_Adaptation.py
===================================================================
--- trunk/data/bases/Shaper_Bio_Adaptation.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Shaper_Bio_Adaptation.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Shaper_Bio_Adaptation.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/Starfortress__rlaan.py
===================================================================
--- trunk/data/bases/Starfortress__rlaan.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/Starfortress__rlaan.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/Starfortress__rlaan.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/bar.py
===================================================================
--- trunk/data/bases/bar.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/bar.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/bar.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/bartender_frigidmud.py
===================================================================
--- trunk/data/bases/bartender_frigidmud.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/bartender_frigidmud.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/bartender_frigidmud.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/forest.py
===================================================================
--- trunk/data/bases/forest.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/forest.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/forest.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/frigid_mud.py
===================================================================
--- trunk/data/bases/frigid_mud.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/frigid_mud.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/frigid_mud.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/data/bases/rock.py
===================================================================
--- trunk/data/bases/rock.py	2013-11-21 15:47:46 UTC (rev 13661)
+++ trunk/data/bases/rock.py	2013-11-26 00:03:05 UTC (rev 13662)

Property changes on: trunk/data/bases/rock.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property

[Vegastrike-cvs] SF.net SVN: vegastrike:[13661] trunk/data/techniques/0_fixed_gl/mars. technique

From: <kla...@us...> - 2013-11-21 15:47:48

Revision: 13661
          http://sourceforge.net/p/vegastrike/code/13661
Author:   klaussfreire
Date:     2013-11-21 15:47:46 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Add missing mars.technique for noshaders

Added Paths:
-----------
    trunk/data/techniques/0_fixed_gl/mars.technique

Copied: trunk/data/techniques/0_fixed_gl/mars.technique (from rev 13660, trunk/data/techniques/0_fixed_gl/earth.technique)
===================================================================
--- trunk/data/techniques/0_fixed_gl/mars.technique	                        (rev 0)
+++ trunk/data/techniques/0_fixed_gl/mars.technique	2013-11-21 15:47:46 UTC (rev 13661)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<technique>
+    <!-- Fixed-function technique.
+         Uses the built-in fixed function technique set (adaptive)
+         to render enabled effects with minimum passes.
+    -->
+
+    <!-- sequence 15 to go after Z-write prepasses (that's 10) -->
+    <pass type="fixed" sequence="15">
+        <texture_unit src="decal:0" target="0" name="diffuseMap"/>
+        <texture_unit src="decal:1" target="1" name="specMap"/>
+    </pass>
+
+    <pass type="fixed" sequence="16" blend="alpha_blend" polygon_offset_units="-1">
+        <texture_unit src="decal:2" target="0" name="cloudMap"/>
+    </pass>
+</technique>

[Vegastrike-cvs] SF.net SVN: vegastrike:[13660] trunk/win32/

From: <phe...@us...> - 2013-10-23 22:58:30

Revision: 13660
          http://sourceforge.net/p/vegastrike/code/13660
Author:   pheonixstorm
Date:     2013-10-23 22:58:27 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Updated external link for data in win32

Property Changed:
----------------
    trunk/win32/

Index: trunk/win32
===================================================================
--- trunk/win32	2013-09-06 15:57:53 UTC (rev 13659)
+++ trunk/win32	2013-10-23 22:58:27 UTC (rev 13660)

Property changes on: trunk/win32
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-data  https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/data
+http://svn.code.sf.net/p/vegastrike/code/trunk/data data

[Vegastrike-cvs] SF.net SVN: vegastrike:[13659] trunk/data

From: <phe...@us...> - 2013-09-06 15:57:58

Revision: 13659
          http://sourceforge.net/p/vegastrike/code/13659
Author:   pheonixstorm
Date:     2013-09-06 15:57:53 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Adding python 2.7 modules to get the win32 binary working again.

Added Paths:
-----------
    trunk/data/py27_modules.7z
    trunk/data/py3_modules.7z
    trunk/data/windows readme.txt

Added: trunk/data/py27_modules.7z
===================================================================
(Binary files differ)

Index: trunk/data/py27_modules.7z
===================================================================
--- trunk/data/py27_modules.7z	2013-09-04 19:52:43 UTC (rev 13658)
+++ trunk/data/py27_modules.7z	2013-09-06 15:57:53 UTC (rev 13659)

Property changes on: trunk/data/py27_modules.7z
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/data/py3_modules.7z
===================================================================
(Binary files differ)

Index: trunk/data/py3_modules.7z
===================================================================
--- trunk/data/py3_modules.7z	2013-09-04 19:52:43 UTC (rev 13658)
+++ trunk/data/py3_modules.7z	2013-09-06 15:57:53 UTC (rev 13659)

Property changes on: trunk/data/py3_modules.7z
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/data/windows readme.txt
===================================================================
--- trunk/data/windows readme.txt	                        (rev 0)
+++ trunk/data/windows readme.txt	2013-09-06 15:57:53 UTC (rev 13659)
@@ -0,0 +1,3 @@
+When downloading from svn the data folder will contain two files: py27_modules and py3_modules. Currently data uses the py3 modules so you will need to upzip the py27 file to get the game to work. You should be able to do this by right clicking on the file and telling it to extract here. This should put the correct files into \modules\builtin
+
+Hopefully in the next month or so I will switch the windows binary over to use py3 and this will no longer be necessary.
\ No newline at end of file

[Vegastrike-cvs] SF.net SVN: vegastrike:[13658] trunk/vega-vc10/vegastrike/vegastrike. vcxproj

From: <phe...@us...> - 2013-09-04 19:52:45

Revision: 13658
          http://sourceforge.net/p/vegastrike/code/13658
Author:   pheonixstorm
Date:     2013-09-04 19:52:43 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Updated boost info for header includes. Pointed to wrong boost directory

Modified Paths:
--------------
    trunk/vega-vc10/vegastrike/vegastrike.vcxproj

Modified: trunk/vega-vc10/vegastrike/vegastrike.vcxproj
===================================================================
--- trunk/vega-vc10/vegastrike/vegastrike.vcxproj	2013-09-04 19:36:42 UTC (rev 13657)
+++ trunk/vega-vc10/vegastrike/vegastrike.vcxproj	2013-09-04 19:52:43 UTC (rev 13658)
@@ -123,7 +123,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../;../include;../include/python;../jpeg-6b;../../vegastrike/src;../../vegastrike/src/cmd;../../vegastrike/src/cmd/collide2;../../vegastrike/src/python;../../vegastrike/boost/1_53;../../vegastrike/boost/1_535/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../;../include;../include/python;../jpeg-6b;../../vegastrike/src;../../vegastrike/src/cmd;../../vegastrike/src/cmd/collide2;../../vegastrike/src/python;../../vegastrike/boost/1_53;../../vegastrike/boost/1_53/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;HAVE_AL;HAVE_SDL;YY_ALWAYS_INTERACTIVE;SDL_WINDOWING;HAVE_OGG;HAVE_BOOST;HAVE_PYTHON;JPEG_SUPPORT;BOOST_PYTHON_NO_PY_SIGNATURES;BOOST_PYTHON_STATIC_LIB;BOOST_ALL_NO_LIB;NV_CUBE_MAP;OPCODE_COLLIDER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

12 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 2 3 4 5 .. 329 > >> (Page 3 of 329)