Browse Source

Merge pull request #1721 from nockawa/primIntersection

Fixing WireFrame2D shader name
Loïc Baumann 8 years ago
parent
commit
227c646938

+ 2 - 2
canvas2D/src/Engine/babylon.wireFrame2d.ts

@@ -381,11 +381,11 @@
             // Get the instanced version of the effect, if the engine does not support it, null is return and we'll only draw on by one
             let ei = this.getDataPartEffectInfo(WireFrame2D.WIREFRAME2D_MAINPARTID, ["pos", "col"], [], true);
             if (ei) {
-                renderCache.effectInstanced = engine.createEffect("wireframe2D", ei.attributes, ei.uniforms, [], ei.defines, null);
+                renderCache.effectInstanced = engine.createEffect("wireframe2d", ei.attributes, ei.uniforms, [], ei.defines, null);
             }
 
             ei = this.getDataPartEffectInfo(WireFrame2D.WIREFRAME2D_MAINPARTID, ["pos", "col"], [], false);
-            renderCache.effect = engine.createEffect("wireframe2D", ei.attributes, ei.uniforms, [], ei.defines, null);
+            renderCache.effect = engine.createEffect("wireframe2d", ei.attributes, ei.uniforms, [], ei.defines, null);
 
             return renderCache;
         }

+ 2 - 2
dist/preview release/canvas2D/babylon.canvas2d.js

@@ -10999,10 +10999,10 @@ var BABYLON;
             // Get the instanced version of the effect, if the engine does not support it, null is return and we'll only draw on by one
             var ei = this.getDataPartEffectInfo(WireFrame2D_1.WIREFRAME2D_MAINPARTID, ["pos", "col"], [], true);
             if (ei) {
-                renderCache.effectInstanced = engine.createEffect("wireframe2D", ei.attributes, ei.uniforms, [], ei.defines, null);
+                renderCache.effectInstanced = engine.createEffect("wireframe2d", ei.attributes, ei.uniforms, [], ei.defines, null);
             }
             ei = this.getDataPartEffectInfo(WireFrame2D_1.WIREFRAME2D_MAINPARTID, ["pos", "col"], [], false);
-            renderCache.effect = engine.createEffect("wireframe2D", ei.attributes, ei.uniforms, [], ei.defines, null);
+            renderCache.effect = engine.createEffect("wireframe2d", ei.attributes, ei.uniforms, [], ei.defines, null);
             return renderCache;
         };
         WireFrame2D.prototype._updateVertexBuffer = function (mrc) {

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/canvas2D/babylon.canvas2d.min.js