Merge pull request aframevr#183 from ngokevin/receivelight2

rename receiveLight to shader: flat
YoxY · Nov 19, 2015 · a74d05f · a74d05f
2 parents 9c4bea7 + 29d492a
commit a74d05f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/core/templates/vr-image.html b/core/templates/vr-image.html
@@ -6,7 +6,7 @@
   <vr-object geometry="primitive: plane;
                        width: ${width};
                        height: ${height}"
-             material="receiveLight: false; 
+             material="shader: flat; 
              		   src: url(${src});
              		   transparent: true">
   </vr-object>

diff --git a/core/templates/vr-sky/index.html b/core/templates/vr-sky/index.html
@@ -8,7 +8,7 @@
                        radius: ${radius};
                        segmentsWidth: ${segments-width};
                        segmentsHeight: ${segments-height}"
-             material="receiveLight: false; src: url(${src})"
+             material="shader: flat; src: url(${src})"
              scale="-1 1 1">
   </vr-object>
 </template>
diff --git a/core/templates/vr-video.html b/core/templates/vr-video.html
@@ -18,6 +18,6 @@
   <vr-object geometry="primitive: plane;
                        height: ${height};
                        width: ${width};"
-             material="receiveLight: false; src: #video;">
+             material="shader: flat; src: #video;">
   </vr-object>
 </template>
diff --git a/core/templates/vr-videosphere.html b/core/templates/vr-videosphere.html
@@ -20,7 +20,7 @@
                        radius: ${radius};
                        segmentsWidth: ${segments-width};
                        segmentsHeight: ${segments-height};"
-             material="receiveLight: false; src: #video;"
+             material="shader: flat; src: #video;"
              scale="-1 1 1">
   </vr-object>
 </template>
diff --git a/examples/lights/index.html b/examples/lights/index.html
@@ -10,7 +10,7 @@
 <body>
   <vr-assets>
     <vr-mixin id="light" geometry="primitive: sphere; radius: 1.5"
-              material="color: #FFF; receiveLight: false"
+              material="color: #FFF; shader: flat"
               light="color: #DDDDFF; distance: 120; intensity: 2; type: point">
     </vr-mixin>
     <vr-mixin id="torus-knot" geometry="primitive: torusKnot"
@@ -23,7 +23,7 @@
 
     <!-- Skysphere. -->
     <vr-object geometry="primitive: sphere; radius: 300"
-               material="color: #111; receiveLight: false"
+               material="color: #111; shader: flat"
                scale="-1 -1 -1"></vr-object>
 
     <!-- Lights. -->

diff --git a/examples/panoexplorer/templates/index.html b/examples/panoexplorer/templates/index.html
@@ -5,8 +5,8 @@
 </vr-assets>
 
 <template is="vr-template" element="vr-pano-link" src="" holderSrc="">
-  <vr-object mixin="link" material="receiveLight: false; src: url(${src})">
-    <vr-click target="#holder" material="receiveLight: false; src: url(${holderSrc})"></vr-click>
+  <vr-object mixin="link" material="shader: flat; src: url(${src})">
+    <vr-click target="#holder" material="shader: flat; src: url(${holderSrc})"></vr-click>
     <vr-click state="selected"></vr-click>
   </vr-object>
 </template>
@@ -46,7 +46,7 @@
 </template>
 
 <template is="vr-template" element="vr-pano-holder" size="10">
-  <vr-object id="holder" scale="1 1 -1" geometry="primitive: sphere; radius: ${size}" material="receiveLight: false; src: url(${src})"></vr-object>
+  <vr-object id="holder" scale="1 1 -1" geometry="primitive: sphere; radius: ${size}" material="shader: flat; src: url(${src})"></vr-object>
 </template>
 
 <template is="vr-template" element="vr-pano-nav">