Arnaud Carre
|
3c290788
|
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
|
8 年前 |
|
Arnaud Carre
|
89d05b25
|
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
|
8 年前 |
|
Arnaud Carre
|
957ab9d6
|
minor change to lightprobe scene to find shader bug (different shader is used with slow & fast path)
|
8 年前 |
Arnaud Carré arnaud@unity3d.com
|
42817ad5
|
remove shadows from lightprobe scene
|
8 年前 |
|
Arnaud Carré arnaud@unity3d.com
|
ca6b7f62
|
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
|
8 年前 |
|
Arnaud Carre
|
e0c0338a
|
update lightprobe scene to test PerMaterial persistent buffer (all materials has different _BaseColor)
|
8 年前 |
|
Arnaud Carre
|
bfff24ea
|
fix some scenes (too many point lights for 4096*4096 lightmap)
|
8 年前 |
|
Arnaud Carre
|
2cdff1ec
|
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
|
8 年前 |
|
Arnaud Carre
|
ba4e7090
|
added new scene to test reflection probes
|
8 年前 |
|
Arnaud Carre
|
a47440e8
|
added new scene to test Probe Proxy Volumes
|
8 年前 |
|
Arnaud Carre
|
7500d3c2
|
add a new scene for fast batch, using light probes only
|
8 年前 |
|
Arnaud Carre
|
c6cc77c0
|
added bench scene with many objects using lightmaps & light probes
|
8 年前 |
|
Arnaud Carre
|
05fd006e
|
HDTest scene for fast batch rendering
|
8 年前 |
|
Arnaud Carre
|
cd5ffc43
|
SRP merge fix
|
8 年前 |
|
Arnaud Carre
|
66610d8f
|
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
|
8 年前 |
|
Arnaud Carre
|
0e9c9040
|
add a new shader using 8 textures layers
|
8 年前 |
|
Arnaud Carre
|
27f56cfc
|
adding layers to inc number of object for test scene
|
8 年前 |
|
Arnaud Carre
|
04331827
|
cleanup
|
8 年前 |
|
Arnaud Carre
|
70fade03
|
adding random texture to each object of the test scene
|
8 年前 |
|
Arnaud Carre
|
f800dd4e
|
added multiple geometries to new batchrenderer scene
|
8 年前 |
|
Arnaud Carré arnaud@unity3d.com
|
bb47b0ed
|
change the material color to new persistent uniform buffer
|
8 年前 |
|
Arnaud Carré arnaud@unity3d.com
|
2913ae51
|
now fastbatch shader use fixed bind slot 0, and UnityPerDraw too (changed in UnityShaderVariables.cginc )
|
8 年前 |
|
Arnaud Carre
|
34440083
|
simplify vertex shader a bit
|
8 年前 |
|
Arnaud Carre
|
a98e1734
|
simplify shader to hell and ability to have one material per scene or per object
|
8 年前 |
|
Arnaud Carre
|
e81123d0
|
added scene populated to a large grid of capsules
|
8 年前 |
arnaudcarre
|
d4b4b0be
|
dupplicate BasicRenderLoopTutorial renderloop to make various tests about batching
|
8 年前 |
