mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-28 16:06:28 +01:00
Code Issues Projects Releases Packages Wiki Activity
2263 commits 22 branches 0 tags 42 MiB
Commit graph

2108 commits

Author SHA1 Message Date
Jozufozu
431ff92861 Simplify SBB 
- SBB -> ModelTransformer
 - Shader binding the minecraft way
 - Engines are responsible for ending batches
 2021-12-16 23:10:24 -08:00
Jozufozu
be3f47dfbd Naive parallelism 
- Submit many tasks to executor and then wait for them all to complete.
 - Use WaitGroup
 - SBB no longer stores params, instead accepts Params arg to render
 - SBB keeps scratch variables local
 - CPUInstancer keeps track of default params
 - Separate #setup and #draw... functions in CPUInstancer
 - Combine DirectBufferBuilder#updateAfterWriting with #intoDirectConsumer
 - DirectVertexConsumer#split to distribute work
 2021-12-16 10:49:26 -08:00
Jozufozu
3767390c96 Better SBB params 
- Transform interface for grouping traits and combined behavior
 - Move transforms to params, impl Transform
 - Pass Params object to BatchingTransformers instead of SBB
 2021-12-16 00:11:47 -08:00
Jozufozu
cc707cf66a Batching Engine 
- Implement alternate backend using SBBs
 2021-12-15 17:12:48 -08:00
Jozufozu
15ea38ede7 Possible fix(es) for accessor crash 
- Haven't been able to reproduce
 - Try forcing PausedPartialTickAccessor to load early
 - Try renaming the method
 2021-12-15 16:19:52 -08:00
Jozufozu
17fb8d34ed Fix #extension crash on intel 2021-12-15 13:27:06 -08:00
PepperBell
cb5047f677 Sweeping up 
- Remove deprecated methods and fields
- Bump pack format
- Fix CI badge link
- Update VanillaInstances javadoc
- Organize imports
 2021-12-14 22:00:44 -08:00
Jozufozu
64a7443dde No need for InstancedMaterialRenderer 
- Here's to premature abstraction
 2021-12-13 21:27:15 -08:00
Jozufozu
d9fd668bbb AMD driver workaround 
- Just don't pool models
 2021-12-13 19:55:50 -08:00
Jozufozu
56150b2645 Fix vanishing minecarts 2021-12-12 22:30:46 -08:00
PepperBell
6fede0851e Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	README.md
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/backend/RenderWork.java
	src/main/java/com/jozufozu/flywheel/backend/material/MaterialManagerImpl.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfigCommand.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwPackets.java
	src/main/java/com/jozufozu/flywheel/config/SConfigureBooleanPacket.java
	src/main/java/com/jozufozu/flywheel/core/PartialModel.java
	src/main/java/com/jozufozu/flywheel/core/StitchedSprite.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
	src/main/java/com/jozufozu/flywheel/mixin/LeakChunkStorageArrayMixin.java
	src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
	src/main/java/com/jozufozu/flywheel/util/ChunkIter.java
	src/main/resources/META-INF/mods.toml
	src/main/resources/flywheel.mixins.json
 2021-12-12 17:29:09 -08:00
Jozufozu
a3ee39099a Use GL_ARB_conservative_depth when possible 
- Allows the depth test to discard fragments before the fragment shader is run
 2021-12-11 22:03:52 -08:00
Jozufozu
11e5719e0d Cylindrical fog 
- having the world position is very nice
 - mojang manages to do multiple matrix multiplications
 2021-12-11 17:31:09 -08:00
Jozufozu
ebfeff0b54 Fix misaligned contraption light 
- That was a pain to debug
 - Idk how that ever worked
 2021-12-11 15:06:07 -08:00
Jozufozu
79e61b44e5 1.18.1 2021-12-11 14:18:43 -08:00
Jozufozu
2207da5eed Implemented 2021-12-10 14:50:01 -08:00
Jozufozu
21a23d650f Mapped buffer sanity 
- MappedBuffer no longer abstract
 - Mappable interface used within MappedBuffer
 - MappedBuffer is mapped before ctor
 - No more subclasses, no more thin wrapping overrides
 - Use try with resources for buffer mapping
 - Better error handling with mapped buffers
 - Unimplemented exception as a procrastination method
 2021-12-10 14:45:18 -08:00
