From: ana <ana@opencascade.com>
Date: Thu, 3 May 2012 14:26:08 +0000 (+0000)
Subject: "0021179: EDF 1654 SMESH GEOM: better look'n'feel" issue.
X-Git-Tag: V6_5_0b1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=48ea3881217b87071d7f60238acd4610ace83cbb;p=modules%2Fgeom.git

"0021179: EDF 1654 SMESH GEOM: better look'n'feel" issue.
Material Properties.
---

diff --git a/src/Material/resources/SalomeMaterial.xml b/src/Material/resources/SalomeMaterial.xml
index 579aa471c..d1e26882c 100644
--- a/src/Material/resources/SalomeMaterial.xml
+++ b/src/Material/resources/SalomeMaterial.xml
@@ -22,184 +22,197 @@
 
 -->
 <document>
-  <section name="Plastic" >
+  <section name="[common]" >
+    <parameter name="physical"                value="false" />
+    <parameter name="shininess"               value="0.039" />
+    <parameter name="ambient"                 value="true" />
+    <parameter name="ambient-coefficient"     value="0.3" />
     <parameter name="ambient-color"           value="#333333" />
-    <parameter name="ambient-coefficient"     value="0.5" />
+    <parameter name="diffuse"                 value="true" />
+    <parameter name="diffuse-coefficient"     value="0.65" />
     <parameter name="diffuse-color"           value="#000000" />
-    <parameter name="diffuse-coefficient"     value="0.24" />
+    <parameter name="specular"                value="true" />
+    <parameter name="specular-coefficient"    value="0.0" />
     <parameter name="specular-color"          value="#ffffff" />
-    <parameter name="specular-coefficient"    value="0.06" />
+    <parameter name="emissive"                value="false" />
+    <parameter name="emissive-coefficient"    value="0.0" />
+    <parameter name="emissive-color"          value="#000000" />
+    <parameter name="transparency"            value="0.0" />
+  </section>
+  <section name="Plastic" >
     <parameter name="shininess"               value="0.0078125" />
-    <parameter name="physical"                value="false" />
+    <parameter name="ambient-coefficient"     value="0.5" />
+    <parameter name="diffuse-coefficient"     value="0.24" />
+    <parameter name="specular-coefficient"    value="0.06" />
   </section>
   <section name="Shiny plastic" >
-    <parameter name="ambient-color"           value="#333333" />
+    <parameter name="shininess"               value="1.0" />
     <parameter name="ambient-coefficient"     value="0.44" />
-    <parameter name="diffuse-color"           value="#000000" />
     <parameter name="diffuse-coefficient"     value="0.5" />
-    <parameter name="specular-color"          value="#ffffff" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="1.0" />
-    <parameter name="physical"                value="false" />
   </section>
   <section name="Satin" >
-    <parameter name="ambient-color"           value="#333333" />
+    <parameter name="shininess"               value="0.09375" />
     <parameter name="ambient-coefficient"     value="0.33" />
-    <parameter name="diffuse-color"           value="#000000" />
     <parameter name="diffuse-coefficient"     value="0.4" />
-    <parameter name="specular-color"          value="#ffffff" />
     <parameter name="specular-coefficient"    value="0.44" />
-    <parameter name="shininess"               value="0.09375" />
-    <parameter name="physical"                value="false" />
   </section>
-  <section name="Metal" >
-    <parameter name="diffuse-color"           value="#000000" />
+  <section name="Neon" >
+    <parameter name="shininess"               value="0.05" />
+    <parameter name="ambient-coefficient"     value="1.0" />
+    <parameter name="diffuse-coefficient"     value="1.0" />
+    <parameter name="specular-coefficient"    value="0.62" />
+    <parameter name="emissive-coefficient"    value="1.0" />
+    <parameter name="ambient"                 value="false" />
+    <parameter name="emissive"                value="true" />
+  </section>
+  <section name="Metalized" >
+    <parameter name="shininess"               value="0.13" />
+    <parameter name="ambient"                 value="false" />
+    <parameter name="ambient-coefficient"     value="0.9" />
     <parameter name="diffuse-coefficient"     value="0.47" />
-    <parameter name="specular-color"          value="#ffffff" />
     <parameter name="specular-coefficient"    value="0.45" />
-    <parameter name="shininess"               value="0.13" />
-    <parameter name="physical"                value="false" />
   </section>
   <section name="Brass">
-    <parameter name="ambient-color"           value="#543907" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.21794844" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#c7911d" />
+    <parameter name="ambient-color"           value="#543907" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#fdf0ce" />
+    <parameter name="diffuse-color"           value="#c7911d" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.21794844" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#fdf0ce" />
   </section>
   <section name="Bronze">
-    <parameter name="ambient-color"           value="#36200d" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.2" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#b66d2e" />
+    <parameter name="ambient-color"           value="#36200d" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#64452a" />
+    <parameter name="diffuse-color"           value="#b66d2e" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.2" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#64452a" />
   </section>
   <section name="Copper" >
-    <parameter name="ambient-color"           value="#54423a" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.93" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#801c00" />
+    <parameter name="ambient-color"           value="#54423a" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#f3ba00" />
+    <parameter name="diffuse-color"           value="#801c00" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.93" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#f3ba00" />
   </section>
   <section name="Gold" >
-    <parameter name="ambient-color"           value="#ffc451" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.0625" />
     <parameter name="ambient-coefficient"     value="0.3" />
