GoaLitiuM/GoakeFlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://github.com/FlaxEngine/FlaxEngine/pull/1102

Browse Source
This commit is contained in:
Ari Vuollet
2023-05-12 17:30:58 +03:00
parent e0769c9b30
commit b5ec0b86b2
16 changed files with 128 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Assets/Maps/aerowalk.map
View File

@@ -4315,57 +4315,57 @@
} }
// brush 480 // 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 ( -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_yellow 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_yellow 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_yellow 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_yellow 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_yellow 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 // 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 ( -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_yellow -256 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_yellow -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_yellow -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_yellow -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_yellow 0 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 // 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 ( -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_yellow 0 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_yellow 0 256 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_yellow 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_yellow 0 0 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_yellow -256 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 // 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 ( -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_yellow 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_yellow 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_yellow 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_yellow 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_yellow 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 // 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 ( -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_yellow 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_yellow 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_yellow 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_yellow 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_yellow 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 // 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 ( -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_yellow 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_yellow 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_yellow 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_yellow 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_yellow 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 // brush 486
{ {

27
Content/Scenes/MainScene.scene
View File

@@ -49,13 +49,13 @@
"ParentID": "ff6b6db54b5aa08e7286ef86246149ef", "ParentID": "ff6b6db54b5aa08e7286ef86246149ef",
"Transform": { "Transform": {
"Translation": { "Translation": {
"X": 1355.0, "X": 1734.0,
"Y": 791.0, "Y": 933.0,
"Z": 0.0 "Z": 0.0
} }
}, },
"Data": { "Data": {
"Text": "13022 tris\n 102 drawcalls\n238fps2\n240fps" "Text": "7038 tris\n 101 drawcalls\n636fps2\n1284fps"
} }
}, },
{ {
@@ -159,22 +159,25 @@
"ID": "8736d067492170db415102997d187ff7", "ID": "8736d067492170db415102997d187ff7",
"TypeName": "FlaxEngine.DirectionalLight", "TypeName": "FlaxEngine.DirectionalLight",
"ParentID": "194e05f445ece24ec5448d886e1334df", "ParentID": "194e05f445ece24ec5448d886e1334df",
"IsActive": false,
"Name": "DirectionalLight", "Name": "DirectionalLight",
"Transform": { "Transform": {
"Translation": { "Translation": {
"X": -1567.0185546875, "X": -370.8681335449219,
"Y": 592.0887451171875, "Y": 191.241943359375,
"Z": -2397.31787109375 "Z": -134.10745239257813
}, },
"Orientation": { "Orientation": {
"X": 0.7106112837791443, "X": 0.8119235038757324,
"Y": 0.0, "Y": -7.162299908713976e-8,
"Z": 0.0, "Z": -7.162299908713976e-8,
"W": 0.7035849094390869 "W": 0.5837640166282654
} }
}, },
"Brightness": 14.400001525878907, "Brightness": 21.700000762939454,
"ViewDistance": 1540.0 "ViewDistance": 15400.0,
"ShadowsDistance": 9715.0,
"ShadowsFadeDistance": 5000.0
} }
] ]
} }

10
Content/Settings/EngineSettings/GraphicsSettings.json
View File