Jozufozu
fd8d436640 Worlds are bigger now pt 2 
- Stop clamping Y in [0, 256)
 2021-12-10 12:31:57 -08:00
Jozufozu
931fffb5f1 Worlds are bigger now 
- Stop clamping Y in [0, 256)
 2021-12-10 00:28:32 -08:00
Jozufozu
99e15cbcd9 Debugging changes 
- MapBufferRange compat layer not needed, missed that
 - Don't need MappedFullBuffer anymore
 - Add guard for size in GPULightVolume#bind
 - LightVolume#getStride not needed
 - Replace usaged of GlError#poll with #pollAndThrow
 - VecBufferConsumer doesn't need a format
 2021-12-10 00:07:52 -08:00
Jozufozu
b892f602cb Whoops remove imports 2021-12-09 16:40:01 -08:00
Jozufozu
5374baf241 No more material spec, everything is StructType 2021-12-09 16:34:32 -08:00
Jozufozu
eee9b3fb51 Move api package 2021-12-09 15:27:56 -08:00
Jozufozu
da55941e4f Add RecordingVertexConsumer 
- Very basic and untested
 2021-12-09 15:19:48 -08:00
Jozufozu
7b3bab6647 Reorganize, rename, refactor, 0.4.0 
- Move most user facing interfaces to flywheel.api package
 - Refactor InstanceData to have no package private classes
 - Remove 'I' prefix from many interfaces
 - ILightUpdateListener -> LightListener
 - IMultiProgram -> ContextAwareProgram
 - IFlatLight -> FlatLit
 - All materials use the same vertex format: UNLIT_MODEL
 2021-12-09 00:42:27 -08:00
Jozufozu
47b110c48c Fix shulker box rendering 2021-12-08 12:48:18 -08:00
Jozufozu
9fe0bae2ad #tick and #beginFrame on creation 
- Fixes weird delay in object appearance when reloading chunks
 2021-12-08 12:28:22 -08:00
Jozufozu
aaaccc47ee Add instances when chunks are built for rendering 
- RIP ChunkIter, may you rule over the depths of hell in peace
 - Fix memory leak when instance worlds get reset
 - Server worlds are not flywheel worlds
 - Nothing to do on world load anymore
 2021-12-08 12:16:01 -08:00
Jozufozu
b4fe00a314 Fix potential nullpointer rendering breaking overlay 
- Should backport for #52
 2021-12-07 23:53:13 -08:00
Jozufozu
ef5de609a2 Groups store their types again 
- Fix crash rendering breaking overlay
 2021-12-07 23:40:45 -08:00
Jozufozu
36f32ececc VAO state clearing handled in InstancingEngine#render 2021-12-07 23:00:32 -08:00
Jozufozu
97949ab1da Cull legacy compat boilerplate 
- Minecraft is on GL32 now!
 2021-12-07 22:47:05 -08:00
Jozufozu
a90e6a1f56 Quick fix for create's contraptions 2021-12-07 22:45:10 -08:00
Jozufozu
fd0343c48b Merge branch '1.17/dev' into 1.18/dev 2021-12-07 21:29:38 -08:00
Jozufozu
f7c45e5486 Get started on a batching engine 
- An Engine is a MaterialManager and a RenderDispatcher
 - Refactor InstanceManager's ctor to use the MaterialManager interface instead of the concrete type
 - MaterialManagerImpl -> InstancingEngine
 - Add skeleton for BatchingEngine
 - Hack in InstanceWorld to switch between the 2
 - Rename/move existing MaterialManager impl to new package
 2021-12-06 23:36:14 -08:00
Jozufozu
ca459dd2ca Update to 1.18 2021-12-06 21:29:21 -08:00
Jozufozu
7813eedf61 Miscellaneous gl changes while debugging 
- Only unbind at the end of MaterialManagerImpl#render
 - Add GlBufferType#bind and #unbind
 - Make GlVertexArray#unbind static
 2021-12-06 21:11:51 -08:00
PepperBell
621ce2b43c Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev 
Conflicts:
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
	src/main/resources/flywheel.mixins.json
 2021-12-06 17:22:55 -08:00
