diff --git a/fps_demo.tscn b/fps_demo.tscn index 7593038..5a3c8de 100644 --- a/fps_demo.tscn +++ b/fps_demo.tscn @@ -1,15 +1,18 @@ [gd_scene load_steps=47 format=2] -[ext_resource path="res://TrokaraScripts/classic_character.gd" type="Script" id=1] -[ext_resource path="res://TrokaraScripts/controllable_pivot.gd" type="Script" id=2] +[ext_resource path="res://TrokaraScripts/3D/classic_character.gd" type="Script" id=1] +[ext_resource path="res://TrokaraScripts/3D/controllable_pivot.gd" type="Script" id=2] [ext_resource path="res://mat_light.material" type="Material" id=3] [ext_resource path="res://mat_mid.material" type="Material" id=4] [ext_resource path="res://mat_dark.material" type="Material" id=5] -[ext_resource path="res://TrokaraScripts/controllable_character_movement.gd" type="Script" id=6] +[ext_resource path="res://TrokaraScripts/3D/controllable_character_movement.gd" type="Script" id=6] [ext_resource path="res://speedometer.gd" type="Script" id=7] [ext_resource path="res://TrokaraScripts/controllable_character_jump.gd" type="Script" id=8] [ext_resource path="res://gobot_animator.gd" type="Script" id=9] + + + [sub_resource type="CylinderShape" id=1] radius = 0.4 height = 1.11919 diff --git a/project.godot b/project.godot index 1c93c03..dd9deb6 100644 --- a/project.godot +++ b/project.godot @@ -17,12 +17,12 @@ _global_script_classes=[ { "base": "KinematicBody", "class": "Character", "language": "GDScript", -"path": "res://TrokaraScripts/character.gd" +"path": "res://TrokaraScripts/3D/character.gd" }, { "base": "KinematicBody2D", "class": "Character2D", "language": "GDScript", -"path": "res://TrokaraScripts/character2d.gd" +"path": "res://TrokaraScripts/2D/character2d.gd" }, { "base": "Node", "class": "CharacterJump", @@ -32,22 +32,22 @@ _global_script_classes=[ { "base": "Node", "class": "CharacterMovement", "language": "GDScript", -"path": "res://TrokaraScripts/character_movement.gd" +"path": "res://TrokaraScripts/3D/character_movement.gd" }, { "base": "Node", "class": "CharacterMovement2D", "language": "GDScript", -"path": "res://TrokaraScripts/character_movement_2d.gd" +"path": "res://TrokaraScripts/2D/character_movement_2d.gd" }, { "base": "Character", "class": "ClassicCharacter", "language": "GDScript", -"path": "res://TrokaraScripts/classic_character.gd" +"path": "res://TrokaraScripts/3D/classic_character.gd" }, { "base": "Character2D", "class": "ClassicCharacter2D", "language": "GDScript", -"path": "res://TrokaraScripts/classic_character_2d.gd" +"path": "res://TrokaraScripts/2D/classic_character_2d.gd" }, { "base": "CharacterJump", "class": "ControllableCharacterJump", @@ -57,37 +57,37 @@ _global_script_classes=[ { "base": "CharacterMovement", "class": "ControllableCharacterMovement", "language": "GDScript", -"path": "res://TrokaraScripts/controllable_character_movement.gd" +"path": "res://TrokaraScripts/3D/controllable_character_movement.gd" }, { "base": "CharacterMovement2D", "class": "ControllableCharacterMovement2D", "language": "GDScript", -"path": "res://TrokaraScripts/controllable_character_movement_2d.gd" +"path": "res://TrokaraScripts/2D/controllable_character_movement_2d.gd" }, { "base": "PivotPoint", "class": "ControllablePivot", "language": "GDScript", -"path": "res://TrokaraScripts/controllable_pivot.gd" +"path": "res://TrokaraScripts/3D/controllable_pivot.gd" }, { "base": "Spatial", "class": "KinematicArm", "language": "GDScript", -"path": "res://TrokaraScripts/kinematic_arm.gd" +"path": "res://TrokaraScripts/3D/kinematic_arm.gd" }, { "base": "Spatial", "class": "PivotPoint", "language": "GDScript", -"path": "res://TrokaraScripts/pivot_point.gd" +"path": "res://TrokaraScripts/3D/pivot_point.gd" }, { "base": "Spatial", "class": "PointingNode", "language": "GDScript", -"path": "res://TrokaraScripts/pointing_node.gd" +"path": "res://TrokaraScripts/3D/pointing_node.gd" }, { "base": "KinematicArm", "class": "ScrollableKinematicArm", "language": "GDScript", -"path": "res://TrokaraScripts/scrollable_kinematic_arm.gd" +"path": "res://TrokaraScripts/3D/scrollable_kinematic_arm.gd" }, { "base": "Spatial", "class": "TransformReceiver", diff --git a/tps_demo.tscn b/tps_demo.tscn index 3d06839..c1c930e 100644 --- a/tps_demo.tscn +++ b/tps_demo.tscn @@ -1,16 +1,21 @@ [gd_scene load_steps=50 format=2] -[ext_resource path="res://TrokaraScripts/classic_character.gd" type="Script" id=1] -[ext_resource path="res://TrokaraScripts/controllable_pivot.gd" type="Script" id=2] -[ext_resource path="res://TrokaraScripts/scrollable_kinematic_arm.gd" type="Script" id=3] +[ext_resource path="res://TrokaraScripts/3D/classic_character.gd" type="Script" id=1] +[ext_resource path="res://TrokaraScripts/3D/controllable_pivot.gd" type="Script" id=2] +[ext_resource path="res://TrokaraScripts/3D/scrollable_kinematic_arm.gd" type="Script" id=3] [ext_resource path="res://speedometer.gd" type="Script" id=4] -[ext_resource path="res://TrokaraScripts/controllable_character_movement.gd" type="Script" id=5] +[ext_resource path="res://TrokaraScripts/3D/controllable_character_movement.gd" type="Script" id=5] [ext_resource path="res://TrokaraScripts/controllable_character_jump.gd" type="Script" id=6] [ext_resource path="res://mat_dark.material" type="Material" id=8] [ext_resource path="res://mat_light.material" type="Material" id=9] [ext_resource path="res://mat_mid.material" type="Material" id=10] [ext_resource path="res://gobot_animator.gd" type="Script" id=11] -[ext_resource path="res://TrokaraScripts/pointing_node.gd" type="Script" id=12] +[ext_resource path="res://TrokaraScripts/3D/pointing_node.gd" type="Script" id=12] + + + + + [sub_resource type="CylinderShape" id=1] radius = 0.4