sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved worldMatrix declaration in instancing.glsl so that it works on android

Browse Source
This commit is contained in:
Rémy Bouquet 2017-04-02 12:53:16 +02:00
parent 09fa4f165e
commit b0a5384046
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jme3-core/src/main/resources/Common/ShaderLib/Instancing.glsllib
View File

@ -38,15 +38,16 @@ uniform mat3 g_NormalMatrix;
// 2 vertex attributes which now can be used for additional per-vertex data. // 2 vertex attributes which now can be used for additional per-vertex data.
attribute mat4 inInstanceData; attribute mat4 inInstanceData;
// Extract the world matrix out of the instance data, leaving out the
// quaternion at the end.
mat4 worldMatrix = mat4(vec4(inInstanceData[0].xyz, 0.0),
vec4(inInstanceData[1].xyz, 0.0),
vec4(inInstanceData[2].xyz, 0.0),
vec4(inInstanceData[3].xyz, 1.0));
vec4 TransformWorld(vec4 position) vec4 TransformWorld(vec4 position)
{ {
// Extract the world matrix out of the instance data, leaving out the
// quaternion at the end.
mat4 worldMatrix = mat4(vec4(inInstanceData[0].xyz, 0.0),
vec4(inInstanceData[1].xyz, 0.0),
vec4(inInstanceData[2].xyz, 0.0),
vec4(inInstanceData[3].xyz, 1.0));
return (worldMatrix * position); return (worldMatrix * position);
} }