Jozufozu
e08633af3c Do a 180 
- Fix inconsistency in minecart model
 2021-12-06 17:19:21 -08:00
Jozufozu
b9352bc3a4 Vanillaization 
- IModels now accept a VertexConsumer
 - IRenderState -> RenderType
 - AbstractInstancer for dealing with InstanceData tidyness
 - Alter crumbling renderer to match new system
 - Add hack to keep track of bound atlas textures
 2021-12-06 15:23:26 -08:00
PepperBell
e7ef9291c7 Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
 2021-12-05 18:42:30 -08:00
Jozufozu
c54514cf47 No more InstanceData#write 2021-12-02 20:13:55 -08:00
Jozufozu
4677893690 Yeet json extensions that idea doesn't make sense 
- Was only ever used for fog
 - Was the same for every material
 - Made things unnecessarily complex
 - Fix fog
 - Convert ProgramState to record
 2021-12-02 17:40:23 -08:00
PepperBell
4f19fdddde Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev 
Conflicts:
	settings.gradle
 2021-11-27 12:02:21 -08:00
Jozufozu
4ee6a8c9aa Shadows causing trouble? No more shadows 2021-11-27 11:30:38 -08:00
PepperBell
7a4d875061 Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev 
Conflicts:
	gradle.properties
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
	src/main/java/com/jozufozu/flywheel/config/BooleanDirective.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwConfig.java
	src/main/java/com/jozufozu/flywheel/config/SConfigureBooleanPacket.java
	src/main/java/com/jozufozu/flywheel/core/AtlasStitcher.java
	src/main/resources/flywheel.mixins.json
 2021-11-24 20:53:22 -08:00
PepperBell
fbc5836afb Improve StitchedSprite functionality 
- Make StitchedSprite work like PartialModel
- Allow StitchedSprite instances to be created directly
- Allow StitchSprites to be created for any atlas
- Use texture stitch post event instead of lazy computation for filling
StitchedSprites
- Remove legacy method from AngleHelper
- Change artifact name from flywheel to flywheel-forge
- Organize imports
 2021-11-24 18:43:05 -08:00
Jozufozu
881ce3639d Merge remote-tracking branch 'origin/1.16/dev' into 1.17/dev 
# Conflicts:
#	changelog.txt
#	gradle.properties
#	src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java
#	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
#	src/main/java/com/jozufozu/flywheel/config/SConfigureBooleanPacket.java
#	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
#	src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
#	src/main/java/com/jozufozu/flywheel/util/WorldAttached.java
#	src/main/resources/flywheel.mixins.json
 2021-11-23 16:49:39 -08:00
Jozufozu
e8f5e4a6c1 Implement TransformStack directly on PoseStack 
- Add helper method to cast to the interface.
 2021-11-23 15:07:31 -08:00
Jozufozu
0d2907e187 Split TransformStack interface 
- Now individual components Translate Rotate and Scale
 - Internal change to ModelData, store matrices directly
 - Implement Translate Rotate and Scale for ModelData
 - Implement Translate and Rotate for OrientedData
 - Clean usages of ModelData to use new api when possible
 - WriteSafe and WriteUnsafe for matrices
 2021-11-22 18:05:53 -08:00
PepperBell
dbe46a6f28 Merge remote-tracking branch 'origin/1.17/dev' into 1.17/fabric/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/jozufozu/flywheel/backend/Loader.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
	src/main/java/com/jozufozu/flywheel/config/SConfigureBooleanPacket.java
	src/main/java/com/jozufozu/flywheel/core/AtlasStitcher.java
	src/main/java/com/jozufozu/flywheel/core/PartialModel.java
	src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java
	src/main/java/com/jozufozu/flywheel/core/model/BakedModelModel.java
	src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
	src/main/java/com/jozufozu/flywheel/event/BeginFrameEvent.java
	src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
	src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java
	src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
	src/main/java/com/jozufozu/flywheel/util/BakedQuadWrapper.java
	src/main/java/com/jozufozu/flywheel/util/BufferBuilderReader.java
	src/main/resources/flywheel.mixins.json
	src/main/resources/pack.mcmeta
 2021-11-20 09:54:22 -08:00
