mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-01 10:15:45 +00:00
Upgrade to Godot 4.5.1
This commit is contained in:
parent
9f644c9c5c
commit
0b9ae63f77
37 changed files with 82 additions and 17 deletions
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Godot.NET.Sdk/4.5.0">
|
||||
<Project Sdk="Godot.NET.Sdk/4.5.1">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<EnableDynamicLoading>true</EnableDynamicLoading>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Godot.NET.Sdk/4.5.0-rc.1">
|
||||
<Project Sdk="Godot.NET.Sdk/4.5.0">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<EnableDynamicLoading>true</EnableDynamicLoading>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -40,10 +40,6 @@ Your support adds motivation to develop my public projects.
|
|||
* Sphere
|
||||
* 3D Text
|
||||
|
||||
2D:
|
||||
|
||||
* **[Work in progress]**
|
||||
|
||||
Overlay:
|
||||
|
||||
* Text (with grouping and coloring)
|
||||
|
|
@ -150,8 +146,8 @@ The entire text overlay can only be placed in one corner.
|
|||
|
||||
## More screenshots
|
||||
|
||||
`DebugDrawDemoScene.tscn` in editor
|
||||
`DD3DDemo.tscn` in editor
|
||||

|
||||
|
||||
`DebugDrawDemoScene.tscn` in play mode
|
||||
`DD3DDemo.tscn` in play mode
|
||||

