Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
DiZhao
Viking Project
Commits
e7177d9c
Commit
e7177d9c
authored
Sep 19, 2019
by
cdmbillzhao
Browse files
upgrade to Unity 2019
parent
d1a51030
Pipeline
#100
failed with stages
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Assets/Standard Assets/Effects/AmbientOcclusion/AmbientOcclusion.cs
View file @
e7177d9c
...
...
@@ -20,7 +20,7 @@ namespace UnityStandardAssets.CinematicEffects
/// Checks if the ambient-only mode is supported under the current settings.
public
bool
isAmbientOnlySupported
{
get
{
return
targetCamera
.
hdr
&&
occlusionSource
==
OcclusionSource
.
GBuffer
;
}
get
{
return
targetCamera
.
allowHDR
&&
occlusionSource
==
OcclusionSource
.
GBuffer
;
}
}
/// Checks if the G-buffer is available
...
...
Assets/Standard Assets/Effects/Bloom/Editor/BloomEditor.cs
View file @
e7177d9c
...
...
@@ -17,7 +17,7 @@ namespace UnityStandardAssets.CinematicEffects
bool
CheckHdr
(
Bloom
target
)
{
var
camera
=
target
.
GetComponent
<
Camera
>();
return
camera
!=
null
&&
camera
.
hdr
;
return
camera
!=
null
&&
camera
.
allowHDR
;
}
void
OnEnable
()
...
...
Assets/Standard Assets/Effects/DepthOfField/DepthOfField.cs
View file @
e7177d9c
...
...
@@ -624,7 +624,7 @@ namespace UnityStandardAssets.CinematicEffects
textureBokehMaterial
.
SetTexture
(
m_MainTex
,
bokehTexture
.
texture
);
textureBokehMaterial
.
SetVector
(
m_Screen
,
new
Vector3
(
1f
/
(
1f
*
source
.
width
),
1f
/
(
1f
*
source
.
height
),
textureBokehMaxRadius
));
textureBokehMaterial
.
SetPass
((
int
)
BokehTexturesPasses
.
Apply
);
Graphics
.
DrawProceduralIndirect
(
MeshTopology
.
Points
,
computeBufferDrawArgs
,
0
);
Graphics
.
DrawProceduralIndirect
Now
(
MeshTopology
.
Points
,
computeBufferDrawArgs
,
0
);
Graphics
.
Blit
(
tmp
,
destination
);
// Hackaround for DX11 flipfun (OPTIMIZEME)
}
else
...
...
Assets/Standard Assets/Effects/ScreenSpaceReflection/ScreenSpaceReflection.cs
View file @
e7177d9c
...
...
@@ -371,7 +371,7 @@ namespace UnityStandardAssets.CinematicEffects
const
int
maxMip
=
5
;
RenderTextureFormat
intermediateFormat
=
camera_
.
hdr
?
RenderTextureFormat
.
ARGBHalf
:
RenderTextureFormat
.
ARGB32
;
RenderTextureFormat
intermediateFormat
=
camera_
.
allowHDR
?
RenderTextureFormat
.
ARGBHalf
:
RenderTextureFormat
.
ARGB32
;
material
.
SetInt
(
kRayStepSize
,
settings
.
reflectionSettings
.
stepSize
);
material
.
SetInt
(
kAdditiveReflection
,
settings
.
reflectionSettings
.
blendType
==
SSRReflectionBlendType
.
Additive
?
1
:
0
);
...
...
Assets/Standard Assets/Effects/TonemappingColorGrading/Editor/TonemappingColorGradingEditor.cs
View file @
e7177d9c
...
...
@@ -353,7 +353,7 @@ namespace UnityStandardAssets.CinematicEffects
{
Camera
camera
=
concreteTarget
.
GetComponent
<
Camera
>();
if
(
camera
!=
null
&&
!
camera
.
hdr
)
if
(
camera
!=
null
&&
!
camera
.
allowHDR
)
EditorGUILayout
.
HelpBox
(
"The camera is not HDR enabled. This will likely break the tonemapper."
,
MessageType
.
Warning
);
else
if
(!
concreteTarget
.
validRenderTextureFormat
)
EditorGUILayout
.
HelpBox
(
"The input to tonemapper is not in HDR. Make sure that all effects prior to this are executed in HDR."
,
MessageType
.
Warning
);
...
...
Packages/manifest.json
0 → 100644
View file @
e7177d9c
{
"dependencies"
:
{
"com.unity.collab-proxy"
:
"1.2.16"
,
"com.unity.ext.nunit"
:
"1.0.0"
,
"com.unity.ide.rider"
:
"1.1.0"
,
"com.unity.ide.vscode"
:
"1.1.0"
,
"com.unity.package-manager-ui"
:
"2.2.0"
,
"com.unity.test-framework"
:
"1.0.13"
,
"com.unity.textmeshpro"
:
"2.0.1"
,
"com.unity.timeline"
:
"1.1.0"
,
"com.unity.ugui"
:
"1.0.0"
,
"com.unity.modules.ai"
:
"1.0.0"
,
"com.unity.modules.androidjni"
:
"1.0.0"
,
"com.unity.modules.animation"
:
"1.0.0"
,
"com.unity.modules.assetbundle"
:
"1.0.0"
,
"com.unity.modules.audio"
:
"1.0.0"
,
"com.unity.modules.cloth"
:
"1.0.0"
,
"com.unity.modules.director"
:
"1.0.0"
,
"com.unity.modules.imageconversion"
:
"1.0.0"
,
"com.unity.modules.imgui"
:
"1.0.0"
,
"com.unity.modules.jsonserialize"
:
"1.0.0"
,
"com.unity.modules.particlesystem"
:
"1.0.0"
,
"com.unity.modules.physics"
:
"1.0.0"
,
"com.unity.modules.physics2d"
:
"1.0.0"
,
"com.unity.modules.screencapture"
:
"1.0.0"
,
"com.unity.modules.terrain"
:
"1.0.0"
,
"com.unity.modules.terrainphysics"
:
"1.0.0"
,
"com.unity.modules.tilemap"
:
"1.0.0"
,
"com.unity.modules.ui"
:
"1.0.0"
,
"com.unity.modules.uielements"
:
"1.0.0"
,
"com.unity.modules.umbra"
:
"1.0.0"
,
"com.unity.modules.unityanalytics"
:
"1.0.0"
,
"com.unity.modules.unitywebrequest"
:
"1.0.0"
,
"com.unity.modules.unitywebrequestassetbundle"
:
"1.0.0"
,
"com.unity.modules.unitywebrequestaudio"
:
"1.0.0"
,
"com.unity.modules.unitywebrequesttexture"
:
"1.0.0"
,
"com.unity.modules.unitywebrequestwww"
:
"1.0.0"
,
"com.unity.modules.vehicles"
:
"1.0.0"
,
"com.unity.modules.video"
:
"1.0.0"
,
"com.unity.modules.vr"
:
"1.0.0"
,
"com.unity.modules.wind"
:
"1.0.0"
,
"com.unity.modules.xr"
:
"1.0.0"
}
}
ProjectSettings/PresetManager.asset
0 → 100644
View file @
e7177d9c
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1386491679
&1
PresetManager
:
m_ObjectHideFlags
:
0
m_DefaultList
:
[]
ProjectSettings/ProjectVersion.txt
View file @
e7177d9c
m_EditorVersion: 5.6.0f3
m_EditorVersion: 2019.2.5f1
m_EditorVersionWithRevision: 2019.2.5f1 (9dace1eed4cc)
ProjectSettings/VFXManager.asset
0 → 100644
View file @
e7177d9c
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!937362698
&1
VFXManager
:
m_ObjectHideFlags
:
0
m_IndirectShader
:
{
fileID
:
0
}
m_CopyBufferShader
:
{
fileID
:
0
}
m_SortShader
:
{
fileID
:
0
}
m_RenderPipeSettingsPath
:
m_FixedTimeStep
:
0.016666668
m_MaxDeltaTime
:
0.05
ProjectSettings/XRSettings.asset
0 → 100644
View file @
e7177d9c
{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
],
"m_SettingValues": [
"False",
"False"
]
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment