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

2320 commits

This branch
This branch
All branches
Author SHA1 Message Date
PepperCode1
e0aa5dd7ce Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	.github/ISSUE_TEMPLATE/bug_report.yml
	build.gradle
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwConfig.java
 2022-06-30 19:38:14 -07:00
Jozufozu
e26195169f Closing the blinds 
- Prevent LightUpdater from interacting with invalid levels.
 - Bump version - 0.6.3
 2022-06-22 13:29:28 -07:00
Jozufozu
af11d1e78b Fix spooky shaded contraptions 
- Logic error in GPULightVolume#move
 - Race condition from LightUpdater showing up in LightVolume#initialize
 2022-04-08 17:23:02 -07:00
Jozufozu
9a69ed1906 Layoff some workers 
- Only one task engine for everything now
 - Fixes crash on LightUpdater init when Flywheel is off
 - Attempt to wrangle InstanceWorld init code
 - Misc. cleanup/renaming
 2022-04-07 14:19:36 -07:00
Jozufozu
19d757d702 Moving in parallel 
- LightUpdates now uses task engine to update listeners in parallel
 - Basic workgroup system to run something on the main thread after a group of tasks is complete
 2022-04-07 13:23:56 -07:00
Jozufozu
e3ceacd6e4 Contraptions were too lit 
- Fix bug causing potentially moving contraptions to re-upload their light every tick
 - Reduces tick stutter with large amounts of contraptions
 2022-04-07 13:23:56 -07:00
Jozufozu
eb5d3c4b25 Model allocators are passed on init instead of stored 2022-04-07 13:23:56 -07:00
Jozufozu
ec8b831917 Update changelog, make bug report template loader agnostic 2022-04-06 11:51:59 -07:00
PepperCode1
a6d0dd8a39 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	gradle.properties
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/resources/META-INF/mods.toml
 2022-03-14 11:22:58 -07:00
PepperCode1
a419eab484 Update to 1.18.2 
- Switch to SLF4J logging
- Bump version
- Add 0.6.1 changelog
 2022-03-14 10:52:28 -07:00
PepperCode1
3d24002aac Fix display test 
- Improve version retrieval
- Fix extra description newline
 2022-03-12 14:24:15 -08:00
PepperCode1
f5b15f3dff Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertex.java
	src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
	src/main/java/com/jozufozu/flywheel/util/RenderMath.java
 2022-02-21 15:28:26 -08:00
PepperCode1
0c74be53f6 Add partial support for non-shaded quads 
- Add ShadeSeparatedBufferBuilder and other code to allow separating all
non-shaded vertices to the end of the buffer
- Add ShadedVertexList to allow defining if a certain vertex is shaded
or not
- Add new methods to ModelUtil with arguments for more flexibility
- Refactor VirtualEmptyBlockGetter to allow defining arbitrary light
values
- Add shaded argument to DiffuseLightCalculator
 2022-02-18 20:39:19 -08:00
Jozufozu
52f66dec9d Move diffuse declaration to vertex compiler 2022-02-14 20:45:13 -08:00
Jozufozu
20a75321e2 Fix occasional crash when flywheel objects are loaded in 2022-02-14 20:36:35 -08:00
PepperCode1
9cc6523368 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	build.gradle
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelTransformer.java
	src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java
	src/main/java/com/jozufozu/flywheel/util/RenderMath.java
 2022-02-12 21:38:01 -08:00
Jozufozu
c07c6363f9 Resolve redirect conflict and add more optifine hacks 
- Fix entitiesForRendering redirect to be compatible with carpet.
 - Use more reflection for dealing with optifine
 - Fixes issue where flywheel would still be on immediately after enabling optifine shaders
 2022-02-10 21:26:56 -08:00
PepperCode1
7515cc74f7 Remove force diffuse 
- The batching engine may run in parallel, meaning the force diffuse
state will not be read correctly
- ModelTransformers only process vertices that will be rendered in the
world
- Add 0.6.1 to the issue template
 2022-02-08 21:37:09 -08:00
PepperCode1
f24c1fafba Add, refactor, remove 
- Add DiffuseLightCalculator
- Add ModelUtil.VANILLA_RENDERER for consistent virtual rendering
- Refactor OptifineHandler
- Remove MatrixTransformStack
 2022-02-08 19:26:36 -08:00
PepperCode1
59c4ac3cb8 Fix and optimize model hacks 
- Remove isVanillaAdapter check from CullingBakingModel.wrap
- Optimize model wrapping in ModelUtil.getBufferBuilderFromTemplate
 2022-02-06 16:28:33 -08:00
