From 2979f8518503435a6a0545120808ad74e386a5f1 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Tue, 29 Sep 2020 15:25:01 -0400 Subject: [PATCH] Update C# demos for Godot 3.2.3 --- misc/os_test/MonoTest.cs | 52 +--------- misc/os_test/Operating System Testing.csproj | 53 ++-------- misc/os_test/Operating System Testing.sln | 12 +-- misc/os_test/os_test.gd | 2 - mono/2.5d/2.5D Demo with C#.csproj | 59 ++---------- mono/README.md | 4 +- .../Android in-app purchases with C#.csproj | 96 ++++++------------- .../Dodge the Creeps with C#.csproj | 59 ++---------- mono/pong/Pong with C#.csproj | 93 +++++------------- 9 files changed, 87 insertions(+), 343 deletions(-) diff --git a/misc/os_test/MonoTest.cs b/misc/os_test/MonoTest.cs index 404dd8ea..ef7c0193 100644 --- a/misc/os_test/MonoTest.cs +++ b/misc/os_test/MonoTest.cs @@ -3,27 +3,6 @@ using System; public class MonoTest : Node { - public string Architecture() - { -#if GODOT_ARM64 || GODOT_ARM64_V8A - return "64-bit ARM"; -#elif GODOT_ARMV7 || GODOT_ARMEABI_V7A - return "32-bit ARM"; -#elif GODOT_X86_64 - return "64-bit x86"; -#elif GODOT_X86 - return "32-bit x86"; -#elif GODOT_128 - return "128-bit"; -#elif GODOT_64 - return "64-bit"; -#elif GODOT_32 - return "32-bit"; -#else - return "Unknown"; -#endif - } - public string OperatingSystem() { #if GODOT_WINDOWS @@ -44,6 +23,8 @@ public class MonoTest : Node return "Haiku"; #elif GODOT_UWP return "UWP (Windows 10)"; +#elif GODOT + return "Other"; #else return "Unknown"; #endif @@ -58,36 +39,9 @@ public class MonoTest : Node #elif GODOT_WEB return "Web"; #elif GODOT - return "Godot Editor (not exported)"; + return "Other"; #else return "Unknown"; #endif } - - public string TextureCompression() - { - string compression = ""; -#if GODOT_S3TC - compression += "S3TC"; -#endif -#if GODOT_ETC - if (compression.Length > 0) - { - compression += ", "; - } - compression += "ETC"; -#endif -#if GODOT_ETC2 - if (compression.Length > 0) - { - compression += ", "; - } - compression += "ETC2"; -#endif - if (compression.Length > 0) - { - return compression; - } - return "Not exported or no textures"; - } } diff --git a/misc/os_test/Operating System Testing.csproj b/misc/os_test/Operating System Testing.csproj index 08043e25..1972cd4e 100644 --- a/misc/os_test/Operating System Testing.csproj +++ b/misc/os_test/Operating System Testing.csproj @@ -1,60 +1,23 @@ - - + Tools - AnyCPU {780B9CDA-51E7-446A-816F-0E2CF667C96C} Library - .mono/temp/bin/$(Configuration) OperatingSystemTesting Operating System Testing - v4.7 1.0.7374.17554 - .mono/temp/obj - $(BaseIntermediateOutputPath)/$(Configuration) - Debug - Release - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG; - prompt - 4 - false - - - portable - true - $(GodotDefineConstants);GODOT; - prompt - 4 - false - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG;TOOLS; - prompt - 4 - false + net472 + + false + false + false - - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll - False - - - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll - False - - - + \ No newline at end of file diff --git a/misc/os_test/Operating System Testing.sln b/misc/os_test/Operating System Testing.sln index ec320432..cd21dcac 100644 --- a/misc/os_test/Operating System Testing.sln +++ b/misc/os_test/Operating System Testing.sln @@ -5,15 +5,15 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Tools|Any CPU = Tools|Any CPU + ExportDebug|Any CPU = ExportDebug|Any CPU + ExportRelease|Any CPU = ExportRelease|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Release|Any CPU.Build.0 = Release|Any CPU - {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Tools|Any CPU.ActiveCfg = Tools|Any CPU - {780B9CDA-51E7-446A-816F-0E2CF667C96C}.Tools|Any CPU.Build.0 = Tools|Any CPU + {780B9CDA-51E7-446A-816F-0E2CF667C96C}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU + {780B9CDA-51E7-446A-816F-0E2CF667C96C}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU + {780B9CDA-51E7-446A-816F-0E2CF667C96C}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU + {780B9CDA-51E7-446A-816F-0E2CF667C96C}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU EndGlobalSection EndGlobal diff --git a/misc/os_test/os_test.gd b/misc/os_test/os_test.gd index c8c6e078..eba49dbe 100644 --- a/misc/os_test/os_test.gd +++ b/misc/os_test/os_test.gd @@ -123,10 +123,8 @@ func _ready(): add_line("Mono module enabled", "Yes" if mono_enabled else "No") if mono_enabled: mono_test.set_script(load("res://MonoTest.cs")) - add_line("Architecture", mono_test.Architecture()) add_line("Operating System", mono_test.OperatingSystem()) add_line("Platform Type", mono_test.PlatformType()) - add_line("Texture Compression", mono_test.TextureCompression()) add_header("Software") add_line("OS name", OS.get_name()) diff --git a/mono/2.5d/2.5D Demo with C#.csproj b/mono/2.5d/2.5D Demo with C#.csproj index 67ba2740..3910bfbc 100644 --- a/mono/2.5d/2.5D Demo with C#.csproj +++ b/mono/2.5d/2.5D Demo with C#.csproj @@ -1,55 +1,18 @@ - - + - Debug - AnyCPU {5CA791DB-5050-44D0-989B-41D559AB1D50} Library - .mono/temp/bin/$(Configuration) Empty.DMono 2.5D Demo with C# - v4.5 - .mono/temp/obj - $(BaseIntermediateOutputPath)/$(Configuration) - Debug - Release 1.0.0.0 - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG; - prompt - 4 - false - - - portable - true - $(GodotDefineConstants);GODOT; - prompt - 4 - false - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG;TOOLS; - prompt - 4 - false + net472 + + false + false + false - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll - @@ -64,11 +27,5 @@ - - - 1.0.0 - All - - - + \ No newline at end of file diff --git a/mono/README.md b/mono/README.md index 12e29698..d0363413 100644 --- a/mono/README.md +++ b/mono/README.md @@ -8,7 +8,7 @@ Languages: All have [C#](https://docs.godotengine.org/en/latest/getting_started/ Renderers: Dodge the Creeps is GLES 3, rest are GLES 2 -# Note: Godot 3.2.2 or newer is required +# Note: Godot 3.2.3 or newer is required While most of the demos work with any 3.2.x version, these demos require -at least Godot 3.2.2 since there are large C#-specific changes in 3.2.2. +at least Godot 3.2.3 since there are large C#-specific changes in 3.2.3. diff --git a/mono/android_iap/Android in-app purchases with C#.csproj b/mono/android_iap/Android in-app purchases with C#.csproj index 3ec130a4..b0436f21 100644 --- a/mono/android_iap/Android in-app purchases with C#.csproj +++ b/mono/android_iap/Android in-app purchases with C#.csproj @@ -1,70 +1,28 @@ - - - - Debug - AnyCPU - {480953C3-B1FD-42F6-8A07-51A3F69024D7} - Library - .mono\temp\bin\$(Configuration) - AndroidInAppPurchasesWithCSharp - Android in-app purchases with C# - v4.7 - 1.0.0.0 - .mono\temp\obj - $(BaseIntermediateOutputPath)\$(Configuration) - Debug - Release - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG; - prompt - 4 - false - - - portable - true - $(GodotDefineConstants);GODOT; - prompt - 4 - false - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG;TOOLS; - prompt - 4 - false - - - - 1.0.0 - All - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll - - - - - - - - - - - - - - + + + {480953C3-B1FD-42F6-8A07-51A3F69024D7} + Library + AndroidInAppPurchasesWithCSharp + Android in-app purchases with C# + 1.0.0.0 + net472 + + false + false + false + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mono/dodge_the_creeps/Dodge the Creeps with C#.csproj b/mono/dodge_the_creeps/Dodge the Creeps with C#.csproj index 86ec3a9e..06badaaf 100644 --- a/mono/dodge_the_creeps/Dodge the Creeps with C#.csproj +++ b/mono/dodge_the_creeps/Dodge the Creeps with C#.csproj @@ -1,55 +1,18 @@ - - + - Debug - AnyCPU {75CB0382-CCCC-4A4D-ABF0-C6CD04D9F832} Library - .mono\temp\bin\$(Configuration) DodgetheCreepswithC Dodge the Creeps with C# - v4.7 1.0.7374.16792 - .mono\temp\obj - $(BaseIntermediateOutputPath)\$(Configuration) - Debug - Release - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG; - prompt - 4 - false - - - portable - true - $(GodotDefineConstants);GODOT; - prompt - 4 - false - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG;TOOLS; - prompt - 4 - false + net472 + + false + false + false - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll - @@ -59,11 +22,5 @@ - - - 1.0.0 - All - - - + \ No newline at end of file diff --git a/mono/pong/Pong with C#.csproj b/mono/pong/Pong with C#.csproj index 85980ee2..5dc98f68 100644 --- a/mono/pong/Pong with C#.csproj +++ b/mono/pong/Pong with C#.csproj @@ -1,69 +1,26 @@ - - - - Debug - AnyCPU - {EBA5981B-C37E-48C5-A3B6-4390D9834F9A} - Library - .mono/temp/bin/$(Configuration) - PongwithC - Pong with C# - v4.5 - .mono/temp/obj - $(BaseIntermediateOutputPath)/$(Configuration) - Debug - Release - 1.0.0.0 - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG; - prompt - 4 - false - - - portable - true - $(GodotDefineConstants);GODOT; - prompt - 4 - false - - - true - portable - false - $(GodotDefineConstants);GODOT;DEBUG;TOOLS; - prompt - 4 - false - - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll - - - False - $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll - - - - - - - - - - - - - 1.0.0 - All - - - + + + {EBA5981B-C37E-48C5-A3B6-4390D9834F9A} + Library + PongwithC + Pong with C# + 1.0.0.0 + net472 + + false + false + false + + + + + + + + + + + + \ No newline at end of file