@@ -16,9 +16,9 @@
"EnableGlobalSDF": true, "EnableGlobalSDF": true,
"GlobalSDFQuality": 2, "GlobalSDFQuality": 2,
"GenerateSDFOnModelImport": true, "GenerateSDFOnModelImport": true,
"GIQuality": 0, "GIQuality": 3,
"GIProbesSpacing": 500.0, "GIProbesSpacing": 100.0,
"GlobalSurfaceAtlasResolution": 2048, "GlobalSurfaceAtlasResolution": 4096,
"PostProcessSettings": { "PostProcessSettings": {
"AO": { "AO": {
"OverrideFlags": 13, "OverrideFlags": 13,
@@ -33,8 +33,8 @@
"OverrideFlags": 63, "OverrideFlags": 63,
"Mode": 1, "Mode": 1,
"Intensity": 1.0, "Intensity": 1.0,
"BounceIntensity": 2.0, "BounceIntensity": 1.0,
"TemporalResponse": 1.0, "TemporalResponse": 0.9,
"Distance": 20000.0, "Distance": 20000.0,
"FallbackIrradiance": { "FallbackIrradiance": {
"R": 1.0, "R": 1.0,

2
Content/config.cfg
View File

@@ -4,4 +4,4 @@ r_lighting 0
cl_maxfps 240 cl_maxfps 240
r_upscaling 0 r_upscaling 0
r_gi 0 r_gi 0
r_staticbatch 0 r_staticbatch 1

3
Source/Game/Audio/AudioManager.cs
View File

@@ -151,6 +151,9 @@ namespace Game
audioSource.Name += ", vol: " + volume; audioSource.Name += ", vol: " + volume;
if (pitch != 1f) if (pitch != 1f)
audioSource.Name += ", pitch: " + pitch; audioSource.Name += ", pitch: " + pitch;
if (pitch != 0f)
audioSource.Name += ", delay: " + randomDelay;
Console.Print("playing sound " + audioSource.Name);
if (channel > 0) if (channel > 0)
actorChannels.channelSources[channel] = audioSource; actorChannels.channelSources[channel] = audioSource;

26
Source/Game/Console/EngineSubsystem.cs
View File

@@ -329,17 +329,20 @@ namespace Game
boolValue = valueFloat != 0f; boolValue = valueFloat != 0f;
AssetManager.Globals.SetValue("Scene Lighting", boolValue); AssetManager.Globals.SetValue("Scene Lighting", boolValue);
//AmbientOcclusion = value;
AmbientOcclusion = AmbientOcclusion;
GlobalIllumination = GlobalIllumination;
//GlobalIllumination = value; //GlobalIllumination = value;
} }
} }
private static bool _AmbientOcclusion;
[ConsoleVariable("r_ambientocclusion")] [ConsoleVariable("r_ambientocclusion")]
public static string AmbientOcclusion public static string AmbientOcclusion
{ {
get get
{ {
return Graphics.PostProcessSettings.AmbientOcclusion.Enabled ? "1" : "0"; return _AmbientOcclusion ? "1" : "0";//Graphics.PostProcessSettings.AmbientOcclusion.Enabled ? "1" : "0";
} }
set set
{ {
@@ -349,16 +352,19 @@ namespace Game
else if (float.TryParse(value, out float valueFloat)) else if (float.TryParse(value, out float valueFloat))
boolValue = valueFloat != 0f; boolValue = valueFloat != 0f;
_AmbientOcclusion = boolValue;
PostProcessSettings postProcessSettings = Graphics.PostProcessSettings; PostProcessSettings postProcessSettings = Graphics.PostProcessSettings;
AmbientOcclusionSettings aoSettings = postProcessSettings.AmbientOcclusion; AmbientOcclusionSettings aoSettings = postProcessSettings.AmbientOcclusion;
/*aoSettings.OverrideFlags = (aoSettings.OverrideFlags & ~AmbientOcclusionSettingsOverride.Enabled) | /*aoSettings.OverrideFlags = (aoSettings.OverrideFlags & ~AmbientOcclusionSettingsOverride.Enabled) |
(boolValue (boolValue
? AmbientOcclusionSettingsOverride.Enabled ? AmbientOcclusionSettingsOverride.Enabled
: 0 & AmbientOcclusionSettingsOverride.Enabled);*/ : 0 & AmbientOcclusionSettingsOverride.Enabled);*/
aoSettings.Enabled = boolValue; aoSettings.Enabled = boolValue && SceneLighting == "1";
postProcessSettings.AmbientOcclusion = aoSettings; postProcessSettings.AmbientOcclusion = aoSettings;
Graphics.PostProcessSettings = postProcessSettings; Graphics.PostProcessSettings = postProcessSettings;
} }
} }
@@ -382,12 +388,14 @@ namespace Game
} }
} }
private static bool _GlobalIllumination;
[ConsoleVariable("r_gi")] [ConsoleVariable("r_gi")]
public static string GlobalIllumination public static string GlobalIllumination
{ {
get get
{ {
return Graphics.PostProcessSettings.GlobalIllumination.Mode == GlobalIlluminationMode.DDGI ? "1" : "0"; return _GlobalIllumination ? "1" : "0";//Graphics.PostProcessSettings.GlobalIllumination.Mode == GlobalIlluminationMode.DDGI ? "1" : "0";
} }
set set
{ {
@@ -397,10 +405,12 @@ namespace Game
else if (float.TryParse(value, out float valueFloat)) else if (float.TryParse(value, out float valueFloat))
boolValue = valueFloat != 0f; boolValue = valueFloat != 0f;
_GlobalIllumination = boolValue;
PostProcessSettings postProcessSettings = Graphics.PostProcessSettings; PostProcessSettings postProcessSettings = Graphics.PostProcessSettings;
GlobalIlluminationSettings giSettings = postProcessSettings.GlobalIllumination; GlobalIlluminationSettings giSettings = postProcessSettings.GlobalIllumination;
giSettings.Mode = boolValue ? GlobalIlluminationMode.DDGI : GlobalIlluminationMode.None; giSettings.Mode = (boolValue && SceneLighting == "1") ? GlobalIlluminationMode.DDGI : GlobalIlluminationMode.None;
postProcessSettings.GlobalIllumination = giSettings; postProcessSettings.GlobalIllumination = giSettings;
Graphics.PostProcessSettings = postProcessSettings; Graphics.PostProcessSettings = postProcessSettings;

2
Source/Game/Game.Build.cs
View File

@@ -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(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 #if COMPILE_WITH_DLSS
DLSS.ConditionalImport(options, options.PrivateDependencies); DLSS.ConditionalImport(options, options.PrivateDependencies);
options.ScriptingAPI.Defines.Add("COMPILE_WITH_DLSS"); options.ScriptingAPI.Defines.Add("COMPILE_WITH_DLSS");

2
Source/Game/GameMode/GameModeManager.cs
View File

@@ -402,7 +402,7 @@ namespace Game
//Assert.IsTrue(reportedFrame >= lastReceivedServerFrame); //Assert.IsTrue(reportedFrame >= lastReceivedServerFrame);
if (reportedPlayerId == NetworkManager.LocalPlayerClientId && 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; break;
} }

10
Source/Game/Level/Q3MapImporter.cs
View File

@@ -488,7 +488,11 @@ namespace Game
//else //else
// FlaxEngine.Debug.Log("No WorldSpawn, loading map"); // 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 matBasePath = Path.Combine(AssetManager.ContentPath, "Materials");
string assetPath = Path.Combine(matBasePath, "missing.flax"); string assetPath = Path.Combine(matBasePath, "missing.flax");
@@ -497,9 +501,7 @@ namespace Game
ConcurrentBag<Model> sdfModels = new ConcurrentBag<Model>(); ConcurrentBag<Model> sdfModels = new ConcurrentBag<Model>();
bool oneMesh = false;
bool useStaticBatching = StaticBatching;
bool convexMesh = true;
if (worldSpawnActor == null) if (worldSpawnActor == null)
{ {

2
Source/Game/Player/PlayerActor.cs
View File

@@ -77,6 +77,8 @@ namespace Game
meshCollider = GetChild<MeshCollider>(); meshCollider = GetChild<MeshCollider>();
//playerRigidBody = FindActor<RigidBody>(); //playerRigidBody = FindActor<RigidBody>();
//Console.Print("OnBeginPlay playerid: " + PlayerId.ToString()); //Console.Print("OnBeginPlay playerid: " + PlayerId.ToString());

15
Source/Game/Player/PlayerMovement.cs
View File

@@ -271,6 +271,7 @@ namespace Game
{ {
//input.OnUpdate(); //input.OnUpdate();
if (input is PlayerInputDemo /*&& currentInputFrame2 >= currentInputFrame*/) if (input is PlayerInputDemo /*&& currentInputFrame2 >= currentInputFrame*/)
return; return;
@@ -1405,6 +1406,20 @@ namespace Game
{ {
AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2, AudioManager.PlaySoundDelayed(secondStepDelayRange, "jumpland", Actor, 0, rootActor.Position, volume2,
pitchRange); 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);*/
} }
} }

2
Source/GameTarget.Build.cs
View File

@@ -43,7 +43,7 @@ public class GameTarget : GameProjectTarget
if (options.Configuration == TargetConfiguration.Development || options.Configuration == TargetConfiguration.Debug) if (options.Configuration == TargetConfiguration.Development || options.Configuration == TargetConfiguration.Debug)
options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsDevelopment"); options.OutputFolder = Path.Combine(FolderPath, "..", "Output", "WindowsDevelopment");
else if (options.Configuration == TargetConfiguration.Release) 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); return base.GetOutputFilePath(options, outputType);

9
Source/GoakeTestsTarget.Build.cs
View File

@@ -17,16 +17,19 @@ public class GoakeTestsTarget : Target
IsPreBuilt = false; IsPreBuilt = false;
Type = TargetType.DotNet; Type = TargetType.DotNet;
OutputType = TargetOutputType.Library; OutputType = TargetOutputType.Library;
/*Platforms = new[] Platforms = new[]
{ {
Flax.Build.Platform.BuildPlatform.Target, Flax.Build.Platform.BuildPlatform.Target,
}; };
Configurations = new[] Configurations = new[]
{ {
TargetConfiguration.Debug, TargetConfiguration.Debug,
TargetConfiguration.Release, //TargetConfiguration.Release,
};*/ };
CustomExternalProjectFilePath = System.IO.Path.Combine("Tests/GoakeTests.csproj"); CustomExternalProjectFilePath = System.IO.Path.Combine("Tests/GoakeTests.csproj");
//Modules.Add("Game");
} }
} }

