Skip to content

Commit 6fb2463

Browse files
committed
Add temporary commit for MSAA case
1 parent 6279f40 commit 6fb2463

File tree

3 files changed

+131
-20
lines changed

3 files changed

+131
-20
lines changed

crest/Assets/Crest/Crest-Examples/Main/Scenes/main.unity

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,51 @@ NavMeshSettings:
112112
debug:
113113
m_Flags: 0
114114
m_NavMeshData: {fileID: 0}
115+
--- !u!1 &371965536
116+
GameObject:
117+
m_ObjectHideFlags: 0
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
serializedVersion: 6
122+
m_Component:
123+
- component: {fileID: 371965538}
124+
- component: {fileID: 371965537}
125+
m_Layer: 0
126+
m_Name: Resolution
127+
m_TagString: Untagged
128+
m_Icon: {fileID: 0}
129+
m_NavMeshLayer: 0
130+
m_StaticEditorFlags: 0
131+
m_IsActive: 1
132+
--- !u!114 &371965537
133+
MonoBehaviour:
134+
m_ObjectHideFlags: 0
135+
m_CorrespondingSourceObject: {fileID: 0}
136+
m_PrefabInstance: {fileID: 0}
137+
m_PrefabAsset: {fileID: 0}
138+
m_GameObject: {fileID: 371965536}
139+
m_Enabled: 1
140+
m_EditorHideFlags: 0
141+
m_Script: {fileID: 11500000, guid: 0178a4fb34bf447508b9da9d94866cdd, type: 3}
142+
m_Name:
143+
m_EditorClassIdentifier:
144+
_ScreenWidth: 0
145+
_ScreenHeight: 0
146+
--- !u!4 &371965538
147+
Transform:
148+
m_ObjectHideFlags: 0
149+
m_CorrespondingSourceObject: {fileID: 0}
150+
m_PrefabInstance: {fileID: 0}
151+
m_PrefabAsset: {fileID: 0}
152+
m_GameObject: {fileID: 371965536}
153+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
154+
m_LocalPosition: {x: 0, y: 0, z: 0}
155+
m_LocalScale: {x: 1, y: 1, z: 1}
156+
m_Children: []
157+
m_Father: {fileID: 0}
158+
m_RootOrder: 1
159+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
115160
--- !u!1001 &1030721467
116161
PrefabInstance:
117162
m_ObjectHideFlags: 0
@@ -179,5 +224,65 @@ PrefabInstance:
179224
propertyPath: m_LocalEulerAnglesHint.z
180225
value: 0
181226
objectReference: {fileID: 0}
227+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
228+
type: 3}
229+
propertyPath: m_LocalRotation.x
230+
value: 0.064114094
231+
objectReference: {fileID: 0}
232+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
233+
type: 3}
234+
propertyPath: m_LocalRotation.y
235+
value: 0.7237354
236+
objectReference: {fileID: 0}
237+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
238+
type: 3}
239+
propertyPath: m_LocalRotation.z
240+
value: -0.06786515
241+
objectReference: {fileID: 0}
242+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
243+
type: 3}
244+
propertyPath: m_LocalRotation.w
245+
value: 0.683733
246+
objectReference: {fileID: 0}
247+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
248+
type: 3}
249+
propertyPath: m_LocalPosition.x
250+
value: 8.09663
251+
objectReference: {fileID: 0}
252+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
253+
type: 3}
254+
propertyPath: m_LocalPosition.y
255+
value: 40.10325
256+
objectReference: {fileID: 0}
257+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
258+
type: 3}
259+
propertyPath: m_LocalPosition.z
260+
value: 162.6759
261+
objectReference: {fileID: 0}
262+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
263+
type: 3}
264+
propertyPath: m_LocalEulerAnglesHint.x
265+
value: 10.714
266+
objectReference: {fileID: 0}
267+
- target: {fileID: 8463273387121746141, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
268+
type: 3}
269+
propertyPath: m_LocalEulerAnglesHint.y
270+
value: 93.256
271+
objectReference: {fileID: 0}
272+
- target: {fileID: 8066748594655780890, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
273+
type: 3}
274+
propertyPath: _lodDataResolution
275+
value: 256
276+
objectReference: {fileID: 0}
277+
- target: {fileID: 8463273387121746142, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
278+
type: 3}
279+
propertyPath: m_AllowMSAA
280+
value: 1
281+
objectReference: {fileID: 0}
282+
- target: {fileID: 6721184188249843587, guid: ddf71bfb72c45407fb8cea42d3aaeac4,
283+
type: 3}
284+
propertyPath: m_Enabled
285+
value: 0
286+
objectReference: {fileID: 0}
182287
m_RemovedComponents: []
183288
m_SourcePrefab: {fileID: 100100000, guid: ddf71bfb72c45407fb8cea42d3aaeac4, type: 3}

