diff --git a/Content/Materials/ClipMaterial.flax b/Content/Materials/ClipMaterial.flax index 723fec2..c4da78f 100644 Binary files a/Content/Materials/ClipMaterial.flax and b/Content/Materials/ClipMaterial.flax differ diff --git a/Content/Materials/SimpleMapMaterial.flax b/Content/Materials/SimpleMapMaterial.flax index d1a12e4..f4d4260 100644 Binary files a/Content/Materials/SimpleMapMaterial.flax and b/Content/Materials/SimpleMapMaterial.flax differ diff --git a/Content/Materials/SkyMaterial.flax b/Content/Materials/SkyMaterial.flax new file mode 100644 index 0000000..1481272 Binary files /dev/null and b/Content/Materials/SkyMaterial.flax differ diff --git a/Content/TestMat.flax b/Content/Materials/ViewModelMaterial.flax similarity index 100% rename from Content/TestMat.flax rename to Content/Materials/ViewModelMaterial.flax diff --git a/Content/Materials/WeaponMaterial.flax b/Content/Materials/WeaponMaterial.flax index a97bcac..50df83c 100644 Binary files a/Content/Materials/WeaponMaterial.flax and b/Content/Materials/WeaponMaterial.flax differ diff --git a/Content/Materials/common/clip.flax b/Content/Materials/common/clip.flax index bf2fc1b..d1b7341 100644 Binary files a/Content/Materials/common/clip.flax and b/Content/Materials/common/clip.flax differ diff --git a/Content/Materials/dev/dev_128_blue.flax b/Content/Materials/dev/dev_128_blue.flax new file mode 100644 index 0000000..fec9105 Binary files /dev/null and b/Content/Materials/dev/dev_128_blue.flax differ diff --git a/Content/Materials/dev/dev_128_green.flax b/Content/Materials/dev/dev_128_green.flax new file mode 100644 index 0000000..d866e11 Binary files /dev/null and b/Content/Materials/dev/dev_128_green.flax differ diff --git a/Content/Materials/dev/dev_128_lightgray.flax b/Content/Materials/dev/dev_128_lightgray.flax new file mode 100644 index 0000000..3aef058 Binary files /dev/null and b/Content/Materials/dev/dev_128_lightgray.flax differ diff --git a/Content/Materials/dev/dev_128_white.flax b/Content/Materials/dev/dev_128_white.flax new file mode 100644 index 0000000..368004c Binary files /dev/null and b/Content/Materials/dev/dev_128_white.flax differ diff --git a/Content/Materials/dev/dev_128_yellow.flax b/Content/Materials/dev/dev_128_yellow.flax new file mode 100644 index 0000000..b90a047 Binary files /dev/null and b/Content/Materials/dev/dev_128_yellow.flax differ diff --git a/Content/Materials/missing.flax b/Content/Materials/missing.flax index 8447ed2..cacfde0 100644 Binary files a/Content/Materials/missing.flax and b/Content/Materials/missing.flax differ diff --git a/Content/Materials/sky/skynight1.flax b/Content/Materials/sky/skynight1.flax index f00e5d3..179565e 100644 Binary files a/Content/Materials/sky/skynight1.flax and b/Content/Materials/sky/skynight1.flax differ diff --git a/Content/Materials/testo.flax b/Content/Materials/testo.flax new file mode 100644 index 0000000..db02419 Binary files /dev/null and b/Content/Materials/testo.flax differ diff --git a/Content/Scenes/MainScene.scene b/Content/Scenes/MainScene.scene index cb4b229..8dd3568 100644 --- a/Content/Scenes/MainScene.scene +++ b/Content/Scenes/MainScene.scene @@ -23,7 +23,9 @@ "ParentID": "194e05f445ece24ec5448d886e1334df", "V": { "mapPath": "C:\\dev\\GoakeFlax\\Assets\\Maps\\aerowalk.map", - "importLights": true + "importLights": true, + "BrightnessMultiplier": 0.8227397, + "LightRadiusMultiplier": 9.458821 } }, { @@ -47,12 +49,14 @@ "ParentID": "ff6b6db54b5aa08e7286ef86246149ef", "Transform": { "Translation": { - "X": 1355.0, - "Y": 730.0, + "X": 1264.0, + "Y": 802.0, "Z": 0.0 } }, - "Data": {} + "Data": { + "Text": "900899 tris\n 500 drawcalls\n15fps" +} }, { "ID": "35b34b0c4476f0ed43aa8fb4d5f2eebc", @@ -170,8 +174,7 @@ "IsBounded": false, "Settings": { "AO": { - "OverrideFlags": 12, - "Enabled": false, + "OverrideFlags": 13, "Power": 0.5, "Radius": 0.5 }, @@ -209,27 +212,6 @@ }, "PostFxMaterials": {} } - }, - { - "ID": "fc79615444d89ee2d290a295e1ad8004", - "TypeName": "FlaxEngine.SkyLight", - "ParentID": "194e05f445ece24ec5448d886e1334df", - "Name": "SkyLight", - "Transform": { - "Translation": { - "X": 23.04454803466797, - "Y": 0.0, - "Z": -36.84918212890625 - } - }, - "Layer": 1, - "Brightness": 0.6000000238418579, - "AdditiveColor": { - "R": 1.0, - "G": 1.0, - "B": 1.0, - "A": 1.0 - } } ] } \ No newline at end of file diff --git a/Content/Settings/EngineSettings/GraphicsSettings.json b/Content/Settings/EngineSettings/GraphicsSettings.json index b32e429..4bd5050 100644 --- a/Content/Settings/EngineSettings/GraphicsSettings.json +++ b/Content/Settings/EngineSettings/GraphicsSettings.json @@ -1,7 +1,7 @@ { "ID": "f94d5aae457aeba67033a8a4ca753214", "TypeName": "FlaxEditor.Content.Settings.GraphicsSettings", - "EngineBuild": 6216, + "EngineBuild": 6332, "Data": { "UseVSync": false, "AAQuality": 3, @@ -10,6 +10,7 @@ "VolumetricFogQuality": 3, "ShadowsQuality": 3, "ShadowMapsQuality": 3, - "AllowCSMBlending": true + "AllowCSMBlending": true, + "GenerateSDFOnModelImport": true } } \ No newline at end of file diff --git a/Content/Settings/EngineSettings/TimeSettings.json b/Content/Settings/EngineSettings/TimeSettings.json index 0b44d8b..d36b456 100644 --- a/Content/Settings/EngineSettings/TimeSettings.json +++ b/Content/Settings/EngineSettings/TimeSettings.json @@ -1,7 +1,7 @@ { "ID": "a55dc3c04da4ea3744b7f1994565beac", "TypeName": "FlaxEditor.Content.Settings.TimeSettings", - "EngineBuild": 6331, + "EngineBuild": 6332, "Data": { "UpdateMode": 1, "UpdateFPS": 120.0, diff --git a/Content/Textures/dev/dev_128_black.flax b/Content/Textures/dev/dev_128_black.flax new file mode 100644 index 0000000..ee85e60 Binary files /dev/null and b/Content/Textures/dev/dev_128_black.flax differ diff --git a/Content/Textures/dev/dev_128_blue.flax b/Content/Textures/dev/dev_128_blue.flax new file mode 100644 index 0000000..a932785 Binary files /dev/null and b/Content/Textures/dev/dev_128_blue.flax differ diff --git a/Content/Textures/dev/dev_128_darkgray.flax b/Content/Textures/dev/dev_128_darkgray.flax new file mode 100644 index 0000000..8c998f1 Binary files /dev/null and b/Content/Textures/dev/dev_128_darkgray.flax differ diff --git a/Content/Textures/dev/dev_128_green.flax b/Content/Textures/dev/dev_128_green.flax new file mode 100644 index 0000000..5440384 Binary files /dev/null and b/Content/Textures/dev/dev_128_green.flax differ diff --git a/Content/Textures/dev/dev_128_white.flax b/Content/Textures/dev/dev_128_white.flax new file mode 100644 index 0000000..c8fbdad Binary files /dev/null and b/Content/Textures/dev/dev_128_white.flax differ diff --git a/Content/Textures/dev/dev_128_yellow.flax b/Content/Textures/dev/dev_128_yellow.flax new file mode 100644 index 0000000..5b0a533 Binary files /dev/null and b/Content/Textures/dev/dev_128_yellow.flax differ