|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[configuration]
|
||||
|
||||
entry_symbol = "debug_draw_3d_library_init"
|
||||
compatibility_minimum = "4.2.2"
|
||||
compatibility_minimum = "4.3.0"
|
||||
reloadable = false
|
||||
|
||||
[dependencies]
|
||||
|
|
@ -13,6 +13,7 @@ reloadable = false
|
|||
macos = { }
|
||||
windows.x86_64 = { }
|
||||
linux.x86_64 = { }
|
||||
linux.arm64 = { }
|
||||
|
||||
; by default godot is using threads
|
||||
web.wasm32.nothreads = {}
|
||||
|
|
@ -31,6 +32,7 @@ ios = {}
|
|||
macos.template_release = { }
|
||||
windows.template_release.x86_64 = { }
|
||||
linux.template_release.x86_64 = { }
|
||||
linux.template_release.arm64 = { }
|
||||
|
||||
web.template_release.wasm32.nothreads = { }
|
||||
web.template_release.wasm32 = { }
|
||||
|
|
@ -48,6 +50,7 @@ ios.template_release = {}
|
|||
macos.template_release.forced_dd3d = { }
|
||||
windows.template_release.x86_64.forced_dd3d = { }
|
||||
linux.template_release.x86_64.forced_dd3d = { }
|
||||
linux.template_release.arm64.forced_dd3d = { }
|
||||
|
||||
web.template_release.wasm32.nothreads.forced_dd3d = { }
|
||||
web.template_release.wasm32.forced_dd3d = { }
|
||||
|
|
@ -62,6 +65,7 @@ ios.template_release.forced_dd3d = {}
|
|||
macos = "libs/libdd3d.macos.editor.universal.framework"
|
||||
windows.x86_64 = "libs/libdd3d.windows.editor.x86_64.dll"
|
||||
linux.x86_64 = "libs/libdd3d.linux.editor.x86_64.so"
|
||||
linux.arm64 = "libs/libdd3d.linux.editor.arm64.so"
|
||||
|
||||
web.wasm32.nothreads = "libs/libdd3d.web.template_debug.wasm32.wasm"
|
||||
web.wasm32 = "libs/libdd3d.web.template_debug.wasm32.threads.wasm"
|
||||
|
|
@ -79,6 +83,7 @@ ios = "libs/libdd3d.ios.template_debug.universal.dylib"
|
|||
macos.template_release = "libs/libdd3d.macos.template_release.universal.framework"
|
||||
windows.template_release.x86_64 = "libs/libdd3d.windows.template_release.x86_64.dll"
|
||||
linux.template_release.x86_64 = "libs/libdd3d.linux.template_release.x86_64.so"
|
||||
linux.template_release.arm64 = "libs/libdd3d.linux.template_release.arm64.so"
|
||||
|
||||
web.template_release.wasm32.nothreads = "libs/libdd3d.web.template_release.wasm32.wasm"
|
||||
web.template_release.wasm32 = "libs/libdd3d.web.template_release.wasm32.threads.wasm"
|
||||
|
|
@ -96,6 +101,7 @@ ios.template_release = "libs/libdd3d.ios.template_release.universal.dylib"
|
|||
macos.template_release.forced_dd3d = "libs/libdd3d.macos.template_release.universal.enabled.framework"
|
||||
windows.template_release.x86_64.forced_dd3d = "libs/libdd3d.windows.template_release.x86_64.enabled.dll"
|
||||
linux.template_release.x86_64.forced_dd3d = "libs/libdd3d.linux.template_release.x86_64.enabled.so"
|
||||
linux.template_release.arm64.forced_dd3d = "libs/libdd3d.linux.template_release.arm64.enabled.so"
|
||||
|
||||
web.template_release.wasm32.nothreads.forced_dd3d = "libs/libdd3d.web.template_release.wasm32.enabled.wasm"
|
||||
web.template_release.wasm32.forced_dd3d = "libs/libdd3d.web.template_release.wasm32.threads.enabled.wasm"
|
||||
|
|
@ -112,6 +118,7 @@ ios.template_release.forced_dd3d = "libs/libdd3d.ios.template_release.universal.
|
|||
macos.double = "libs/libdd3d.macos.editor.universal.double.framework"
|
||||
windows.x86_64.double = "libs/libdd3d.windows.editor.x86_64.double.dll"
|
||||
linux.x86_64.double = "libs/libdd3d.linux.editor.x86_64.double.so"
|
||||
linux.arm64.double = "libs/libdd3d.linux.editor.arm64.double.so"
|
||||
|
||||
web.wasm32.nothreads.double = "libs/libdd3d.web.template_debug.wasm32.double.wasm"
|
||||
web.wasm32.double = "libs/libdd3d.web.template_debug.wasm32.threads.double.wasm"
|
||||
|
|
@ -121,7 +128,7 @@ android.arm64.double = "libs/libdd3d.android.template_debug.arm64.double.so"
|
|||
android.x86_32.double = "libs/libdd3d.android.template_debug.x86_32.double.so"
|
||||
android.x86_64.double = "libs/libdd3d.android.template_debug.x86_64.double.so"
|
||||
|
||||
ios.double = "libs/libdd3d.ios.template_debug.universal.dylib"
|
||||
ios.double = "libs/libdd3d.ios.template_debug.universal.double.dylib"
|
||||
|
||||
; -------------------------------------
|
||||
; release no debug draw
|
||||
|
|
@ -129,6 +136,7 @@ ios.double = "libs/libdd3d.ios.template_debug.universal.dylib"
|
|||
macos.template_release.double = "libs/libdd3d.macos.template_release.universal.double.framework"
|
||||
windows.template_release.x86_64.double = "libs/libdd3d.windows.template_release.x86_64.double.dll"
|
||||
linux.template_release.x86_64.double = "libs/libdd3d.linux.template_release.x86_64.double.so"
|
||||
linux.template_release.arm64.double = "libs/libdd3d.linux.template_release.arm64.double.so"
|
||||
|
||||
web.template_release.wasm32.nothreads.double = "libs/libdd3d.web.template_release.wasm32.double.wasm"
|
||||
web.template_release.wasm32.double = "libs/libdd3d.web.template_release.wasm32.threads.double.wasm"
|
||||
|
|
@ -146,6 +154,7 @@ ios.template_release.double = "libs/libdd3d.ios.template_release.universal.doubl
|
|||
macos.template_release.forced_dd3d.double = "libs/libdd3d.macos.template_release.universal.enabled.double.framework"
|
||||
windows.template_release.x86_64.forced_dd3d.double = "libs/libdd3d.windows.template_release.x86_64.enabled.double.dll"
|
||||
linux.template_release.x86_64.forced_dd3d.double = "libs/libdd3d.linux.template_release.x86_64.enabled.double.so"
|
||||
linux.template_release.arm64.forced_dd3d.double = "libs/libdd3d.linux.template_release.arm64.enabled.double.so"
|
||||
|
||||
web.template_release.wasm32.nothreads.forced_dd3d.double = "libs/libdd3d.web.template_release.wasm32.enabled.double.wasm"
|
||||
web.template_release.wasm32.forced_dd3d.double = "libs/libdd3d.web.template_release.wasm32.threads.enabled.double.wasm"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/// 1.5.1
|
||||
/// 1.6.0
|
||||
/// ////////////////////////////////////////////////
|
||||
/// THIS FILE HAS BEEN GENERATED.
|
||||
/// THE CHANGES IN THIS FILE WILL BE OVERWRITTEN
|
||||
|
|
@ -967,9 +967,17 @@ internal class DebugDraw3DConfig : _DebugDrawInstanceWrapper_
|
|||
|
||||
public DebugDraw3DConfig() : this((GodotObject)ClassDB.Instantiate("DebugDraw3DConfig")) { }
|
||||
|
||||
public enum CullingMode : long
|
||||
{
|
||||
Disabled = 0,
|
||||
Rough = 1,
|
||||
Precise = 2,
|
||||
}
|
||||
|
||||
private static readonly StringName __prop_freeze_3d_render = "freeze_3d_render";
|
||||
private static readonly StringName __prop_visible_instance_bounds = "visible_instance_bounds";
|
||||
private static readonly StringName __prop_use_frustum_culling = "use_frustum_culling";
|
||||
private static readonly StringName __prop_frustum_culling_mode = "frustum_culling_mode";
|
||||
private static readonly StringName __prop_frustum_length_scale = "frustum_length_scale";
|
||||
private static readonly StringName __prop_force_use_camera_from_scene = "force_use_camera_from_scene";
|
||||
private static readonly StringName __prop_geometry_render_layers = "geometry_render_layers";
|
||||
|
|
@ -994,6 +1002,12 @@ internal class DebugDraw3DConfig : _DebugDrawInstanceWrapper_
|
|||
set => ClassDB.ClassSetProperty(Instance, __prop_use_frustum_culling, value);
|
||||
}
|
||||
|
||||
public DebugDraw3DConfig.CullingMode FrustumCullingMode
|
||||
{
|
||||
get => (DebugDraw3DConfig.CullingMode)(long)ClassDB.ClassGetProperty(Instance, __prop_frustum_culling_mode);
|
||||
set => ClassDB.ClassSetProperty(Instance, __prop_frustum_culling_mode, (long)value);
|
||||
}
|
||||
|
||||
public float FrustumLengthScale
|
||||
{
|
||||
get => (float)ClassDB.ClassGetProperty(Instance, __prop_frustum_length_scale);
|
||||
|
|
@ -1052,6 +1066,8 @@ internal class DebugDraw3DScopeConfig : _DebugDrawInstanceWrapper_, IDisposable
|
|||
private static readonly StringName __get_text_outline_size = "get_text_outline_size";
|
||||
private static readonly StringName __set_text_font = "set_text_font";
|
||||
private static readonly StringName __get_text_font = "get_text_font";
|
||||
private static readonly StringName __set_text_fixed_size = "set_text_fixed_size";
|
||||
private static readonly StringName __get_text_fixed_size = "get_text_fixed_size";
|
||||
// Additional custom statics
|
||||
private static readonly StringName ___manual_unregister = "_manual_unregister";
|
||||
|
||||
|
|
@ -1461,6 +1477,46 @@ internal class DebugDraw3DScopeConfig : _DebugDrawInstanceWrapper_, IDisposable
|
|||
}
|
||||
}
|
||||
|
||||
public DebugDraw3DScopeConfig SetTextFixedSize(bool value)
|
||||
{
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
if (_DebugDrawUtils_.IsCallEnabled)
|
||||
#endif
|
||||
{
|
||||
#if (!DEBUG || FORCED_DD3D) || (DEBUG && !FORCED_DD3D)
|
||||
return (DebugDraw3DScopeConfig)_DebugDrawUtils_.CreateWrapperFromObject((GodotObject)Instance?.Call(__set_text_fixed_size, value));
|
||||
#endif
|
||||
}
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
return default;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
public bool GetTextFixedSize()
|
||||
{
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
if (_DebugDrawUtils_.IsCallEnabled)
|
||||
#endif
|
||||
{
|
||||
#if (!DEBUG || FORCED_DD3D) || (DEBUG && !FORCED_DD3D)
|
||||
return (bool)(Instance?.Call(__get_text_fixed_size));
|
||||
#endif
|
||||
}
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#if !DEBUG && !FORCED_DD3D
|
||||
return default;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -153,11 +153,13 @@ Hold Shift to print information on the Output panel when manually starting gener
|
|||
Wrapper...
|
||||
Constants...
|
||||
Enums...
|
||||
CullingMode
|
||||
Methods...
|
||||
Properties...
|
||||
freeze_3d_render
|
||||
visible_instance_bounds
|
||||
use_frustum_culling
|
||||
frustum_culling_mode
|
||||
frustum_length_scale
|
||||
force_use_camera_from_scene
|
||||
geometry_render_layers
|
||||
|
|
@ -188,6 +190,8 @@ Hold Shift to print information on the Output panel when manually starting gener
|
|||
get_text_outline_size
|
||||
set_text_font
|
||||
get_text_font
|
||||
set_text_fixed_size
|
||||
get_text_fixed_size
|
||||
Properties...
|
||||
Class: DebugDrawManager
|
||||
Wrapper...
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -17,9 +17,9 @@
|
|||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright (c) Dmitriy Salnikov.</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -17,9 +17,9 @@
|
|||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright (c) Dmitriy Salnikov.</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -17,9 +17,9 @@
|
|||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright (c) Dmitriy Salnikov.</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.5.1</string>
|
||||
<string>1.6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue