diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 4b816af..73d4929 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
]
},
"unofficial.Urho3DNet.Editor": {
- "version": "0.3.7.805",
+ "version": "0.3.7.810",
"commands": [
"rbfx"
]
diff --git a/Content/Common/Data/Objects/Link.prefab b/Content/Common/Data/Objects/Link.prefab
index 4d71cdc..06cff71 100644
--- a/Content/Common/Data/Objects/Link.prefab
+++ b/Content/Common/Data/Objects/Link.prefab
@@ -4,7 +4,220 @@
"_typeName": "Octree"
},
{
- "_typeName": "RenderPipeline"
+ "_typeName": "RenderPipeline",
+ "attributes": [
+ {
+ "name": "Render Passes",
+ "type": "VariantVector",
+ "value": [
+ {
+ "type": "String",
+ "value": "Postprocess: Exposure"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: SSAO"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Bloom"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Draw Outlines"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Tone Mapping"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Adjust Color"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: FXAA v2"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: FXAA v3"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ }
+ ]
+ },
+ {
+ "name": "Render Path Parameters",
+ "type": "StringVariantMap",
+ "value": [
+ {
+ "key": "SSAO: Near Distance",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Exposure: Adapt Rate",
+ "type": "Float",
+ "value": 0.6000000238418579
+ },
+ {
+ "key": "Exposure: Min",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Max Brightness",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "SSAO: Normal Threshold",
+ "type": "Float",
+ "value": 0.20000000298023225
+ },
+ {
+ "key": "SSAO: Near Radius",
+ "type": "Float",
+ "value": 0.05000000074505806
+ },
+ {
+ "key": "SSAO: Strength",
+ "type": "Float",
+ "value": 0.699999988079071
+ },
+ {
+ "key": "Adjust Color: HSVParams",
+ "type": "Vector4",
+ "value": "1 1 1 1"
+ },
+ {
+ "key": "SSAO: End Fade Distance",
+ "type": "Float",
+ "value": 200.0
+ },
+ {
+ "key": "Exposure: Automatic",
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "key": "Tone Mapping: Mode@",
+ "type": "StringVector",
+ "value": [
+ "None",
+ "Reinhard",
+ "ReinhardWhite",
+ "Uncharted2"
+ ]
+ },
+ {
+ "key": "SSAO: Begin Fade Distance",
+ "type": "Float",
+ "value": 100.0
+ },
+ {
+ "key": "Adjust Color: ColorOffset",
+ "type": "Vector4",
+ "value": "0 0 0 0"
+ },
+ {
+ "key": "Bloom: Base Intensity",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Iteration Intensity Factor",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Min Brightness",
+ "type": "Float",
+ "value": 0.800000011920929
+ },
+ {
+ "key": "SSAO: Depth Threshold",
+ "type": "Float",
+ "value": 0.10000000149011612
+ },
+ {
+ "key": "SSAO: Far Distance",
+ "type": "Float",
+ "value": 100.0
+ },
+ {
+ "key": "SSAO: Downscale",
+ "type": "Int",
+ "value": 0
+ },
+ {
+ "key": "Exposure: Max",
+ "type": "Float",
+ "value": 3.0
+ },
+ {
+ "key": "Adjust Color: ColorFilter",
+ "type": "Vector4",
+ "value": "1 1 1 1"
+ },
+ {
+ "key": "SSAO: Exponent",
+ "type": "Float",
+ "value": 1.5
+ },
+ {
+ "key": "FXAA: FXAAParams",
+ "type": "Vector3",
+ "value": "0.4 0.5 0.75"
+ },
+ {
+ "key": "SSAO: Far Radius",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Num Iterations",
+ "type": "Int",
+ "value": 5
+ },
+ {
+ "key": "Tone Mapping: Mode",
+ "type": "Int",
+ "value": 0
+ }
+ ]
+ }
+ ]
},
{
"_typeName": "ReflectionProbeManager"
diff --git a/Content/Common/Data/Objects/Tile.prefab b/Content/Common/Data/Objects/Tile.prefab
index 726e989..24d693d 100644
--- a/Content/Common/Data/Objects/Tile.prefab
+++ b/Content/Common/Data/Objects/Tile.prefab
@@ -7,7 +7,220 @@
"_typeName": "PhysicsWorld"
},
{
- "_typeName": "RenderPipeline"
+ "_typeName": "RenderPipeline",
+ "attributes": [
+ {
+ "name": "Render Passes",
+ "type": "VariantVector",
+ "value": [
+ {
+ "type": "String",
+ "value": "Postprocess: Exposure"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: SSAO"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Bloom"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Draw Outlines"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Tone Mapping"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: Adjust Color"
+ },
+ {
+ "type": "Bool",
+ "value": true
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: FXAA v2"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "type": "String",
+ "value": "Postprocess: FXAA v3"
+ },
+ {
+ "type": "Bool",
+ "value": false
+ }
+ ]
+ },
+ {
+ "name": "Render Path Parameters",
+ "type": "StringVariantMap",
+ "value": [
+ {
+ "key": "SSAO: Near Distance",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Exposure: Adapt Rate",
+ "type": "Float",
+ "value": 0.6000000238418579
+ },
+ {
+ "key": "Exposure: Min",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Max Brightness",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "SSAO: Normal Threshold",
+ "type": "Float",
+ "value": 0.20000000298023225
+ },
+ {
+ "key": "SSAO: Near Radius",
+ "type": "Float",
+ "value": 0.05000000074505806
+ },
+ {
+ "key": "SSAO: Strength",
+ "type": "Float",
+ "value": 0.699999988079071
+ },
+ {
+ "key": "Adjust Color: HSVParams",
+ "type": "Vector4",
+ "value": "1 1 1 1"
+ },
+ {
+ "key": "SSAO: End Fade Distance",
+ "type": "Float",
+ "value": 200.0
+ },
+ {
+ "key": "Exposure: Automatic",
+ "type": "Bool",
+ "value": false
+ },
+ {
+ "key": "Tone Mapping: Mode@",
+ "type": "StringVector",
+ "value": [
+ "None",
+ "Reinhard",
+ "ReinhardWhite",
+ "Uncharted2"
+ ]
+ },
+ {
+ "key": "SSAO: Begin Fade Distance",
+ "type": "Float",
+ "value": 100.0
+ },
+ {
+ "key": "Adjust Color: ColorOffset",
+ "type": "Vector4",
+ "value": "0 0 0 0"
+ },
+ {
+ "key": "Bloom: Base Intensity",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Iteration Intensity Factor",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Min Brightness",
+ "type": "Float",
+ "value": 0.800000011920929
+ },
+ {
+ "key": "SSAO: Depth Threshold",
+ "type": "Float",
+ "value": 0.10000000149011612
+ },
+ {
+ "key": "SSAO: Far Distance",
+ "type": "Float",
+ "value": 100.0
+ },
+ {
+ "key": "SSAO: Downscale",
+ "type": "Int",
+ "value": 0
+ },
+ {
+ "key": "Exposure: Max",
+ "type": "Float",
+ "value": 3.0
+ },
+ {
+ "key": "Adjust Color: ColorFilter",
+ "type": "Vector4",
+ "value": "1 1 1 1"
+ },
+ {
+ "key": "SSAO: Exponent",
+ "type": "Float",
+ "value": 1.5
+ },
+ {
+ "key": "FXAA: FXAAParams",
+ "type": "Vector3",
+ "value": "0.4 0.5 0.75"
+ },
+ {
+ "key": "SSAO: Far Radius",
+ "type": "Float",
+ "value": 1.0
+ },
+ {
+ "key": "Bloom: Num Iterations",
+ "type": "Int",
+ "value": 5
+ },
+ {
+ "key": "Tone Mapping: Mode",
+ "type": "Int",
+ "value": 0
+ }
+ ]
+ }
+ ]
},
{
"_typeName": "ReflectionProbeManager"
diff --git a/Content/Common/Data/Scenes/Scene.scene b/Content/Common/Data/Scenes/Scene.scene
index 8bf270e..23b338a 100644
--- a/Content/Common/Data/Scenes/Scene.scene
+++ b/Content/Common/Data/Scenes/Scene.scene
@@ -8,9 +8,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -21,7 +77,7 @@
-
+
@@ -73,7 +129,7 @@
-
+
@@ -82,12 +138,11 @@
-
+
-
diff --git a/Directory.Build.props b/Directory.Build.props
index 6da472a..b47b97e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
- 0.3.7.805
+ 0.3.7.810
\ No newline at end of file
diff --git a/RbfxTemplate/GameSettings.cs b/RbfxTemplate/GameSettings.cs
index 2f160e7..f576c4c 100644
--- a/RbfxTemplate/GameSettings.cs
+++ b/RbfxTemplate/GameSettings.cs
@@ -12,8 +12,6 @@ public class GameSettings
private static readonly string SOUND_EFFECT = "Effect";
- //static readonly string SOUND_AMBIENT = "Ambient";
- //static readonly string SOUND_VOICE = "Voice";
private static readonly string SOUND_MUSIC = "Music";
///
diff --git a/RbfxTemplate/UrhoApplication.cs b/RbfxTemplate/UrhoApplication.cs
index ff5ddfa..6018c53 100644
--- a/RbfxTemplate/UrhoApplication.cs
+++ b/RbfxTemplate/UrhoApplication.cs
@@ -15,10 +15,12 @@ public class UrhoApplication : Application
///
private SharedPtr _pluginApplication;
+#if DEBUG
///
/// Safe pointer to debug HUD.
///
private SharedPtr _debugHud;
+#endif
public UrhoApplication(Context context) : base(context)
{
@@ -85,7 +87,6 @@ private void ApplyCommandLineArguments()
}
}
-
///
/// Start application.
///
@@ -129,8 +130,10 @@ private void OnLogMessage(VariantMap args)
var logLevel = (LogLevel)args[E.LogMessage.Level].Int;
switch (logLevel)
{
+#if DEBUG
case LogLevel.LogError:
throw new ApplicationException(args[E.LogMessage.Message].String);
+#endif
default:
Debug.WriteLine(args[E.LogMessage.Message].String);
break;