summaryrefslogtreecommitdiffhomepage
path: root/Racing-Game/4WheelCar
diff options
context:
space:
mode:
Diffstat (limited to 'Racing-Game/4WheelCar')
-rw-r--r--Racing-Game/4WheelCar/4WheelCar.tscn3
-rw-r--r--Racing-Game/4WheelCar/FrontWheel.gd2
-rw-r--r--Racing-Game/4WheelCar/FrontWheelSprite.gd17
-rw-r--r--Racing-Game/4WheelCar/RemoteTransform2D.gd16
-rw-r--r--Racing-Game/4WheelCar/Skid/BLLine.gd (renamed from Racing-Game/4WheelCar/BLLine.gd)0
-rw-r--r--Racing-Game/4WheelCar/Skid/BRLine.gd (renamed from Racing-Game/4WheelCar/BRLine.gd)0
-rw-r--r--Racing-Game/4WheelCar/Skid/FLLine.gd (renamed from Racing-Game/4WheelCar/FLLine.gd)0
-rw-r--r--Racing-Game/4WheelCar/Skid/FRLine.gd (renamed from Racing-Game/4WheelCar/FRLine.gd)0
-rw-r--r--Racing-Game/4WheelCar/Skid/SkidController.gd (renamed from Racing-Game/4WheelCar/SkidController.gd)4
-rw-r--r--Racing-Game/4WheelCar/Skid/Skidmark.tscn (renamed from Racing-Game/4WheelCar/Skidmark.tscn)8
-rw-r--r--Racing-Game/4WheelCar/Skid/Skidmarks.gd (renamed from Racing-Game/4WheelCar/Skidmarks.gd)0
11 files changed, 9 insertions, 41 deletions
diff --git a/Racing-Game/4WheelCar/4WheelCar.tscn b/Racing-Game/4WheelCar/4WheelCar.tscn
index 84b4549..958cc39 100644
--- a/Racing-Game/4WheelCar/4WheelCar.tscn
+++ b/Racing-Game/4WheelCar/4WheelCar.tscn
@@ -3,9 +3,10 @@
[ext_resource path="res://4WheelCar/CarBody.gd" type="Script" id=1]
[ext_resource path="res://Art(non-orig)/PNG/Cars/big/blue/car_blue_2.png" type="Texture" id=2]
[ext_resource path="res://4WheelCar/FrontWheel.gd" type="Script" id=3]
-[ext_resource path="res://4WheelCar/SkidController.gd" type="Script" id=4]
+[ext_resource path="res://4WheelCar/Skid/SkidController.gd" type="Script" id=4]
[ext_resource path="res://4WheelCar/BackWheel.gd" type="Script" id=5]
+
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=2]
diff --git a/Racing-Game/4WheelCar/FrontWheel.gd b/Racing-Game/4WheelCar/FrontWheel.gd
index 280a8a3..d4e5af4 100644
--- a/Racing-Game/4WheelCar/FrontWheel.gd
+++ b/Racing-Game/4WheelCar/FrontWheel.gd
@@ -10,7 +10,7 @@ var velAngle
var carAngle
var delay = 0
-onready var skidObj = preload("res://4WheelCar/Skidmark.tscn")
+onready var skidObj = preload("res://4WheelCar/Skid/Skidmark.tscn")
var steerDamp = 1
diff --git a/Racing-Game/4WheelCar/FrontWheelSprite.gd b/Racing-Game/4WheelCar/FrontWheelSprite.gd
deleted file mode 100644
index e0426d4..0000000
--- a/Racing-Game/4WheelCar/FrontWheelSprite.gd
+++ /dev/null
@@ -1,17 +0,0 @@
-extends Sprite
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
- pass # Replace with function body.
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-# if Input.is_key_pressed(KEY_A):
-# set_rotation(get_node("../../../../CarBody").get_rotation()-PI/4)
-# if Input.is_key_pressed(KEY_D):
-# set_rotation(get_node("../../../../CarBody").get_rotation()+PI/4)
- pass
diff --git a/Racing-Game/4WheelCar/RemoteTransform2D.gd b/Racing-Game/4WheelCar/RemoteTransform2D.gd
deleted file mode 100644
index b18f706..0000000
--- a/Racing-Game/4WheelCar/RemoteTransform2D.gd
+++ /dev/null
@@ -1,16 +0,0 @@
-extends RemoteTransform2D
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-var camera
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
- var camera = get_node("/root/World/Camera2D")
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
- #camera.global_position = global_position
- #camera.global_rotation = global_rotation;
- pass
diff --git a/Racing-Game/4WheelCar/BLLine.gd b/Racing-Game/4WheelCar/Skid/BLLine.gd
index 042b034..042b034 100644
--- a/Racing-Game/4WheelCar/BLLine.gd
+++ b/Racing-Game/4WheelCar/Skid/BLLine.gd
diff --git a/Racing-Game/4WheelCar/BRLine.gd b/Racing-Game/4WheelCar/Skid/BRLine.gd
index 16578e3..16578e3 100644
--- a/Racing-Game/4WheelCar/BRLine.gd
+++ b/Racing-Game/4WheelCar/Skid/BRLine.gd
diff --git a/Racing-Game/4WheelCar/FLLine.gd b/Racing-Game/4WheelCar/Skid/FLLine.gd
index fffcf04..fffcf04 100644
--- a/Racing-Game/4WheelCar/FLLine.gd
+++ b/Racing-Game/4WheelCar/Skid/FLLine.gd
diff --git a/Racing-Game/4WheelCar/FRLine.gd b/Racing-Game/4WheelCar/Skid/FRLine.gd
index e1fbc0f..e1fbc0f 100644
--- a/Racing-Game/4WheelCar/FRLine.gd
+++ b/Racing-Game/4WheelCar/Skid/FRLine.gd
diff --git a/Racing-Game/4WheelCar/SkidController.gd b/Racing-Game/4WheelCar/Skid/SkidController.gd
index 745b195..b1d8233 100644
--- a/Racing-Game/4WheelCar/SkidController.gd
+++ b/Racing-Game/4WheelCar/Skid/SkidController.gd
@@ -11,7 +11,7 @@ var deleteme = 0;
# Called when the node enters the scene tree for the first time.
func _ready():
- skidFile = load("res://4WheelCar/Skidmark.tscn")
+ skidFile = load("res://4WheelCar/Skid/Skidmark.tscn")
skidRecent = skidFile.instance()
add_child(skidRecent)
@@ -25,7 +25,7 @@ func _process(delta):
# create new skidding child, and set skid to true
skidSwitch = true
- skidFile = load("res://4WheelCar/Skidmark.tscn")
+ skidFile = load("res://4WheelCar/Skid/Skidmark.tscn")
skidRecent = skidFile.instance()
add_child(skidRecent)
#set to run
diff --git a/Racing-Game/4WheelCar/Skidmark.tscn b/Racing-Game/4WheelCar/Skid/Skidmark.tscn
index 46c5d40..17ecee0 100644
--- a/Racing-Game/4WheelCar/Skidmark.tscn
+++ b/Racing-Game/4WheelCar/Skid/Skidmark.tscn
@@ -1,11 +1,11 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://Art(non-orig)/PNG/Objects/skidmark_short_1.png" type="Texture" id=1]
-[ext_resource path="res://4WheelCar/Skidmarks.gd" type="Script" id=2]
+[ext_resource path="res://4WheelCar/Skid/Skidmarks.gd" type="Script" id=1]
+[ext_resource path="res://Art(non-orig)/PNG/Objects/skidmark_short_1.png" type="Texture" id=2]
[node name="Skidmark" type="Line2D"]
position = Vector2( -21.2326, -38.4176 )
default_color = Color( 0.4, 0.501961, 1, 1 )
-texture = ExtResource( 1 )
+texture = ExtResource( 2 )
texture_mode = 192263440
-script = ExtResource( 2 )
+script = ExtResource( 1 )
diff --git a/Racing-Game/4WheelCar/Skidmarks.gd b/Racing-Game/4WheelCar/Skid/Skidmarks.gd
index 4c662b4..4c662b4 100644
--- a/Racing-Game/4WheelCar/Skidmarks.gd
+++ b/Racing-Game/4WheelCar/Skid/Skidmarks.gd