diff --git a/Content/Materials/SimpleMapMaterial.flax b/Content/Materials/SimpleMapMaterial.flax index ea9bf19..84fa92d 100644 Binary files a/Content/Materials/SimpleMapMaterial.flax and b/Content/Materials/SimpleMapMaterial.flax differ diff --git a/Content/Materials/WeaponMaterial.flax b/Content/Materials/WeaponMaterial.flax index 9aaa0c6..dd11f85 100644 Binary files a/Content/Materials/WeaponMaterial.flax and b/Content/Materials/WeaponMaterial.flax differ diff --git a/Content/Scenes/MainScene.scene b/Content/Scenes/MainScene.scene index 36e48cd..3d48e88 100644 --- a/Content/Scenes/MainScene.scene +++ b/Content/Scenes/MainScene.scene @@ -22,7 +22,8 @@ "TypeName": "Game.Q3MapImporter", "ParentID": "194e05f445ece24ec5448d886e1334df", "V": { - "mapPath": "C:\\dev\\GoakeFlax\\Assets\\Maps\\aerowalk.map" + "mapPath": "C:\\dev\\GoakeFlax\\Assets\\Maps\\aerowalk.map", + "importLights": true } }, { @@ -51,7 +52,9 @@ "Z": 0.0 } }, - "Data": {} + "Data": { + "Text": "0fps" +} }, { "ID": "35b34b0c4476f0ed43aa8fb4d5f2eebc", @@ -169,8 +172,10 @@ "IsBounded": false, "Settings": { "AO": { - "OverrideFlags": 1, - "Enabled": false + "OverrideFlags": 12, + "Enabled": false, + "Power": 0.5, + "Radius": 0.5 }, "Bloom": { "OverrideFlags": 1, @@ -206,6 +211,44 @@ }, "PostFxMaterials": {} } + }, + { + "ID": "aee0adec4b308ede0c0d32a0e1c5d585", + "TypeName": "FlaxEngine.DirectionalLight", + "ParentID": "194e05f445ece24ec5448d886e1334df", + "IsActive": false, + "Name": "DirectionalLight", + "Transform": { + "Orientation": { + "X": 0.6622079610824585, + "Y": 0.0, + "Z": 0.0, + "W": 0.7493202090263367 + } + }, + "Layer": 1, + "Brightness": 0.5999999046325684 + }, + { + "ID": "fc79615444d89ee2d290a295e1ad8004", + "TypeName": "FlaxEngine.SkyLight", + "ParentID": "194e05f445ece24ec5448d886e1334df", + "Name": "SkyLight", + "Transform": { + "Translation": { + "X": 23.04454803466797, + "Y": 0.0, + "Z": -36.84918212890625 + } + }, + "Layer": 1, + "Brightness": 0.7999999523162842, + "AdditiveColor": { + "R": 1.0, + "G": 1.0, + "B": 1.0, + "A": 1.0 + } } ] } \ No newline at end of file diff --git a/Source/Game/Level/Q3MapImporter.cs b/Source/Game/Level/Q3MapImporter.cs index e97aa6e..cd6297f 100644 --- a/Source/Game/Level/Q3MapImporter.cs +++ b/Source/Game/Level/Q3MapImporter.cs @@ -722,6 +722,8 @@ namespace Game private void ParseLight(MapEntity entity, Actor worldSpawnActor, ref int lightIndex) { + const bool lightsUseInverseSquaredFalloff = true; + //Console.Print("light"); PointLight light = worldSpawnActor.AddChild(); light.Name = "Light_" + lightIndex; @@ -746,6 +748,24 @@ namespace Game light.ShadowsDistance = 2000f * 1f; + if (lightsUseInverseSquaredFalloff) + { + if (true) + { + light.Radius *= 0.5f; + light.FallOffExponent = 2f; + light.Brightness *= 1.25f; + } + else + { + light.Radius *= 0.4f; + light.FallOffExponent = 2f; + light.Brightness *= 1.6f; + } + //light.Brightness *= 2500f; + //light.UseInverseSquaredFalloff = true; + } + if (true) { // match FTEQW dynamic only light values