Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest features from CatDogEngine/CatDogEngine #489

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open

Merge latest features from CatDogEngine/CatDogEngine #489

wants to merge 49 commits into from

Conversation

T-rvw
Copy link
Contributor

@T-rvw T-rvw commented Mar 10, 2024

No description provided.

@T-rvw T-rvw changed the title NPR Render Based On UTS Merge latest features from CatDogEngine/CatDogEngine Mar 12, 2024
roeas and others added 19 commits March 13, 2024 14:56
@roeas
Minor refine (#4)
c01ef2d 
* Fix default cel material bug

* Optimize cartoon renderer and shader

* Add ibl strength uniform for terrain renderer
@OVOAOVO
Merge branch 'main' into Ribbon
ac95807
@OVOAOVO
cs Ribbon(no texture)
118681f
@OVOAOVO
cs Ribbon (fixed texture color)
b4eb790
@OVOAOVO
Add Materialcomponent Uber shader
c61f325
@T-rvw
fix null material import
dabfd1a
@T-rvw
Merge https://github.com/CatDogEngine/CatDogEngine into integrate_fbx…
a4ad982 
…_workflows
@T-rvw
fix release post build
cf24d5d
@T-rvw
minor fix
a19e317
@T-rvw
Integrate fbx producer/consumer
18b8ac0 
Integrate fbx producer/consumer
@roeas
Shader resource (#5)
bd32f5a
@OVOAOVO
update AssetPipeline
f327f6e
@OVOAOVO
AssetPipeline conflict
45ff69d
@OVOAOVO
conflict fix
4c6694e
@roeas
uber vertex shader (#8)
2d6e17c
@OVOAOVO
merged main
e49be18
@OVOAOVO
Merge branch 'main' of https://github.com/CatDogEngine/CatDogEngine
962d7db
@OVOAOVO
Merge branch 'main' into Ribbon
30d0faa
@OVOAOVO
vs shader feature
3619462
OVOAOVO and others added 2 commits April 1, 2024 15:48
@OVOAOVO
Fixed Ribbon Count
5ab835d 
Separate different vertexbuffers and indexbuffers into different Components.
@roeas
Visibility functions with different levels of exactness. (#9)
a0eef0f
roeas and others added 18 commits April 6, 2024 14:29
@roeas
Delete obsolete compiled uber shader file. (#11)
74230b1
@roeas
PBR reflectance parameter (#10)
2320dfa
@roeas
Ues std::format instead of bundled fmt for spdlog. (#12)
c2d4c2f
@roeas
Low-precision pow approximation (#15)
cf1a754
@roeas
IBL minor adjustments (#14)
0e33e7e
@roeas
Optimize Path::Join by fold expression (#16)
02c121c
@roeas
Fix "Use texture" checkbox crash bug (#17)
69100f2
@VTui22
add skeleton resource (#13)
98e53d5 
* add skeleton resource and animation
@VTui22
merge Skeleton resource (#18)
93422a4 
* merge Skeleton resource
@VTui22
add pbr and ibl demo and add light shadow switch (#19)
7c5babd 
* add pbr and ibl demo and add light shadow switch
@OVOAOVO
AssetPipline update
2af93aa
@OVOAOVO
Merge branch 'main' of https://github.com/CatDogEngine/CatDogEngine
42f9f9c
@OVOAOVO
update AssetPipline
9c27e06
@OVOAOVO
Merge branch 'main' into Ribbon
c9db3b3
@VTui22
fix generic producer and free skeleton resource
8cdf767
@T-rvw
Fix generic producer and skeleton resource memory free
67d1abd
@T-rvw
Add Ribbon Particle
c1ffb47
@roeas
Update spdlog and use bundled fmt (#27)
a03b19b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@T-rvw @OVOAOVO @VTui22 @roeas