Commit after rebase

google · Sep 4, 2023 · 87ec534 · 87ec534
1 parent 1554a37
commit 87ec534
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 293 deletions.
diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp
@@ -73,8 +73,9 @@ struct RenderableManager::BuilderDetails {
         utils::FixedCapacityVector<math::float2>>> mBonePairs;
 
     explicit BuilderDetails(size_t count)
-            : mEntries(count), mCulling(true), mCastShadows(false), mReceiveShadows(true),
-              mScreenSpaceContactShadows(false), mSkinningBufferMode(false), mBonePairs(), mFogEnabled(true) {
+            : mEntries(count), mCulling(true), mCastShadows(false),
+              mReceiveShadows(true), mScreenSpaceContactShadows(false),
+              mSkinningBufferMode(false),  mFogEnabled(true), mBonePairs() {
     }
     // this is only needed for the explicit instantiation below
     BuilderDetails() = default;

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -250,7 +250,6 @@ if (NOT ANDROID)
     add_demo(skinningtest)
     add_demo(strobecolor)
     add_demo(suzanne)
-    add_demo(suzanneskinning)
     add_demo(texturedquad)
     add_demo(vbotest)
     add_demo(viewtest)
@@ -266,7 +265,6 @@ if (NOT ANDROID)
     target_link_libraries(sample_cloth PRIVATE filameshio)
     target_link_libraries(sample_normal_map PRIVATE filameshio)
     target_link_libraries(suzanne PRIVATE filameshio suzanne-resources)
-    target_link_libraries(suzanneskinning PRIVATE filameshio suzanne-resources)
 
     if (FILAMENT_DISABLE_MATOPT)
         add_definitions(-DFILAMENT_DISABLE_MATOPT=1)

diff --git a/samples/suzanneskinning.cpp b/samples/suzanneskinning.cpp
diff --git a/shaders/src/main.vs b/shaders/src/main.vs
@@ -80,7 +80,7 @@ void main() {
             #endif
         }
 
-        if ((object_uniforms.flagsChannels & FILAMENT_OBJECT_SKINNING_ENABLED_BIT) != 0u) {
+        if ((object_uniforms_flagsChannels & FILAMENT_OBJECT_SKINNING_ENABLED_BIT) != 0u) {
             skinNormalTangent(material.worldNormal, vertex_worldTangent.xyz, mesh_bone_indices, mesh_bone_weights);
         }
         #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ void main() { @@
                 #endif
             }
-            if ((object_uniforms.flagsChannels & FILAMENT_OBJECT_SKINNING_ENABLED_BIT) != 0u) {
+            if ((object_uniforms_flagsChannels & FILAMENT_OBJECT_SKINNING_ENABLED_BIT) != 0u) {
                 skinNormalTangent(material.worldNormal, vertex_worldTangent.xyz, mesh_bone_indices, mesh_bone_weights);
             }
             #endif
@@ Expand Down @@