crest/Assets/Crest/Crest/Materials/Ocean-Underwater.mat

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Ocean-Underwater
1111
m_Shader: {fileID: 4800000, guid: 668aecf91371c8b4997e42c0c7b19527, type: 3}
12-
m_ShaderKeywords: _APPLYNORMALMAPPING_ON _CAUSTICS_ON _CLIPSURFACE_ON _COMPUTEDIRECTIONALLIGHT_ON
13-
_DEBUGMULTIPLYBYLIGHT0COLOR_ON _DIRECTIONALLIGHTVARYROUGHNESS_ON _FOAM3DLIGHTING_ON
14-
_FOAM_ON _SHADOWS_ON _SUBSURFACEHEIGHTLERP_ON _SUBSURFACESCATTERING_ON _SUBSURFACESHALLOWCOLOUR_ON
15-
_TRANSPARENCY_ON _UNDERWATER_ON
12+
m_ShaderKeywords: _DEBUGMULTIPLYBYLIGHT0COLOR_ON _DIRECTIONALLIGHTVARYROUGHNESS_ON
13+
_FOAM_ON _SUBSURFACEHEIGHTLERP_ON
1614
m_LightmapFlags: 5
1715
m_EnableInstancingVariants: 0
1816
m_DoubleSidedGI: 0
@@ -80,9 +78,9 @@ Material:
8078
m_Offset: {x: 0, y: 0}
8179
m_Floats:
8280
- _ApplyFlowToNormals: 0
83-
- _ApplyNormalMapping: 1
81+
- _ApplyNormalMapping: 0
8482
- _BumpAmt: 0.514
85-
- _Caustics: 1
83+
- _Caustics: 0
8684
- _CausticsBase: 0.07
8785
- _CausticsBias: 0.7
8886
- _CausticsDepthOfField: 0.33
@@ -92,9 +90,9 @@ Material:
9290
- _CausticsStrength: 3.2
9391
- _CausticsTextureAverage: 0.07
9492
- _CausticsTextureScale: 5
95-
- _ClipSurface: 1
93+
- _ClipSurface: 0
9694
- _CompileShaderWithDebugInfo: 0
97-
- _ComputeDirectionalLight: 1
95+
- _ComputeDirectionalLight: 0
9896
- _CullMode: 0
9997
- _DebugDisableMultiplyByLight0Color: 0
10098
- _DebugDisableShapeTextures: 0
@@ -110,30 +108,32 @@ Material:
110108
- _DirectionalLightVaryRoughness: 1
111109
- _Flow: 0
112110
- _Foam: 1
113-
- _Foam3DLighting: 1
111+
- _Foam3DLighting: 0
114112
- _FoamBubbleParallax: 0.14
115113
- _FoamScale: 10
116114
- _ForceUnderwater: 0
117-
- _FresnelPower: 5
115+
- _FresnelPower: 20
118116
- _Invert: 1
119117
- _MipBias: 0
120118
- _Moving: 0.17
121119
- _NormalsScale: 40
122120
- _NormalsStrength: 0.36
123121
- _Offset: 0.00008
124122
- _OverrideReflectionCubemap: 0
123+
- _PlanarReflectionIntensity: 1
125124
- _PlanarReflectionNormalsStrength: 1
126125
- _PlanarReflections: 0
127126
- _ProceduralSky: 0
128127
- _RefractAmt: 0
129128
- _RefractionStrength: 1
130-
- _RefractiveIndexOfAir: 1.2
131-
- _RefractiveIndexOfWater: 1.333
129+
- _RefractiveIndexOfAir: 1
130+
- _RefractiveIndexOfWater: 1
131+
- _Roughness: 0
132132
- _S: 1
133-
- _Shadows: 1
133+
- _Shadows: 0
134134
- _ShorelineFoamMinDepth: 0.27
135135
- _SkyDirectionality: 0.875
136-
- _Specular: 1
136+
- _Specular: 0
137137
- _StartLevel: 0.157
138138
- _StencilFunction: 0
139139
- _SubSurfaceBase: 1.04
@@ -142,14 +142,14 @@ Material:
142142
- _SubSurfaceHeightLerp: 1
143143
- _SubSurfaceHeightMax: 24.9
144144
- _SubSurfaceHeightPower: 1.68
145-
- _SubSurfaceScattering: 1
146-
- _SubSurfaceShallowColour: 1
145+
- _SubSurfaceScattering: 0
146+
- _SubSurfaceShallowColour: 0
147147
- _SubSurfaceSun: 4.46
148148
- _SubSurfaceSunFallOff: 5.26
149149
- _TexelSize: 0.125
150150
- _TextureRes: 1024
151-
- _Transparency: 1
152-
- _Underwater: 1
151+
- _Transparency: 0
152+
- _Underwater: 0
153153
- _Update: 0.083
154154
- _WaveFoamBubblesCoverage: 1.68
155155
- _WaveFoamBubblesFeather: 0.32
@@ -176,6 +176,6 @@ Material:
176176
- _SkyTowardsSun: {r: 2.6390157, g: 1.8217498, b: 0.9236555, a: 1}
177177
- _SubSurface: {r: 0, g: 0.48, b: 0.36, a: 1}
178178
- _SubSurfaceColour: {r: 0.10196078, g: 0.57254905, b: 0.5256646, a: 1}
179-
- _SubSurfaceShallowCol: {r: 0.552, g: 1, b: 1, a: 1}
179+
- _SubSurfaceShallowCol: {r: 1, g: 0, b: 0, a: 1}
180180
- _SubSurfaceShallowColShadow: {r: 0.14417942, g: 0.2264151, b: 0.21173015, a: 1}
181181
- _SubSurfaceShallowColour: {r: 0.41999996, g: 0.75, b: 0.69, a: 1}

