Set program correctly for other primitive with the same program

CesiumGS · Mar 30, 2020 · 8ca78f7 · 8ca78f7
1 parent 41dab42
commit 8ca78f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/moveTechniquesToExtension.js b/lib/moveTechniquesToExtension.js
@@ -68,8 +68,6 @@ function moveTechniquesToExtension(gltf) {
             });
 
             if (!defined(seenPrograms[techniqueLegacy.program])) {
-                seenPrograms[techniqueLegacy.program] = true;
-
                 const programLegacy = gltf.programs[techniqueLegacy.program];
 
                 const program = {
@@ -86,6 +84,9 @@ function moveTechniquesToExtension(gltf) {
                 program.vertexShader = addToArray(extension.shaders, vs, true);
 
                 technique.program = addToArray(extension.programs, program);
+                seenPrograms[techniqueLegacy.program] = technique.program;
+            } else {
+                technique.program = seenPrograms[techniqueLegacy.program];
             }
 
             // Store the index of the new technique to reference instead.

diff --git a/specs/lib/moveTechniquesToExtensionSpec.js b/specs/lib/moveTechniquesToExtensionSpec.js
@@ -4,7 +4,7 @@ const moveTechniquesToExtension = require('../../lib/moveTechniquesToExtension')
 
 const WebGLConstants = Cesium.WebGLConstants;
 describe('moveTechniquesToExtension', () => {
-    it('moves techniques, shaders, and programs to extension', () => {
+    fit('moves techniques, shaders, and programs to extension', () => {
         const gltf = {
             programs: {
                 program_0: {
@@ -192,6 +192,7 @@ describe('moveTechniquesToExtension', () => {
         expect(program2.fragmentShader).not.toBe(program.fragmentShader);
 
         const technique3 = techniques.techniques[2];
+        expect(technique3.program).toBe(0);
         expect(technique3.uniforms.u_diffuse.type).toBe(WebGLConstants.FLOAT_VEC4);
         expect(gltf.materials[1].extensions.KHR_techniques_webgl.values.u_diffuse).toEqual([0.2, 0.2, 0.2, 1.0]);
     });