[Csp-commits] svn:csp r1445 - in trunk/CSP/CSPSim: . Data/Models/Mirage2000

[<sv...@ww...>]

Author: lologramme
Date: 2005-01-15 09:07:58 -0800 (Sat, 15 Jan 2005)
New Revision: 1445

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
Log:
"Color diffuse" problem on M2k resolved

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1445

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-01-13 08:13:41 UTC (rev 1444)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-01-15 17:07:58 UTC (rev 1445)
@@ -1,23 +1,29 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-01-15: lologramme
+ * Mirage 2000: Textures "color diffuse" problem resolved
+
 2005-01-12: delta
  * Reformated Animation's classes. Added basic time based animations.
-   Added animation's sequences in Data/XML/vehicules/aircraft/m2/gear.xml 
+   Added animation's sequences in Data/XML/vehicules/aircraft/m2/gear.xml
    and model.xml. Added an animation sequence attribute to AnimationGear class
-   in LandingGear.h. The 3d model has been updated to provide necessary node's 
+   in LandingGear.h. The 3d model has been updated to provide necessary node's
    hooks.
    This code is not tested under GNU/Linux.
- 
- * Network's hooks  haven't been updated, so animation's sequences won't work on 
+
+ * Network's hooks  haven't been updated, so animation's sequences won't work on
    a remote object.
-   
+
  ==> ALL USERS: RebuildData.py
- 
+
+2005-01-08: lologramme
+ * Add Trees
+
 2005-01-07: lologramme
  * add Taxi Signalisation
  * Add hangars
- 
+
 2005-01-03: delta
  * Snapshot is now saved as jpeg.
 

Modified: trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg
===================================================================
--- trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-01-13 08:13:41 UTC (rev 1444)
+++ trunk/CSP/CSPSim/Data/Models/Mirage2000/model.osg	2005-01-15 17:07:58 UTC (rev 1445)
@@ -52,9 +52,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -14444,9 +14444,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -16479,9 +16479,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.00900901 0.00900901 0.00900901 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -19954,9 +19954,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -20640,9 +20640,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -41990,7 +41990,7 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.588 0.588 0.588 1
+            ambientColor 0.0640517 0.158168 0.181698 1
             diffuseColor 1 1 1 1
             specularColor 0.0225225 0.0225225 0.0225225 1
             emissionColor 0 0 0 1
@@ -76059,7 +76059,7 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.588 0.588 0.588 1
+            ambientColor 0.0640517 0.158168 0.181698 1
             diffuseColor 1 1 1 1
             specularColor 0.0225225 0.0225225 0.0225225 1
             emissionColor 0 0 0 1
@@ -83387,11 +83387,11 @@
           Material {
             DataVariance STATIC
             ColorMode OFF
-            ambientColor 0.205227 0.142482 0.253592 1
+            ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0045045 0.0045045 0.0045045 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 32
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON
@@ -105985,7 +105985,7 @@
           DataVariance STATIC
           rendering_hint DEFAULT_BIN
           renderBinMode INHERIT
-          GL_CULL_FACE OVERRIDE|OFF
+          GL_CULL_FACE ON
           GL_LIGHTING ON
           0xba1 ON
           Material {
@@ -105993,9 +105993,9 @@
             ColorMode OFF
             ambientColor 0.588 0.588 0.588 1
             diffuseColor 1 1 1 1
-            specularColor 0.0225225 0.0225225 0.0225225 1
+            specularColor 0 0 0 1
             emissionColor 0 0 0 1
-            shininess 12.8
+            shininess 0
           }
           textureUnit 0 {
             GL_TEXTURE_2D ON