crest/ProjectSettings/QualitySettings.asset

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ QualitySettings:
3838
particleRaycastBudget: 4
3939
asyncUploadTimeSlice: 2
4040
asyncUploadBufferSize: 4
41+
asyncUploadPersistentBuffer: 1
4142
resolutionScalingFixedDPIFactor: 1
4243
excludedTargetPlatforms: []
4344
- serializedVersion: 2
@@ -72,6 +73,7 @@ QualitySettings:
7273
particleRaycastBudget: 16
7374
asyncUploadTimeSlice: 2
7475
asyncUploadBufferSize: 4
76+
asyncUploadPersistentBuffer: 1
7577
resolutionScalingFixedDPIFactor: 1
7678
excludedTargetPlatforms: []
7779
- serializedVersion: 2
@@ -106,6 +108,7 @@ QualitySettings:
106108
particleRaycastBudget: 64
107109
asyncUploadTimeSlice: 2
108110
asyncUploadBufferSize: 4
111+
asyncUploadPersistentBuffer: 1
109112
resolutionScalingFixedDPIFactor: 1
110113
excludedTargetPlatforms: []
111114
- serializedVersion: 2
@@ -140,6 +143,7 @@ QualitySettings:
140143
particleRaycastBudget: 256
141144
asyncUploadTimeSlice: 2
142145
asyncUploadBufferSize: 4
146+
asyncUploadPersistentBuffer: 1
143147
resolutionScalingFixedDPIFactor: 1
144148
excludedTargetPlatforms: []
145149
- serializedVersion: 2
@@ -174,6 +178,7 @@ QualitySettings:
174178
particleRaycastBudget: 1024
175179
asyncUploadTimeSlice: 2
176180
asyncUploadBufferSize: 4
181+
asyncUploadPersistentBuffer: 1
177182
resolutionScalingFixedDPIFactor: 1
178183
excludedTargetPlatforms: []
179184
- serializedVersion: 2
@@ -191,7 +196,7 @@ QualitySettings:
191196
blendWeights: 4
192197
textureQuality: 0
193198
anisotropicTextures: 2
194-
antiAliasing: 2
199+
antiAliasing: 8
195200
softParticles: 1
196201
softVegetation: 1
197202
realtimeReflectionProbes: 1
@@ -208,6 +213,7 @@ QualitySettings:
208213
particleRaycastBudget: 4096
209214
asyncUploadTimeSlice: 2
210215
asyncUploadBufferSize: 4
216+
asyncUploadPersistentBuffer: 1
211217
resolutionScalingFixedDPIFactor: 1
212218
excludedTargetPlatforms: []
213219
m_PerPlatformDefaultQuality:

0 commit comments

Comments
 (0)