PepperCode1
3ccb4eb9a1
Minor clean up and fixes
2024-05-17 08:43:56 -07:00
Jozufozu
135f1e3fd2
Merge branch '1.18/dev' into 1.18/next
...
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.yml
# build.gradle
# gradle.properties
# src/main/java/com/jozufozu/flywheel/api/Material.java
# src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java
# src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
# src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java
# src/main/java/com/jozufozu/flywheel/backend/model/FallbackAllocator.java
# src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java
# src/main/java/com/jozufozu/flywheel/backend/model/ModelPool.java
# src/main/java/com/jozufozu/flywheel/backend/model/VBOModel.java
# src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
# src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingGroup.java
# src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java
# src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java
# src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
# src/main/java/com/jozufozu/flywheel/core/model/Model.java
# src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
# src/main/java/com/jozufozu/flywheel/core/vertex/AbstractVertexList.java
# src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
# src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
# src/main/java/com/jozufozu/flywheel/mixin/ClientMainMixin.java
# src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
# src/main/resources/flywheel.mixins.json
2023-03-28 13:22:53 -07:00
PepperCode1
b76e8b1a89
A bit of backporting
...
- Backport general changes from 1.19
- Fix Javadoc of PartialModel
- Remove default Model#getType implementation
- Increment version to 0.6.8
- Update Parchment
2022-11-10 16:30:30 -08:00
Jozufozu
564b0996f9
Indirectly packed
...
- Use glsl structs to pack vec/mat data in ssbos
- Support RenderStages
- Dynamically sized draw storage
2022-08-21 16:47:15 -07:00
Jozsef
8bf0b31039
Fix else formatting
2021-06-30 13:03:02 -07:00
Jozsef
6817ddec45
Pre-port tasks I
...
- Rename Client to FlywheelClient
- Remove Shadow plugin
- Remove generated source set
- Remove unused properties in gradle.properties
- Organize all imports
- Thanks for the list pepper!
2021-06-30 12:43:54 -07:00
JozsefA
f460e229df
Squish
...
- Squash all commits before separating flywheel from create
2024-03-07 19:08:15 -08:00