PepperBell
f14aca4517 Server crash fix and formatting 
- Fix matrix mixins being applied on dedicated server
- Expand PartialModel functionality: add location getter and model
setter
- Remove Loader.getResourceType since selective reloading is deprecated
- Organize imports and mixin order
- Other formatting
- Update Gradle and Forge
 2021-11-18 14:59:39 -08:00
Jozufozu
94e83a10d1 TextureBinder for dealing with vanilla RenderTypes 2021-11-09 16:48:54 -08:00
Jozufozu
af98782a89 Instance init 
- So that simi can have his cogs.
 - Inheritance is painful when models are acquired in an instance's ctor
 2021-11-09 15:03:52 -08:00
Jozufozu
fe62302d25 Chipping away at light 2021-11-09 14:59:31 -08:00
Jozufozu
1d4bb972b9 Named models 2021-11-08 20:48:02 -08:00
Jozufozu
097ecb062e Invalidate regardless 2021-11-05 16:47:27 -07:00
Jozufozu
e9404d6de3 Revert "Weak hash map in world attached" 
This reverts commit 98a3f759b3.
 2021-11-05 16:45:39 -07:00
Jozufozu
98a3f759b3 Weak hash map in world attached 
- More robust solution that listening to WorldEvent.Unload
 2021-10-31 19:54:12 -07:00
Jozufozu
d2b5b1096b Fix world leak 2021-10-31 19:50:01 -07:00
Jozufozu
46ebdfd43b Remove chunk provider mixin and refactor config packets 2021-10-31 17:24:57 -07:00
PepperBell
9a1c381f70 Port to Fabric 2021-10-14 16:20:56 -07:00
Jozufozu
0bbfb60d0c Compat work 
- No more net.minecraftforge.common.util usages
 - Replace forge lazy with flywheel lazy
 - Replace forge NonNullSupplier with flywheel NonNullSupplier
 - texture2D -> texture
 2021-10-12 12:52:02 -07:00
Jozufozu
762e526a27 Revert "Rename/refactor many interfaces" 
This reverts commit 66aa987dbd.

Can re-think the names later.
 2021-09-30 13:43:09 -07:00
Jozufozu
66aa987dbd Rename/refactor many interfaces 
- Drop I prefix
 - Inline IMultiProgram
 - Remove unused method in InstanceRendered
 2021-09-28 17:54:47 -07:00
Jozufozu
fe700b8be5 Better Block Entity filtering 
- Assumes IInstanceRendered#shouldRenderNormally does not change over a BE's life
 2021-09-26 22:30:11 -07:00
Jozufozu
57b67cddcf Testing + fixing 2021-09-26 21:15:02 -07:00
Jozufozu
ef48504caa UNTESTED - Replace ATs 
- Matrices use #store
 - Accessor for pausedPartialTick
 2021-09-26 19:40:53 -07:00
Jozufozu
0663218b67 GL32 shaders and errors 
- Update shaders to glsl 150
 - Objectfy errors
 2021-09-20 19:27:04 -07:00
Jozufozu
5c5f48ba4a Small things 
- Fix minecarts rendering really far away
 - InstanceManager#getInstance now has one job
 - Instance creation moved to InstanceManager#addInternal
 - TransformStack#translateBack for Vec3i
 2021-09-17 15:59:20 -07:00
Jozufozu
5044308c68 F3+A 
- Reloading chunks correctly reloads block entity instances
 2021-09-17 14:20:35 -07:00
Jozufozu
652d1d3104 Always use discard 2021-09-16 20:53:35 -07:00
Jozufozu
d53c9b0a32 It renders stuff 
- The lightmap moved
 - Begin to move away from access transformers
 - .textureManager -> .getTextureManager()
 - RIP cutout, saw that coming
 2021-09-16 20:03:45 -07:00
Jozufozu
8407fed299 Don't crash when block entities are placed 
- Block entities got a huge refactor in 1.17, a lot of the old code needs to be rethought
 2021-09-15 14:29:58 -07:00
Jozufozu
40034daa64 Minecraft already stores the projection matrix 
mixins--
 2021-09-15 14:27:51 -07:00
Jozufozu
a930bc97cc It launches 
- yeet the fog
 - update mixin compatibility level
 2021-09-15 13:49:18 -07:00
