Skip to content

Commit daa0838

Browse files
committed
shader fixes for normals and instance transforms
1 parent a28c29c commit daa0838

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

packages/engine/Source/Scene/Model/RuntimeModelInstancingPipelineStage.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ RuntimeModelInstancingPipelineStage.process = function (
4949
) {
5050
const shaderBuilder = renderResources.shaderBuilder;
5151
shaderBuilder.addDefine("HAS_INSTANCING");
52+
shaderBuilder.addDefine("HAS_INSTANCE_MATRICES");
5253
shaderBuilder.addDefine(
5354
"USE_API_INSTANCING",
5455
undefined,

packages/engine/Source/Shaders/Model/ModelVS.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void main()
8585
RuntimeModelInstancingStage(attributes, instanceModelView, instanceModelViewInverseTranspose);
8686

8787
modelView = instanceModelView;
88-
//normal = instanceModelViewInverseTranspose;
88+
normal = instanceModelViewInverseTranspose;
8989
#else
9090
instancingStage(attributes);
9191
#endif

packages/engine/Source/Shaders/Model/RuntimeModelInstancingPipelineStageVS.glsl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ void RuntimeModelInstancingStage(
1414
attributes.positionMC = (relativePositionMC + translateRelativeToEye).xyz;
1515

1616
instanceModelView = czm_modelViewRelativeToEye;
17-
// TODO: Normals
18-
//instanceModelViewInverseTranspose = mat3(u_instance_modifiedModelView * instanceModel);
17+
instanceModelViewInverseTranspose = mat3(czm_modelViewRelativeToEye * instanceModel);
1918
}

0 commit comments

Comments
 (0)