-    <parameter name="diffuse-color"           value="#ffb000" />
+    <parameter name="ambient-color"           value="#ffc451" />
     <parameter name="diffuse-coefficient"     value="0.4" />
-    <parameter name="specular-color"          value="#fffac7" />
+    <parameter name="diffuse-color"           value="#ffb000" />
     <parameter name="specular-coefficient"    value="0.9" />
-    <parameter name="shininess"               value="0.0625" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#fffac7" />
   </section>
   <section name="Pewter" >
-    <parameter name="ambient-color"           value="#1b0f1d" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.076923047" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#6d788a" />
+    <parameter name="ambient-color"           value="#1b0f1d" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#555585" />
+    <parameter name="diffuse-color"           value="#6d788a" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.076923047" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#555585" />
   </section>
   <section name="Plaster" >
-    <parameter name="ambient-color"           value="#313131" />
+    <parameter name="shininess"               value="0.0078125" />
     <parameter name="ambient-coefficient"     value="0.26" />
-    <parameter name="diffuse-color"           value="#818181" />
+    <parameter name="ambient-color"           value="#313131" />
     <parameter name="diffuse-coefficient"     value="0.23" />
-    <parameter name="specular-color"          value="#828282" />
+    <parameter name="diffuse-color"           value="#818181" />
     <parameter name="specular-coefficient"    value="0.06" />
-    <parameter name="shininess"               value="0.0078125" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#828282" />
   </section>
   <section name="Silver" >
-    <parameter name="ambient-color"           value="#313131" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.2" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#818181" />
+    <parameter name="ambient-color"           value="#313131" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#828282" />
+    <parameter name="diffuse-color"           value="#818181" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.2" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#828282" />
   </section>
   <section name="Steel" >
-    <parameter name="ambient-color"           value="#333333" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.06" />
     <parameter name="ambient-coefficient"     value="0.01" />
-    <parameter name="diffuse-color"           value="#000000" />
     <parameter name="diffuse-coefficient"     value="0.03" />
-    <parameter name="specular-color"          value="#ffffff" />
     <parameter name="specular-coefficient"    value="0.98" />
-    <parameter name="shininess"               value="0.06" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#ffffff" />
   </section>
   <section name="Stone" >
-    <parameter name="ambient-color"           value="#ffcc9e" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.17" />
     <parameter name="ambient-coefficient"     value="0.19" />
-    <parameter name="diffuse-color"           value="#ffcc9e" />
+    <parameter name="ambient-color"           value="#ffcc9e" />
     <parameter name="diffuse-coefficient"     value="0.75" />
-    <parameter name="specular-color"          value="#faff99" />
+    <parameter name="diffuse-color"           value="#ffcc9e" />
     <parameter name="specular-coefficient"    value="0.08" />
-    <parameter name="shininess"               value="0.17" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#faff99" />
   </section>
   <section name="Chrome" >
-    <parameter name="ambient-color"           value="#595959" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.1" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#666666" />
+    <parameter name="ambient-color"           value="#595959" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#f9f9f9" />
+    <parameter name="diffuse-color"           value="#666666" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.1" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#f9f9f9" />
   </section>
-  <section name="Neon" >
-    <parameter name="ambient-color"           value="#ffffff" />
+  <section name="Neon (physical)" >
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.05" />
+    <parameter name="ambient"                 value="false" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#ffffff" />
+    <parameter name="ambient-color"           value="#ffffff" />
+    <parameter name="diffuse"                 value="false" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#ffffff" />
+    <parameter name="diffuse-color"           value="#ffffff" />
     <parameter name="specular-coefficient"    value="0.62" />
-    <parameter name="emission-color"          value="#00ff75" />
-    <parameter name="emission-coefficient"    value="0.9" />
-    <parameter name="shininess"               value="0.05" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#ffffff" />
+    <parameter name="emissive"                value="true" />
+    <parameter name="emissive-coefficient"    value="0.9" />
+    <parameter name="emissive-color"          value="#00ff75" />
   </section>
   <section name="Aluminium" >
-    <parameter name="ambient-color"           value="#4c4c4c" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.09" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#4c4c4c" />
+    <parameter name="ambient-color"           value="#4c4c4c" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#b3b3cc" />
+    <parameter name="diffuse-color"           value="#4c4c4c" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.09" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#b3b3cc" />
   </section>
   <section name="Obsidian" >
-    <parameter name="ambient-color"           value="#0d0c10" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.3" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#2e2b39" />
+    <parameter name="ambient-color"           value="#0d0c10" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#555458" />
+    <parameter name="diffuse-color"           value="#2e2b39" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.3" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#555458" />
   </section>
   <section name="Jade" >
-    <parameter name="ambient-color"           value="#223828" />
+    <parameter name="physical"                value="true" />
+    <parameter name="shininess"               value="0.1" />
     <parameter name="ambient-coefficient"     value="1.0" />
-    <parameter name="diffuse-color"           value="#8ae3a1" />
+    <parameter name="ambient-color"           value="#223828" />
     <parameter name="diffuse-coefficient"     value="1.0" />
-    <parameter name="specular-color"          value="#505050" />
+    <parameter name="diffuse-color"           value="#8ae3a1" />
     <parameter name="specular-coefficient"    value="1.0" />
-    <parameter name="shininess"               value="0.1" />
-    <parameter name="physical"                value="true" />
+    <parameter name="specular-color"          value="#505050" />
   </section>  
 </document>