grimmauld
137de259e5 Fix obvious errors 2021-09-15 09:26:51 +02:00
grimmauld
2ae580259c Remap, update forge, minecraft and java 2021-09-15 09:14:30 +02:00
Jozufozu
ee7f6fd5e2 fixup! Initial data/struct format refactor 2021-09-14 13:52:52 -07:00
Jozufozu
613c933206 Revert "Parallel light updates" 
Caused a crash, likely related to the use of weak references

This reverts commit c68b2bbf91.
 2021-09-14 13:19:52 -07:00
Jozufozu
261b901e80 LightPacking utility class 2021-09-14 13:17:13 -07:00
Jozufozu
fbcc1f0a10 Initial data/struct format refactor 
- Inspired by jellysquid3's vertex sinks
 - More robust/extensible solution for data writes
 2021-09-12 14:49:00 -07:00
Jozufozu
c68b2bbf91 Parallel light updates 2021-09-12 10:29:29 -07:00
Jozufozu
075719e75c Optimize imports 2021-09-12 09:41:45 -07:00
Jozufozu
b75dcb2209 Instancer interface 
- Entire material/model system finally cleaned up
 2021-09-12 09:40:36 -07:00
Jozufozu
3ef6a163f0 Fix compat with optifine shaders, again 2021-09-09 15:30:50 -07:00
Jozufozu
a6377b5fe8 Fix BeginFrameEvent not firing with sodium installed 
- Rendering is still broken, that fix must come from within sodium
 2021-09-09 14:07:35 -07:00
Jozufozu
99259ff227 Separate LightVolume and GPULightVolume 
- LightVolumes now can act as a light cache with configurable size
 - More GridAlignedBB changes
 - Remove ILightUpdateListeners
 - Simplify pulley rendering using LightVolume
 2021-09-08 15:48:49 -07:00
Jozufozu
dc6a9daeb1 Immutable view of GridAlignedBB 2021-09-04 19:57:32 -07:00
Jozufozu
fe304041c5 Moving light updates 
- Better system for moving objects that want to receive light updates
 - LightProvider interface to better abstract light lookups
 - All light listeners use GridAlignedBBs
 - More utility in GridAlignedBB
 2021-09-04 16:40:40 -07:00
Jozufozu
7ca4ea5c3e Light update convergence 
- Move light update logic for all instances to use LightUpdater
 - Begin refactor of LightUpdater to account for moving listeners
 2021-08-29 14:40:46 -07:00
Jozufozu
cb10e4e7d1 Merge branch 'dev' into next 2021-08-25 13:21:42 -07:00
Jozufozu
f0f423ca0d Restore single paramater scale function 
- Now has default impl in TransformStack
 - MatrixTransformStack now only overrides xyz scale
 2021-08-25 13:15:29 -07:00
Jozufozu
98b61b884c Instanced Minecarts 
- Rotations in PartBuilder
 - BlockModels are always UNLIT_MODEL format
 2021-08-25 12:53:43 -07:00
MehVahdJukaar
d9c631cfe7
Update TransformStack.java 2021-08-25 21:49:06 +02:00
MehVahdJukaar
b0625ef13e
Update MatrixTransformStack.java 2021-08-25 21:40:35 +02:00
MehVahdJukaar
4fbb808832
Added 3 parameter scaling function 
Simply adds a 3 parameter function to to MatrixTransformStack so a matrix can be scaled on different axis
 2021-08-25 20:21:33 +02:00
Jozufozu
7cb81256a1 Interfaces and less log lines 
- MateralManager, MaterialGroup, and InstanceMaterial are all interfaces
 - Separate (T)EI facing API from implementation
 - Comment out debug log in ModelPool
 2021-08-23 22:34:27 -07:00
Jozufozu
2137f9e46d Errors and pools 
- GlException and error checking WIP
 - Put all models within a material in a ModelPool
 - Instancers directly accept IModels
 - ModelPools are very WIP
 2021-08-20 15:05:41 -07:00
Jozufozu
f4f6087e08 Storage clean-up 
- Wrapper for sync objects
 - Compat layer for buffer storage
 - Don't get persistent buffers if they're not supported
 2021-08-14 15:57:52 -07:00