Browse Source

fix, render variant change needs to trigger and material change

Alexander Rose 6 years ago
parent
commit
b0ab77ee7f
2 changed files with 6 additions and 0 deletions
  1. 2 0
      src/mol-gl/webgl/context.ts
  2. 4 0
      src/mol-gl/webgl/render-item.ts

+ 2 - 0
src/mol-gl/webgl/context.ts

@@ -137,6 +137,7 @@ export interface WebGLContext {
 
     currentProgramId: number
     currentMaterialId: number
+    currentRenderVariant: string
 
     bufferCount: number
     framebufferCount: number
@@ -265,6 +266,7 @@ export function createContext(gl: GLRenderingContext): WebGLContext {
 
         currentProgramId: -1,
         currentMaterialId: -1,
+        currentRenderVariant: '',
 
         bufferCount: 0,
         framebufferCount: 0,

+ 4 - 0
src/mol-gl/webgl/render-item.ts

@@ -140,6 +140,10 @@ export function createRenderItem(ctx: WebGLContext, drawMode: DrawMode, shaderCo
             const program = programs[variant].value
             const vertexArray = vertexArrays[variant]
             program.setUniforms(uniformValueEntries)
+            if (ctx.currentRenderVariant !== variant) {
+                ctx.currentMaterialId = -1
+                ctx.currentRenderVariant = variant
+            }
             if (materialId === -1 || materialId !== ctx.currentMaterialId) {
                 // console.log('materialId changed or -1', materialId)
                 program.setUniforms(materialUniformValueEntries)