From 491ccf4409aaea8bcdf818319b3f774a0c7b451d Mon Sep 17 00:00:00 2001 From: austin Date: Fri, 20 Sep 2024 13:02:42 -0400 Subject: [PATCH] buffer overflow fix --- assets/Data/entity/creatures/human.json | 2 +- assets/Data/entity/creatures/skeleton.json | 2 +- .../creatures/individual/deerprogress.md | 39 +++++++++++++++++++ docs/src/progress/currenttarget.md | 2 - docs/src/progress/renderertodo.md | 3 ++ .../renderer/light/LightManager.java | 1 + 6 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 docs/src/highlevel-design/creatures/individual/deerprogress.md diff --git a/assets/Data/entity/creatures/human.json b/assets/Data/entity/creatures/human.json index 76004362..2a5e3839 100644 --- a/assets/Data/entity/creatures/human.json +++ b/assets/Data/entity/creatures/human.json @@ -542,7 +542,7 @@ }, "offset": { "x": 0.0, - "y": 0.6, + "y": 0.0, "z": 0.0 } }, diff --git a/assets/Data/entity/creatures/skeleton.json b/assets/Data/entity/creatures/skeleton.json index 20b52fed..2dbda9e8 100644 --- a/assets/Data/entity/creatures/skeleton.json +++ b/assets/Data/entity/creatures/skeleton.json @@ -426,7 +426,7 @@ }, "offset": { "x": 0.0, - "y": 0.3, + "y": 0.0, "z": 0.0 } }, diff --git a/docs/src/highlevel-design/creatures/individual/deerprogress.md b/docs/src/highlevel-design/creatures/individual/deerprogress.md new file mode 100644 index 00000000..55a97bd1 --- /dev/null +++ b/docs/src/highlevel-design/creatures/individual/deerprogress.md @@ -0,0 +1,39 @@ +@page humanprogress Human + +Progress on the human creature + +## Third Person Model + - [X] Meshed + - [ ] Textured + - [X] Rigged + - Animations + - Common + - [X] Idle + - [ ] Walk + - [ ] WalkStrafeLeft + - [ ] WalkStrafeRight + - [X] Jog + - [ ] Sprint + - [ ] Jump + - [ ] Fall + - [ ] Land + - [ ] Swim + - [ ] Interact + - [ ] InteractChannel + - [ ] Eat + - Attributes 0/0 +## Data + - [ ] Bone Groups + - [ ] Physics + - [ ] Visual Attributes + - Movement + - [ ] Ground Movement + - [ ] Sprinting + - [ ] Jumping + - [ ] Falling + - [ ] Walking + - [ ] Swimming + - [ ] Hitboxes + - Combat + - [ ] Health + - [ ] AI \ No newline at end of file diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index cecbb267..71c5b300 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -24,10 +24,8 @@ Crouching Model clothing, hair for the human particles, light on sword collision - - Requires particle manager overhaul Come up with a title for the game and create a title menu for it (ideally with some animation and music) - Flames moving up the screen - - Requires particle manager overhaul - Requires actor panel that can play scenes - Requires rendering overhaul - Requires finding an sfx for flames diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index b95a2c09..bc53f2b1 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -816,6 +816,9 @@ Texture atlasing for particle system Texture atlas caching Point light offsets +(09/20/2024) +Light manager buffer overflow bugfix + # TODO diff --git a/src/main/java/electrosphere/renderer/light/LightManager.java b/src/main/java/electrosphere/renderer/light/LightManager.java index 74611f1f..84d54071 100644 --- a/src/main/java/electrosphere/renderer/light/LightManager.java +++ b/src/main/java/electrosphere/renderer/light/LightManager.java @@ -229,6 +229,7 @@ public class LightManager { // //push point lights ByteBuffer pointLightBuffer = pointLightSSBO.getBuffer(); + pointLightBuffer.limit(pointLightBuffer.capacity()); for(PointLight light : this.entityPointLightMap.values()){ if(i >= MAX_POINT_LIGHTS){ LoggerInterface.loggerRenderer.WARNING("CLOSE TO MAXIMUM NUMBER OF POINT LIGHTS!");