spoody/nordic2025
1
0
Fork 0
Code Issues 10 Pull requests Actions Packages Projects 1 Releases Wiki Activity

stop fucking formatting my files godot

Browse source
This commit is contained in:
Snorre 2025-04-05 17:03:51 +02:00
parent c8139edf2a
commit f8f1cbaab7
5 changed files with 105 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
project.godot
View file

@ -22,6 +22,10 @@ project/assembly_name="nordic25"
import/blender/enabled=false import/blender/enabled=false
[rendering]
renderer/rendering_method="mobile"
[xr] [xr]
openxr/enabled=true openxr/enabled=true

1
scenes/test.tscn
View file

@ -48,6 +48,7 @@ transform = Transform3D(1, 0, 0, 0, -0.837394, -0.546599, 0, 0.546599, -0.837394
shape = SubResource("CapsuleShape3D_74lek") shape = SubResource("CapsuleShape3D_74lek")
[node name="Player" parent="." instance=ExtResource("2_iyx0m")] [node name="Player" parent="." instance=ExtResource("2_iyx0m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.576159)
[node name="test pellet" parent="." instance=ExtResource("3_iyx0m")] [node name="test pellet" parent="." instance=ExtResource("3_iyx0m")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00932735, 0.01, -0.0187979) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00932735, 0.01, -0.0187979)

7
scripts/Mouth.cs
View file

@ -28,7 +28,6 @@ public partial class Mouth : XRCamera3D
return; return;
UpdateWeights(body.Mass); UpdateWeights(body.Mass);
} }
catch (System.InvalidCastException) catch (System.InvalidCastException)
{ {
@ -38,10 +37,14 @@ public partial class Mouth : XRCamera3D
void UpdateWeights(float mass = 0f) void UpdateWeights(float mass = 0f)
{ {
GD.Print("Ate ", mass, "kg");
MaxEatWeight += (mass / MaxEatWeight) * EatGrowthFactor; MaxEatWeight += (mass / MaxEatWeight) * EatGrowthFactor;
((XROrigin3D)GetParent()).WorldScale = 1.0f / MaxEatWeight; float WorldScale = 1.0f / MaxEatWeight;
((XROrigin3D)GetParent()).WorldScale = WorldScale;
RightHand.Strength = MaxEatWeight; RightHand.Strength = MaxEatWeight;
LeftHand.Strength = MaxEatWeight; LeftHand.Strength = MaxEatWeight;
GD.Print("New MaxEatWeight: ", MaxEatWeight);
GD.Print("New WorldScale: ", WorldScale);
} }
} }

16
scripts/XRHand.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
public partial class XRHand : XRController3D public partial class XRHand : XRController3D
{ {
List<Generic6DofJoint3D> joints = new(); List<PinJoint3D> joints = new();
[Export] [Export]
StaticBody3D body; StaticBody3D body;
@ -11,16 +11,6 @@ public partial class XRHand : XRController3D
[Export] [Export]
public float Strength = 1.0f; public float Strength = 1.0f;
public override void _Process(double delta)
{
if ((bool)GetInput("trigger_click"))
{
}
else if (joints.Count > 0)
{
}
}
public void OnPress(string name) public void OnPress(string name)
{ {
if (name == "select_button") if (name == "select_button")
@ -46,11 +36,9 @@ public partial class XRHand : XRController3D
} }
if (body.Mass > Strength) if (body.Mass > Strength)
{
continue; continue;
}
Generic6DofJoint3D joint = new(); PinJoint3D joint = new();
joint.NodeA = GetPathTo(body); joint.NodeA = GetPathTo(body);
joint.NodeB = body.GetPath(); joint.NodeB = body.GetPath();
joints.Add(joint); joints.Add(joint);

2
scripts/XrOrigin3d.cs
View file

@ -11,7 +11,7 @@ public partial class XrOrigin3d : XROrigin3D
if (_xrInterface == null || !_xrInterface.IsInitialized()) if (_xrInterface == null || !_xrInterface.IsInitialized())
GD.PushError("Failed to initialize OpenXR"); GD.PushError("Failed to initialize OpenXR");
GD.PushError("OpenXR Initialized successfully"); GD.Print("OpenXR Initialized successfully");
DisplayServer.WindowSetVsyncMode(DisplayServer.VSyncMode.Disabled); DisplayServer.WindowSetVsyncMode(DisplayServer.VSyncMode.Disabled);
GetViewport().UseXR = true; GetViewport().UseXR = true;