diff --git a/Assets/Maps/aerowalk.map b/Assets/Maps/aerowalk.map index 2e53573..0733356 100644 --- a/Assets/Maps/aerowalk.map +++ b/Assets/Maps/aerowalk.map @@ -4315,57 +4315,57 @@ } // brush 480 { -( -224 -1680 848 ) ( -224 -2512 848 ) ( -224 -1680 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -208 -2528 416 ) ( -224 -2528 416 ) ( -208 -2528 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -208 -1680 400 ) ( -224 -1680 400 ) ( -208 -2512 400 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -208 -2512 848 ) ( -224 -2512 848 ) ( -208 -1680 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -208 -1328 848 ) ( -224 -1328 848 ) ( -208 -1328 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -192 -2512 848 ) ( -192 -1680 848 ) ( -192 -2512 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1680 848 ) ( -224 -2512 848 ) ( -224 -1680 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -208 -2528 416 ) ( -224 -2528 416 ) ( -208 -2528 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -208 -1680 400 ) ( -224 -1680 400 ) ( -208 -2512 400 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -208 -2512 848 ) ( -224 -2512 848 ) ( -208 -1680 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -208 -1328 848 ) ( -224 -1328 848 ) ( -208 -1328 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -192 -2512 848 ) ( -192 -1680 848 ) ( -192 -2512 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 } // brush 481 { -( -1664 -2512 416 ) ( -1664 -1680 416 ) ( -1664 -2512 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1648 -2528 848 ) ( -1632 -2528 848 ) ( -1648 -2528 416 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 -( -1648 -2512 400 ) ( -1632 -2512 400 ) ( -1648 -1680 400 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 -( -1648 -1680 848 ) ( -1632 -1680 848 ) ( -1648 -2512 848 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 -( -1648 -1328 416 ) ( -1632 -1328 416 ) ( -1648 -1328 848 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 -( -1632 -2512 416 ) ( -1632 -2512 848 ) ( -1632 -1680 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 +( -1664 -2512 416 ) ( -1664 -1680 416 ) ( -1664 -2512 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1648 -2528 848 ) ( -1632 -2528 848 ) ( -1648 -2528 416 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 +( -1648 -2512 400 ) ( -1632 -2512 400 ) ( -1648 -1680 400 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 +( -1648 -1680 848 ) ( -1632 -1680 848 ) ( -1648 -2512 848 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 +( -1648 -1328 416 ) ( -1632 -1328 416 ) ( -1648 -1328 848 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 +( -1632 -2512 416 ) ( -1632 -2512 848 ) ( -1632 -1680 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 } // brush 482 { -( -1632 -1344 848 ) ( -1632 -1360 848 ) ( -1632 -1344 416 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 -( -224 -1360 848 ) ( -224 -1360 416 ) ( -1072 -1360 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -1344 400 ) ( -1072 -1360 400 ) ( -224 -1344 400 ) dev/dev_128_yellow 0 256 0 0.0625 0.0625 0 0 0 -( -224 -1344 848 ) ( -224 -1360 848 ) ( -1072 -1344 848 ) dev/dev_128_yellow 0 256 0 0.0625 0.0625 0 0 0 -( -224 -1328 848 ) ( -1072 -1328 848 ) ( -224 -1328 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -1344 416 ) ( -224 -1360 416 ) ( -224 -1344 848 ) dev/dev_128_yellow -256 0 0 0.0625 0.0625 0 0 0 +( -1632 -1344 848 ) ( -1632 -1360 848 ) ( -1632 -1344 416 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 +( -224 -1360 848 ) ( -224 -1360 416 ) ( -1072 -1360 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -1344 400 ) ( -1072 -1360 400 ) ( -224 -1344 400 ) dev/dev_128_green 0 256 0 0.0625 0.0625 0 0 0 +( -224 -1344 848 ) ( -224 -1360 848 ) ( -1072 -1344 848 ) dev/dev_128_green 0 256 0 0.0625 0.0625 0 0 0 +( -224 -1328 848 ) ( -1072 -1328 848 ) ( -224 -1328 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1344 416 ) ( -224 -1360 416 ) ( -224 -1344 848 ) dev/dev_128_green -256 0 0 0.0625 0.0625 0 0 0 } // brush 483 { -( -1632 -2512 416 ) ( -1632 -2496 416 ) ( -1632 -2512 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -2528 416 ) ( -1072 -2528 416 ) ( -224 -2528 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -2512 400 ) ( -224 -2496 400 ) ( -1072 -2512 400 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -2512 848 ) ( -1072 -2496 848 ) ( -224 -2512 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -2496 416 ) ( -224 -2496 416 ) ( -1072 -2496 848 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -2512 848 ) ( -224 -2496 848 ) ( -224 -2512 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 +( -1632 -2512 416 ) ( -1632 -2496 416 ) ( -1632 -2512 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -2528 416 ) ( -1072 -2528 416 ) ( -224 -2528 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -2512 400 ) ( -224 -2496 400 ) ( -1072 -2512 400 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -2512 848 ) ( -1072 -2496 848 ) ( -224 -2512 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -2496 416 ) ( -224 -2496 416 ) ( -1072 -2496 848 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -2512 848 ) ( -224 -2496 848 ) ( -224 -2512 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 } // brush 484 { -( -1072 -2496 176 ) ( -1072 -2496 160 ) ( -1072 -1696 176 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -2496 176 ) ( -224 -2496 160 ) ( -1072 -2496 176 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -1696 160 ) ( -1072 -1696 160 ) ( -224 -2496 160 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -1696 176 ) ( -224 -2496 176 ) ( -1072 -1696 176 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -1696 176 ) ( -1072 -1696 160 ) ( -224 -1696 176 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -1696 176 ) ( -224 -1696 160 ) ( -224 -2496 176 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -2496 176 ) ( -1072 -2496 160 ) ( -1072 -1696 176 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -2496 176 ) ( -224 -2496 160 ) ( -1072 -2496 176 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1696 160 ) ( -1072 -1696 160 ) ( -224 -2496 160 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1696 176 ) ( -224 -2496 176 ) ( -1072 -1696 176 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -1696 176 ) ( -1072 -1696 160 ) ( -224 -1696 176 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1696 176 ) ( -224 -1696 160 ) ( -224 -2496 176 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 } // brush 485 { -( -1632 -1696 416 ) ( -1632 -1696 432 ) ( -1632 -2496 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -2496 416 ) ( -1072 -2496 432 ) ( -224 -2496 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -1696 400 ) ( -1072 -2496 400 ) ( -224 -1696 400 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -1072 -2496 432 ) ( -1072 -1696 432 ) ( -224 -2496 432 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -1360 416 ) ( -224 -1360 432 ) ( -1072 -1360 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 -( -224 -2496 416 ) ( -224 -2496 432 ) ( -224 -1696 416 ) dev/dev_128_yellow 0 0 0 0.0625 0.0625 0 0 0 +( -1632 -1696 416 ) ( -1632 -1696 432 ) ( -1632 -2496 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -2496 416 ) ( -1072 -2496 432 ) ( -224 -2496 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -1696 400 ) ( -1072 -2496 400 ) ( -224 -1696 400 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -1072 -2496 432 ) ( -1072 -1696 432 ) ( -224 -2496 432 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -1360 416 ) ( -224 -1360 432 ) ( -1072 -1360 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 +( -224 -2496 416 ) ( -224 -2496 432 ) ( -224 -1696 416 ) dev/dev_128_green 0 0 0 0.0625 0.0625 0 0 0 } // brush 486 { diff --git a/Content/Scenes/MainScene.scene b/Content/Scenes/MainScene.scene index 76de44d..9ddd923 100644 --- a/Content/Scenes/MainScene.scene +++ b/Content/Scenes/MainScene.scene @@ -49,13 +49,13 @@ "ParentID": "ff6b6db54b5aa08e7286ef86246149ef", "Transform": { "Translation": { - "X": 1355.0, - "Y": 791.0, + "X": 1734.0, + "Y": 933.0, "Z": 0.0 } }, "Data": { - "Text": "13022 tris\n 102 drawcalls\n238fps2\n240fps" + "Text": "7038 tris\n 101 drawcalls\n636fps2\n1284fps" } }, { @@ -159,22 +159,25 @@ "ID": "8736d067492170db415102997d187ff7", "TypeName": "FlaxEngine.DirectionalLight", "ParentID": "194e05f445ece24ec5448d886e1334df", + "IsActive": false, "Name": "DirectionalLight", "Transform": { "Translation": { - "X": -1567.0185546875, - "Y": 592.0887451171875, - "Z": -2397.31787109375 + "X": -370.8681335449219, + "Y": 191.241943359375, + "Z": -134.10745239257813 }, "Orientation": { - "X": 0.7106112837791443, - "Y": 0.0, - "Z": 0.0, - "W": 0.7035849094390869 + "X": 0.8119235038757324, + "Y": -7.162299908713976e-8, + "Z": -7.162299908713976e-8, + "W": 0.5837640166282654 } }, - "Brightness": 14.400001525878907, - "ViewDistance": 1540.0 + "Brightness": 21.700000762939454, + "ViewDistance": 15400.0, + "ShadowsDistance": 9715.0, + "ShadowsFadeDistance": 5000.0 } ] } \ No newline at end of file diff --git a/Content/Settings/EngineSettings/GraphicsSettings.json b/Content/Settings/EngineSettings/GraphicsSettings.json index 3eb3f46..a4965d6 100644 --- a/Content/Settings/EngineSettings/GraphicsSettings.json +++ b/Content/Settings/EngineSettings/GraphicsSettings.json @@ -16,9 +16,9 @@ "EnableGlobalSDF": true, "GlobalSDFQuality": 2, "GenerateSDFOnModelImport": true, - "GIQuality": 0, - "GIProbesSpacing": 500.0, - "GlobalSurfaceAtlasResolution": 2048, + "GIQuality": 3, + "GIProbesSpacing": 100.0, + "GlobalSurfaceAtlasResolution": 4096, "PostProcessSettings": { "AO": { "OverrideFlags": 13, @@ -33,8 +33,8 @@ "OverrideFlags": 63, "Mode": 1, "Intensity": 1.0, - "BounceIntensity": 2.0, - "TemporalResponse": 1.0, + "BounceIntensity": 1.0, + "TemporalResponse": 0.9, "Distance": 20000.0, "FallbackIrradiance": { "R": 1.0, diff --git a/Content/config.cfg b/Content/config.cfg index 31ac6d4..478e729 100644 --- a/Content/config.cfg +++ b/Content/config.cfg @@ -4,4 +4,4 @@ r_lighting 0 cl_maxfps 240 r_upscaling 0 r_gi 0 -r_staticbatch 0 \ No newline at end of file +r_staticbatch 1 \ No newline at end of file diff --git a/Source/Game/Audio/AudioManager.cs b/Source/Game/Audio/AudioManager.cs index 4485938..e06e8dc 100644 --- a/Source/Game/Audio/AudioManager.cs +++ b/Source/Game/Audio/AudioManager.cs @@ -151,6 +151,9 @@ namespace Game audioSource.Name += ", vol: " + volume; if (pitch != 1f) audioSource.Name += ", pitch: " + pitch; + if (pitch != 0f) + audioSource.Name += ", delay: " + randomDelay; + Console.Print("playing sound " + audioSource.Name); if (channel > 0) actorChannels.channelSources[channel] = audioSource; diff --git a/Source/Game/Console/EngineSubsystem.cs b/Source/Game/Console/EngineSubsystem.cs index f65657f..e8f36ff 100644 --- a/Source/Game/Console/EngineSubsystem.cs +++ b/Source/Game/Console/EngineSubsystem.cs @@ -329,17 +329,20 @@ namespace Game boolValue = valueFloat != 0f; AssetManager.Globals.SetValue("Scene Lighting", boolValue); - //AmbientOcclusion = value; + + AmbientOcclusion = AmbientOcclusion; + GlobalIllumination = GlobalIllumination; //GlobalIllumination = value; } } + private static bool _AmbientOcclusion; [ConsoleVariable("r_ambientocclusion")] public static string AmbientOcclusion { get { - return Graphics.PostProcessSettings.AmbientOcclusion.Enabled ? "1" : "0"; + return _AmbientOcclusion ? "1" : "0";//Graphics.PostProcessSettings.AmbientOcclusion.Enabled ? "1" : "0"; } set { @@ -349,16 +352,19 @@ namespace Game else if (float.TryParse(value, out float valueFloat)) boolValue = valueFloat != 0f; + _AmbientOcclusion = boolValue; + PostProcessSettings postProcessSettings = Graphics.PostProcessSettings; AmbientOcclusionSettings aoSettings = postProcessSettings.AmbientOcclusion; /*aoSettings.OverrideFlags = (aoSettings.OverrideFlags & ~AmbientOcclusionSettingsOverride.Enabled) | - (boolValue - ? AmbientOcclusionSettingsOverride.Enabled - : 0 & AmbientOcclusionSettingsOverride.Enabled);*/ + (boolValue + ? AmbientOcclusionSettingsOverride.Enabled + : 0 & AmbientOcclusionSettingsOverride.Enabled);*/ - aoSettings.Enabled = boolValue; + aoSettings.Enabled = boolValue && SceneLighting == "1"; postProcessSettings.AmbientOcclusion = aoSettings; + Graphics.PostProcessSettings = postProcessSettings; } } @@ -382,12 +388,14 @@ namespace Game } } + private static bool _GlobalIllumination; + [ConsoleVariable("r_gi")] public static string GlobalIllumination { get { - return Graphics.PostProcessSettings.GlobalIllumination.Mode == GlobalIlluminationMode.DDGI ? "1" : "0"; + return _GlobalIllumination ? "1" : "0";//Graphics.PostProcessSettings.GlobalIllumination.Mode == GlobalIlluminationMode.DDGI ? "1" : "0"; } set { @@ -397,10 +405,12 @@ namespace Game else if (float.TryParse(value, out float valueFloat)) boolValue = valueFloat != 0f; + _GlobalIllumination = boolValue; + PostProcessSettings postProcessSettings = Graphics.PostProcessSettings; GlobalIlluminationSettings giSettings = postProcessSettings.GlobalIllumination; - giSettings.Mode = boolValue ? GlobalIlluminationMode.DDGI : GlobalIlluminationMode.None; + giSettings.Mode = (boolValue && SceneLighting == "1") ? GlobalIlluminationMode.DDGI : GlobalIlluminationMode.None; postProcessSettings.GlobalIllumination = giSettings; Graphics.PostProcessSettings = postProcessSettings; diff --git a/Source/Game/Game.Build.cs b/Source/Game/Game.Build.cs index 5ef4e87..db5e3fc 100644 --- a/Source/Game/Game.Build.cs +++ b/Source/Game/Game.Build.cs @@ -38,6 +38,8 @@ public class Game : GameModule //options.ScriptingAPI.FileReferences.Add(Path.Combine(Globals.EngineRoot, "Source", "Platforms", "DotNet", "Newtonsoft.Json.dll")); + options.ScriptingAPI.FileReferences.Add(@"C:\dev\GoatBot\ThirdParty\DSharpPlus\DSharpPlus\bin\Debug\netstandard2.0\DSharpPlus.dll"); + #if COMPILE_WITH_DLSS DLSS.ConditionalImport(options, options.PrivateDependencies); options.ScriptingAPI.Defines.Add("COMPILE_WITH_DLSS"); diff --git a/Source/Game/GameMode/GameModeManager.cs b/Source/Game/GameMode/GameModeManager.cs index 0a34efa..258177b 100644 --- a/Source/Game/GameMode/GameModeManager.cs +++ b/Source/Game/GameMode/GameModeManager.cs @@ -402,7 +402,7 @@ namespace Game //Assert.IsTrue(reportedFrame >= lastReceivedServerFrame); if (reportedPlayerId == NetworkManager.LocalPlayerClientId && reportedFrame < lastReceivedServerFrame) { - Console.Print($"packet wrong order, last received: {lastReceivedServerFrame}, new: {reportedFrame}"); + //Console.Print($"packet wrong order, last received: {lastReceivedServerFrame}, new: {reportedFrame}"); break; } diff --git a/Source/Game/Level/Q3MapImporter.cs b/Source/Game/Level/Q3MapImporter.cs index b85d7e2..78ec16b 100644 --- a/Source/Game/Level/Q3MapImporter.cs +++ b/Source/Game/Level/Q3MapImporter.cs @@ -488,7 +488,11 @@ namespace Game //else // FlaxEngine.Debug.Log("No WorldSpawn, loading map"); - FlaxEngine.Debug.Log("Loading map"); + bool oneMesh = false; + bool useStaticBatching = StaticBatching; + bool convexMesh = true; + + FlaxEngine.Debug.Log("Loading map, static batching: " + useStaticBatching); { string matBasePath = Path.Combine(AssetManager.ContentPath, "Materials"); string assetPath = Path.Combine(matBasePath, "missing.flax"); @@ -497,9 +501,7 @@ namespace Game ConcurrentBag sdfModels = new ConcurrentBag(); - bool oneMesh = false; - bool useStaticBatching = StaticBatching; - bool convexMesh = true; + if (worldSpawnActor == null) { diff --git a/Source/Game/Player/PlayerActor.cs b/Source/Game/Player/PlayerActor.cs index 109df87..f14c5b2 100644 --- a/Source/Game/Player/PlayerActor.cs +++ b/Source/Game/Player/PlayerActor.cs @@ -77,6 +77,8 @@ namespace Game meshCollider = GetChild(); //playerRigidBody = FindActor(); + + //Console.Print("OnBeginPlay playerid: " + PlayerId.ToString()); diff --git a/Source/Game/Player/PlayerMovement.cs b/Source/Game/Player/PlayerMovement.cs index e961942..2a1adaa 100644 --- a/Source/Game/Player/PlayerMovement.cs +++ b/Source/Game/Player/PlayerMovement.cs @@ -271,6 +271,7 @@ namespace Game { //input.OnUpdate(); + if (input is PlayerInputDemo /*&& currentInputFrame2 >= currentInputFrame*/) return; @@ -1405,6 +1406,20 @@ namespace Game { AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, pitchRange); + /*AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange); + AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, + pitchRange);*/ } } diff --git a/Source/GameTarget.Build.cs b/Source/GameTarget.Build.cs index 9d18ffd..4b0907c 100644 --- a/Source/GameTarget.Build.cs +++ b/Source/GameTarget.Build.cs @@ -43,7 +43,7 @@ public class GameTarget : GameProjectTarget if (options.Configuration == TargetConfiguration.Development || options.Configuration == TargetConfiguration.Debug) options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsDevelopment"); else if (options.Configuration == TargetConfiguration.Release) - options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsRelease"); + options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsDevelopment");//options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsRelease"); } return base.GetOutputFilePath(options, outputType); diff --git a/Source/GoakeTestsTarget.Build.cs b/Source/GoakeTestsTarget.Build.cs index 3845202..87887a5 100644 --- a/Source/GoakeTestsTarget.Build.cs +++ b/Source/GoakeTestsTarget.Build.cs @@ -17,16 +17,19 @@ public class GoakeTestsTarget : Target IsPreBuilt = false; Type = TargetType.DotNet; OutputType = TargetOutputType.Library; - /*Platforms = new[] + Platforms = new[] { Flax.Build.Platform.BuildPlatform.Target, + }; Configurations = new[] { TargetConfiguration.Debug, - TargetConfiguration.Release, - };*/ + //TargetConfiguration.Release, + }; CustomExternalProjectFilePath = System.IO.Path.Combine("Tests/GoakeTests.csproj"); + + //Modules.Add("Game"); } } diff --git a/Tests/ConsoleTests.cs b/Tests/ConsoleTests.cs index ce0b7a6..478dbd2 100644 --- a/Tests/ConsoleTests.cs +++ b/Tests/ConsoleTests.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using System.Runtime.Loader; using Console = Game.Console; namespace GoakeTests.ConsoleTests @@ -9,6 +10,7 @@ namespace GoakeTests.ConsoleTests public void Setup() { Console.Init(); + var asdf = AssemblyLoadContext.Default.Assemblies; } [TearDown] diff --git a/Tests/GoakeTests.csproj b/Tests/GoakeTests.csproj index 593376e..e307f8b 100644 --- a/Tests/GoakeTests.csproj +++ b/Tests/GoakeTests.csproj @@ -1,56 +1,30 @@ - - + - - false - + Exe + disable net7.0 - False - - Editor.Windows.Development;Game.Windows.Development;Release - + Game.Windows.Development;Game.Windows.Debug x64 - - - - 5 - - - - 5 - - - - 4 - - - - 4 - - - - true + True - BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_EDITOR;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5 + BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_EDITOR;FLAX;FLAX_ASSERTIONS;USE_NETCORE;FLAX_1;FLAX_1_6;FLAX_1_1_OR_NEWER;FLAX_1_2_OR_NEWER;FLAX_1_3_OR_NEWER;FLAX_1_4_OR_NEWER;FLAX_1_5_OR_NEWER;FLAX_1_6_OR_NEWER - BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_GAME;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5 - - - - BUILD_RELEASE;PLATFORM_WINDOWS;FLAX_GAME;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5 - true + BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_GAME;FLAX;FLAX_ASSERTIONS;USE_NETCORE;FLAX_1;FLAX_1_6;FLAX_1_1_OR_NEWER;FLAX_1_2_OR_NEWER;FLAX_1_3_OR_NEWER;FLAX_1_4_OR_NEWER;FLAX_1_5_OR_NEWER;FLAX_1_6_OR_NEWER - + - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Tests/MapParserTests.cs b/Tests/MapParserTests.cs index 18fb7d3..4b6aaa7 100644 --- a/Tests/MapParserTests.cs +++ b/Tests/MapParserTests.cs @@ -116,7 +116,7 @@ namespace GoakeTests.MapParser foreach (var ent in aerowalkRoot.entities) foreach (var brush in ent.brushes) { - Q3MapImporter.TriangulateBrush(brush, out Vector3[] verts); + Q3MapImporter.TriangulateBrush(brush, out Float3[] verts); Assert.IsTrue(verts.Length > 0); } } @@ -143,7 +143,7 @@ namespace GoakeTests.MapParser foreach (var ent in root.entities) foreach (var brush in ent.brushes) { - Q3MapImporter.TriangulateBrush(brush, out Vector3[] verts); + Q3MapImporter.TriangulateBrush(brush, out Float3[] verts); Assert.IsTrue(verts.Length > 0); } }