Sync code

Author: lwjglgamedev

chapter-14/src/main/java/org/lwjglb/engine/graph/SceneRender.java

@@ -1,7 +1,6 @@
 package org.lwjglb.engine.graph;
 
 import org.joml.*;
-import org.lwjglb.engine.Window;
 import org.lwjglb.engine.scene.*;
 import org.lwjglb.engine.scene.lights.*;
 
@@ -129,6 +128,7 @@ public void render(Scene scene) {
         glBindVertexArray(0);
 
         shaderProgram.unbind();
+        glDisable(GL_BLEND);
     }
 
     private void updateLights(Scene scene) {

chapter-20/src/main/java/org/lwjglb/engine/graph/Model.java

@@ -45,29 +45,7 @@ public boolean isAnimated() {
         return animationList != null && !animationList.isEmpty();
     }
 
-    public static class AnimatedFrame {
-        private Matrix4f[] bonesMatrices;
-        private int offset;
-
-        public AnimatedFrame(Matrix4f[] bonesMatrices) {
-            this.bonesMatrices = bonesMatrices;
-        }
-
-        public void clearData() {
-            bonesMatrices = null;
-        }
-
-        public Matrix4f[] getBonesMatrices() {
-            return bonesMatrices;
-        }
-
-        public int getOffset() {
-            return offset;
-        }
-
-        public void setOffset(int offset) {
-            this.offset = offset;
-        }
+    public record AnimatedFrame(Matrix4f[] boneMatrices) {
     }
 
     public record Animation(String name, double duration, List<AnimatedFrame> frames) {

chapter-20/src/main/java/org/lwjglb/engine/scene/ModelLoader.java

@@ -37,7 +37,7 @@ private static void buildFrameMatrices(AIAnimation aiAnimation, List<Bone> boneL
         for (Bone bone : affectedBones) {
             Matrix4f boneTransform = new Matrix4f(globalInverseTransform).mul(nodeGlobalTransform).
                     mul(bone.offsetMatrix());
-            animatedFrame.getBonesMatrices()[bone.boneId()] = boneTransform;
+            animatedFrame.boneMatrices()[bone.boneId()] = boneTransform;
         }
 
         for (Node childNode : node.getChildren()) {