PepperCode1
2b5e71e172 Fix Sodium mixin not being remapped in prod 2022-02-06 12:38:47 -08:00
Jozufozu
ae5853442b Small utility functions 2022-02-06 00:55:49 -08:00
IMS
bbc5cc60bf
Fix Sodium block entity support (#108) 
* Fix Sodium block entity support

* Fix production remapping

* Make sodium modCompileOnly

* Finalize Sodium compatibility

- Improve mixin to redirect getting of renderer instead of adding of
block entity
- Move mixins from mixin.sodium to fabric.mixin.sodium
- Remove Joml dependency

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
 2022-02-03 19:49:24 -08:00
PepperCode1
e48ecccf32 Improve Iris compatibility 
- Use config-based areShadersEnabled when choosing the engine
 2022-02-03 17:12:50 -08:00
PepperCode1
8fcc1df383 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	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/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/config/FlwConfig.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
 2022-02-01 21:32:31 -08:00
PepperCode1
1d0e0eb6bc Compress config command code 
- Remove BooleanConfig, BooleanConfigCommand, and BooleanDirective
- Make Flywheel.VERSION private so it cannot be changed
- Move createUpdateLimiter from FlwConfig to InstanceManager
 2022-02-01 20:44:53 -08:00
Jozufozu
9219fef20a Toggleable update limiting 
- Extract update limiting behavior to interface
 - Move original impl to BandedPrimeLimiter
 - Add dummy NonLimiter impl
 - Add command/config to toggle update limiting
 - Refactor InstanceManager to be more consistent between frame updates and tick updates
 - Bump version - 0.6.1
 2022-02-01 13:56:08 -08:00
Jozufozu
b403ca3d2b Pepper's catches 
- GlCompat now a singleton, doesn't need to be re-created
 - Fix crash with F3 open and backend off
 - Clear program spec map before loading
 - Merge FlywheelClient and Flywheel classes
 2022-02-01 12:46:47 -08:00
PepperCode1
c38d66e867 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	gradle.properties
	src/main/java/com/jozufozu/flywheel/Flywheel.java
	src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfig.java
	src/main/java/com/jozufozu/flywheel/config/BooleanConfigCommand.java
	src/main/java/com/jozufozu/flywheel/config/BooleanDirective.java
	src/main/java/com/jozufozu/flywheel/config/EngineArgument.java
	src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/resources/META-INF/mods.toml
 2022-01-31 18:18:24 -08:00
Jozufozu
a1791399b6 Un-remove getBackendDescriptor 
- No point in incorrectly inlining it
 - One useage was replaced by InstancedRenderDispatcher#getDebugString
 2022-01-31 13:26:55 -08:00
Jozufozu
24423c56a8 Add more debug info 
- Flywheel version
 - Vertex/Instance count
 - Origin coordinate for Instancing Engine
 2022-01-31 13:14:30 -08:00
Jozufozu
84432fb837
Add 0.6.0 to bug report template 2022-01-25 18:01:36 -08:00
Jozufozu
421e11ebc1
Create FUNDING.yml 2022-01-25 10:13:24 -08:00
Jozufozu
5a2de8095c Update changelog and document Translate#nudge 2022-01-25 10:12:08 -08:00
Jozufozu
c490d15876 Initial move to client commands. 
- Nothing fancy, just inlining packets.
 2022-01-24 10:46:17 -08:00
Jozufozu
2638e79aa2 Add accessor to BlockEntityRenderer map. 2022-01-18 13:44:28 -08:00
PepperCode1
eeab6543da Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
Conflicts:
	src/main/java/com/jozufozu/flywheel/FlywheelClient.java
	src/main/java/com/jozufozu/flywheel/backend/Backend.java
	src/main/java/com/jozufozu/flywheel/backend/Loader.java
	src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
	src/main/java/com/jozufozu/flywheel/event/GatherContextEvent.java
	src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
 2022-01-17 21:55:55 -08:00
Jozufozu
26ea6bd315 Bump version - 0.6.0 2022-01-17 18:26:28 -08:00
Jozufozu
1ad64c595c Merge branch '1.18/shader-sanity' into 1.18/dev 2022-01-17 16:56:39 -08:00
Jozufozu
bc55726da3 A fix and a refactor 
- ModelPools no longer undbind their buffer during construction, as state should be maintained externally
 - Call BufferUploader#reset at the end of renderChunkLayer to partially fix crash rendering contraptions
 - Remove Engine#getName, it was replaced by FlwEngine
 2022-01-17 16:19:18 -08:00
Jozufozu
ddf6383175
Merge pull request #98 from AeiouEnigma/1.18/fabric/dev 
merge forge branch
 2022-01-17 15:40:07 -08:00
Aeiou
80fb7cef05 Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev 
# Conflicts:
#	src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
 2022-01-13 21:16:21 -05:00
Jozufozu
b351baa824 Handle arbitrary numbers of GameStateProviders 
- Use bitset instead of long.
 - We only ever iterate over the GameStateProviders, so use a list instead of a map.
 - GameStateProviders don't need IDs.
 2022-01-13 15:58:51 -08:00
Jozufozu
298ca3e9f1 Reorganize and simplify 
- StructTypes no longer need to be registered
 - Move backend.source to core.source
 - Move GameStateRegistry to core
 - Backend is static again
 - Loader maintains state internally
 2022-01-12 21:25:03 -08:00
Jozufozu
a62bc66060 Better memoized shader compilation and global game state 
- Properly separate compilation of vertex and fragment shaders
 - Game state is no longer per-program
 - Needs organization
 2022-01-12 00:19:37 -08:00
Jozufozu
7d4055f263 More organized shader compilation 2022-01-11 13:17:55 -08:00
Jozufozu
e228427e72 Sodium compatibility 2022-01-10 15:08:02 -08:00
Jozufozu
2d63d8c7db Separate vertex and fragment shaders and templates 2022-01-10 14:38:26 -08:00
Jozufozu
12cab85f69 Merge branch '1.18/dev' into 1.18/shader-sanity 
# Conflicts:
#	src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
 2022-01-09 22:35:42 -08:00
PepperCode1
a76cd76c90 Fix build 2022-01-09 16:09:44 -08:00