2
Tests/ConsoleTests.cs
View File

@@ -1,4 +1,5 @@
using NUnit.Framework; using NUnit.Framework;
using System.Runtime.Loader;
using Console = Game.Console; using Console = Game.Console;
namespace GoakeTests.ConsoleTests namespace GoakeTests.ConsoleTests
@@ -9,6 +10,7 @@ namespace GoakeTests.ConsoleTests
public void Setup() public void Setup()
{ {
Console.Init(); Console.Init();
var asdf = AssemblyLoadContext.Default.Assemblies;
} }
[TearDown] [TearDown]

52
Tests/GoakeTests.csproj
View File

@@ -1,56 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable> <ImplicitUsings>disable</ImplicitUsings>
<TargetFrameworks>net7.0</TargetFrameworks> <TargetFrameworks>net7.0</TargetFrameworks>
<IsPublishable>False</IsPublishable> <IsPublishable>False</IsPublishable>
<Configurations>Game.Windows.Development;Game.Windows.Debug</Configurations>
<Configurations>Editor.Windows.Development;Game.Windows.Development;Release</Configurations>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
</PropertyGroup> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|x64'">
<WarningLevel>5</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|x64'">
<WarningLevel>5</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0-windows|x64'">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net5.0-windows|x64'">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Game.Windows.Development' ">
<Optimize>true</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Editor.Windows.Development' "> <PropertyGroup Condition=" '$(Configuration)' == 'Editor.Windows.Development' ">
<DefineConstants>BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_EDITOR;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5</DefineConstants> <DefineConstants>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</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Game.Windows.Development' "> <PropertyGroup Condition=" '$(Configuration)' == 'Game.Windows.Development' ">
<DefineConstants>BUILD_DEVELOPMENT;PLATFORM_WINDOWS;FLAX_GAME;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5</DefineConstants> <DefineConstants>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</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>BUILD_RELEASE;PLATFORM_WINDOWS;FLAX_GAME;FLAX;FLAX_ASSERTIONS;FLAX_1;FLAX_1_5</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="coverlet.collector" Version="3.0.2" /> <PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
Tests/MapParserTests.cs
View File

@@ -116,7 +116,7 @@ namespace GoakeTests.MapParser
foreach (var ent in aerowalkRoot.entities) foreach (var ent in aerowalkRoot.entities)
foreach (var brush in ent.brushes) foreach (var brush in ent.brushes)
{ {
Q3MapImporter.TriangulateBrush(brush, out Vector3[] verts); Q3MapImporter.TriangulateBrush(brush, out Float3[] verts);
Assert.IsTrue(verts.Length > 0); Assert.IsTrue(verts.Length > 0);
} }
} }
@@ -143,7 +143,7 @@ namespace GoakeTests.MapParser
foreach (var ent in root.entities) foreach (var ent in root.entities)
foreach (var brush in ent.brushes) foreach (var brush in ent.brushes)
{ {
Q3MapImporter.TriangulateBrush(brush, out Vector3[] verts); Q3MapImporter.TriangulateBrush(brush, out Float3[] verts);
Assert.IsTrue(verts.Length > 0); Assert.IsTrue(verts.Length > 0);
} }
} }