diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 15:02:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:02:15 +0200 |
| commit | 159470df08c0283a2330af94d26ccbe3d009d8fd (patch) | |
| tree | cea94427a7a53188858fc9d83dca55fc0511880d /drivers/gles2/shaders | |
| parent | 30e16fff57cfdeb79f8e9ee6a7516e7d7cd6d376 (diff) | |
| parent | 36b5795f47c9a706e1d8c12a932de1fe2bb9893f (diff) | |
Merge pull request #32275 from godotengine/skin_support
Added skin support and simplified APIs to override bone position + glTF 2.0 import fixes
Diffstat (limited to 'drivers/gles2/shaders')
| -rw-r--r-- | drivers/gles2/shaders/scene.glsl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index 8a9387f0b3..51447dc00f 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -61,9 +61,6 @@ uniform ivec2 skeleton_texture_size; #endif -uniform highp mat4 skeleton_transform; -uniform highp mat4 skeleton_transform_inverse; -uniform bool skeleton_in_world_coords; #endif @@ -410,12 +407,9 @@ void main() { #endif - if (skeleton_in_world_coords) { - bone_transform = skeleton_transform * (bone_transform * skeleton_transform_inverse); - world_matrix = bone_transform * world_matrix; - } else { - world_matrix = world_matrix * bone_transform; - } + + world_matrix = world_matrix * bone_transform; + #endif |