mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-07-03 15:11:15 +00:00
Disable debugdraw in release
This commit is contained in:
parent
7c2d01a52e
commit
34a0e8e380
8 changed files with 70 additions and 68 deletions
|
|
@ -8,6 +8,9 @@
|
||||||
<AssemblyVersion>$(GIT_ASSEMBLY_SEM_VER)</AssemblyVersion>
|
<AssemblyVersion>$(GIT_ASSEMBLY_SEM_VER)</AssemblyVersion>
|
||||||
<FileVersion>$(GIT_ASSEMBLY_SEM_FILE_VER)</FileVersion>
|
<FileVersion>$(GIT_ASSEMBLY_SEM_FILE_VER)</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'ExportRelease' ">
|
||||||
|
<DefineConstants>GODOT;GODOT_WINDOWS;GODOT_PC;GODOT4;GODOT4_5;GODOT4_5_0;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_5_0_OR_GREATER;GODOT;GODOT_WINDOWS;GODOT_PC;GODOT4;GODOT4_5;GODOT4_5_0;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_5_0_OR_GREATER;TRACE;DISABLE_DD3D</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="Export.ps1" />
|
<Content Include="Export.ps1" />
|
||||||
<Content Include="omnisharp.json" />
|
<Content Include="omnisharp.json" />
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,8 @@ AmmoPerShot = 2
|
||||||
RateOfFire = 0.3
|
RateOfFire = 0.3
|
||||||
BulletCapacity = 5
|
BulletCapacity = 5
|
||||||
ReloadTime = 0.6
|
ReloadTime = 0.6
|
||||||
AutoReload = true
|
|
||||||
InfiniteAmmo = true
|
|
||||||
ItemKey = &"LASER_WEAPON"
|
ItemKey = &"LASER_WEAPON"
|
||||||
AmmoKey = &"SHIELD"
|
AmmoKey = &"SHIELD"
|
||||||
BulletsPerShot = 1
|
|
||||||
SpreadAngle = 5.0
|
SpreadAngle = 5.0
|
||||||
RandomSpread = 2.5
|
RandomSpread = 2.5
|
||||||
_rotationOffset = 0.0
|
|
||||||
ShootSound = ExtResource("2_gfnbi")
|
ShootSound = ExtResource("2_gfnbi")
|
||||||
|
|
|
||||||
|
|
@ -5,14 +5,15 @@ namespace Cirno.Scripts.Actors._3D;
|
||||||
[Tool]
|
[Tool]
|
||||||
public partial class PlayerStartMarker3D : Marker3D
|
public partial class PlayerStartMarker3D : Marker3D
|
||||||
{
|
{
|
||||||
|
|
||||||
private readonly Vector3 _boxSize = new Vector3(0.5f, 0.8f, 0.5f);
|
private readonly Vector3 _boxSize = new Vector3(0.5f, 0.8f, 0.5f);
|
||||||
|
|
||||||
public override void _Process(double delta)
|
public override void _Process(double delta)
|
||||||
{
|
{
|
||||||
if (!Engine.IsEditorHint()) return;
|
if (!Engine.IsEditorHint()) return;
|
||||||
|
|
||||||
|
#if !DISABLE_DD3D
|
||||||
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Green);
|
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Green);
|
||||||
|
#endif
|
||||||
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -47,7 +47,6 @@ public partial class EnemyMarker3D : PreviewMarker3D, IActivable
|
||||||
SetSpriteAlpha(0.5f);
|
SetSpriteAlpha(0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -106,9 +105,9 @@ public partial class EnemyMarker3D : PreviewMarker3D, IActivable
|
||||||
public override void _Process(double delta)
|
public override void _Process(double delta)
|
||||||
{
|
{
|
||||||
if (!Engine.IsEditorHint()) return;
|
if (!Engine.IsEditorHint()) return;
|
||||||
|
#if !DISABLE_DD3D
|
||||||
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Red);
|
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Red);
|
||||||
|
#endif
|
||||||
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -124,8 +124,9 @@ public partial class ItemMarker3D : PreviewMarker3D
|
||||||
{
|
{
|
||||||
if (!Engine.IsEditorHint()) return;
|
if (!Engine.IsEditorHint()) return;
|
||||||
|
|
||||||
|
#if !DISABLE_DD3D
|
||||||
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Blue);
|
DebugDraw3D.DrawBox(this.GlobalPosition - _boxSize / 2, Quaternion.Identity, _boxSize, Colors.Blue);
|
||||||
|
#endif
|
||||||
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
//DebugDraw3D.DrawSphere(this.GlobalPosition, 0.1f, Colors.Green);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -7,7 +7,7 @@ public partial class Idle : EnemyStateBase3D
|
||||||
{
|
{
|
||||||
public override EnemyState StateId => EnemyState.Idle;
|
public override EnemyState StateId => EnemyState.Idle;
|
||||||
|
|
||||||
[Export] public EnemyStorage3D Storage { get; private set; }
|
[Export] public EnemyStorage3D Storage { get; private set; }
|
||||||
[Export] public PlayerDetection3D PlayerDetection { get; private set; }
|
[Export] public PlayerDetection3D PlayerDetection { get; private set; }
|
||||||
|
|
||||||
[Export] public GravityProvider GravityProvider { get; private set; }
|
[Export] public GravityProvider GravityProvider { get; private set; }
|
||||||
|
|
@ -44,7 +44,6 @@ public partial class Idle : EnemyStateBase3D
|
||||||
//
|
//
|
||||||
// DamageReceiver.HealthProvider.ResourceDecreased -= HealthProviderOnResourceDecreased;
|
// DamageReceiver.HealthProvider.ResourceDecreased -= HealthProviderOnResourceDecreased;
|
||||||
// DamageReceiver.ChangeState(false);
|
// DamageReceiver.ChangeState(false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HealthProviderOnResourceDepleted()
|
private void HealthProviderOnResourceDepleted()
|
||||||
|
|
@ -83,11 +82,13 @@ public partial class Idle : EnemyStateBase3D
|
||||||
|
|
||||||
if (DebugEnabled)
|
if (DebugEnabled)
|
||||||
{
|
{
|
||||||
DebugDraw3D.DrawText(MainObject.GlobalPosition - new Vector3(0,16,0), "Idle");
|
#if !DISABLE_DD3D
|
||||||
|
DebugDraw3D.DrawText(MainObject.GlobalPosition - new Vector3(0, 16, 0), "Idle");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
MainObject.Velocity = new Vector3(MainObject.Velocity.X, GravityProvider.CalculateGravityVelocity(MainObject.Velocity.Y, delta), MainObject.Velocity.Z);
|
MainObject.Velocity = new Vector3(MainObject.Velocity.X,
|
||||||
|
GravityProvider.CalculateGravityVelocity(MainObject.Velocity.Y, delta), MainObject.Velocity.Z);
|
||||||
|
|
||||||
MainObject.MoveAndSlide();
|
MainObject.MoveAndSlide();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -190,7 +190,6 @@ public partial class Bullet3D : Area3D, IBullet
|
||||||
|
|
||||||
private void ApplyTimeModifiers(double delta)
|
private void ApplyTimeModifiers(double delta)
|
||||||
{
|
{
|
||||||
|
|
||||||
foreach (var modifier in _modifiers)
|
foreach (var modifier in _modifiers)
|
||||||
{
|
{
|
||||||
if (_elapsedTime >= modifier.TimeModifier.TimeInSeconds)
|
if (_elapsedTime >= modifier.TimeModifier.TimeInSeconds)
|
||||||
|
|
@ -207,7 +206,6 @@ public partial class Bullet3D : Area3D, IBullet
|
||||||
}
|
}
|
||||||
|
|
||||||
modifier.TimeModifier.Update(this, delta, modifier.Elapsed);
|
modifier.TimeModifier.Update(this, delta, modifier.Elapsed);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -249,14 +247,14 @@ public partial class Bullet3D : Area3D, IBullet
|
||||||
//_sprite?.Rotate(Vector3.Forward, radians);
|
//_sprite?.Rotate(Vector3.Forward, radians);
|
||||||
//_sprite?.RotateZ(radians);
|
//_sprite?.RotateZ(radians);
|
||||||
//SetRotation(Rotation + radians);
|
//SetRotation(Rotation + radians);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void FacePlayer()
|
public void FacePlayer()
|
||||||
{
|
{
|
||||||
if (GameController.Instance.PlayerPosition.HasValue)
|
if (GameController.Instance.PlayerPosition.HasValue)
|
||||||
{
|
{
|
||||||
_direction = (GameController.Instance.PlayerPosition.Value.ToVector2() - this.GlobalPosition.ToVector2()).Normalized();
|
_direction = (GameController.Instance.PlayerPosition.Value.ToVector2() - this.GlobalPosition.ToVector2())
|
||||||
|
.Normalized();
|
||||||
RotateBullet(0); // quick hack to rotate lasers
|
RotateBullet(0); // quick hack to rotate lasers
|
||||||
//LookAt(player.GlobalPosition);
|
//LookAt(player.GlobalPosition);
|
||||||
}
|
}
|
||||||
|
|
@ -273,8 +271,6 @@ public partial class Bullet3D : Area3D, IBullet
|
||||||
|
|
||||||
SetSpriteRotationToDirection();
|
SetSpriteRotationToDirection();
|
||||||
//SetRotation(Mathf.Atan2(normalized.Y, normalized.X) + Mathf.Pi / 2);
|
//SetRotation(Mathf.Atan2(normalized.Y, normalized.X) + Mathf.Pi / 2);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called every frame. 'delta' is the elapsed time since the previous frame.
|
// Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
|
|
@ -290,7 +286,10 @@ public partial class Bullet3D : Area3D, IBullet
|
||||||
|
|
||||||
if (GameController.Instance is not null && GameController.Instance.DebugDraw)
|
if (GameController.Instance is not null && GameController.Instance.DebugDraw)
|
||||||
{
|
{
|
||||||
DebugDraw3D.DrawSphere(this.GlobalPosition, this._bulletInfo.OriginalBulletResource.BulletSize, Colors.DarkRed);
|
#if !DISABLE_DD3D
|
||||||
|
DebugDraw3D.DrawSphere(this.GlobalPosition, this._bulletInfo.OriginalBulletResource.BulletSize,
|
||||||
|
Colors.DarkRed);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ debug/export_console_wrapper=1
|
||||||
binary_format/embed_pck=false
|
binary_format/embed_pck=false
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=false
|
texture_format/etc2_astc=false
|
||||||
|
shader_baker/enabled=false
|
||||||
binary_format/architecture="x86_64"
|
binary_format/architecture="x86_64"
|
||||||
codesign/enable=false
|
codesign/enable=false
|
||||||
codesign/timestamp=true
|
codesign/timestamp=true
|
||||||
|
|
@ -39,11 +40,11 @@ application/console_wrapper_icon=""
|
||||||
application/icon_interpolation=4
|
application/icon_interpolation=4
|
||||||
application/file_version="0.1.0.0"
|
application/file_version="0.1.0.0"
|
||||||
application/product_version="0.1.0.0"
|
application/product_version="0.1.0.0"
|
||||||
application/company_name="Maddo"
|
application/company_name="Maddo Productions"
|
||||||
application/product_name="Cirno: No Reason"
|
application/product_name="Cirno: No Reason"
|
||||||
application/file_description=""
|
application/file_description=""
|
||||||
application/copyright="Maddo"
|
application/copyright="Maddo"
|
||||||
application/trademarks=""
|
application/trademarks="Maddo Productions, 2025"
|
||||||
application/export_angle=0
|
application/export_angle=0
|
||||||
application/export_d3d12=0
|
application/export_d3d12=0
|
||||||
application/d3d12_agility_sdk_multiarch=true
|
application/d3d12_agility_sdk_multiarch=true
|
||||||
|
|
@ -65,7 +66,7 @@ ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debu
|
||||||
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
||||||
Remove-Item -Recurse -Force '{temp_dir}'"
|
Remove-Item -Recurse -Force '{temp_dir}'"
|
||||||
dotnet/include_scripts_content=false
|
dotnet/include_scripts_content=false
|
||||||
dotnet/include_debug_symbols=true
|
dotnet/include_debug_symbols=false
|
||||||
dotnet/embed_build_outputs=true
|
dotnet/embed_build_outputs=true
|
||||||
|
|
||||||
[preset.1]
|
[preset.1]
|
||||||
|
|
@ -96,6 +97,7 @@ debug/export_console_wrapper=1
|
||||||
binary_format/embed_pck=true
|
binary_format/embed_pck=true
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=false
|
texture_format/etc2_astc=false
|
||||||
|
shader_baker/enabled=false
|
||||||
binary_format/architecture="x86_64"
|
binary_format/architecture="x86_64"
|
||||||
ssh_remote_deploy/enabled=false
|
ssh_remote_deploy/enabled=false
|
||||||
ssh_remote_deploy/host="user@host_ip"
|
ssh_remote_deploy/host="user@host_ip"
|
||||||
|
|
@ -110,5 +112,5 @@ ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
|
||||||
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
|
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
|
||||||
rm -rf \"{temp_dir}\""
|
rm -rf \"{temp_dir}\""
|
||||||
dotnet/include_scripts_content=false
|
dotnet/include_scripts_content=false
|
||||||
dotnet/include_debug_symbols=true
|
dotnet/include_debug_symbols=false
|
||||||
dotnet/embed_build_outputs=false
|
dotnet/embed_build_outputs=false
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue