diff --git a/aseprite/palm-tree.aseprite b/aseprite/palm-tree.aseprite new file mode 100644 index 0000000..ba72f0a Binary files /dev/null and b/aseprite/palm-tree.aseprite differ diff --git a/aseprite/truck-interior.aseprite b/aseprite/truck-interior.aseprite new file mode 100644 index 0000000..7659239 Binary files /dev/null and b/aseprite/truck-interior.aseprite differ diff --git a/blender/road.blend b/blender/road.blend index b23fcab..8cb93aa 100644 Binary files a/blender/road.blend and b/blender/road.blend differ diff --git a/blender/road.blend1 b/blender/road.blend1 index 0cbfdbd..6aa13b3 100644 Binary files a/blender/road.blend1 and b/blender/road.blend1 differ diff --git a/blender/road_clover+grass-64x64.png b/blender/road_clover+grass-64x64.png new file mode 100644 index 0000000..7a881fa Binary files /dev/null and b/blender/road_clover+grass-64x64.png differ diff --git a/blender/road_clover+grass-64x64.png.import b/blender/road_clover+grass-64x64.png.import new file mode 100644 index 0000000..7286ed5 --- /dev/null +++ b/blender/road_clover+grass-64x64.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bv6xyavrko8pt" +path.s3tc="res://.godot/imported/road_clover+grass-64x64.png-3ecbc3bba0bf60c10dbe09ff1fbc26da.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "2a29c758d2d9723c895c01e5921737a9" +} + +[deps] + +source_file="res://blender/road_clover+grass-64x64.png" +dest_files=["res://.godot/imported/road_clover+grass-64x64.png-3ecbc3bba0bf60c10dbe09ff1fbc26da.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/objects/road.glb b/objects/road.glb index 20ef250..e0e29ca 100644 Binary files a/objects/road.glb and b/objects/road.glb differ diff --git a/objects/road_clover+grass-64x64.png b/objects/road_clover+grass-64x64.png new file mode 100644 index 0000000..7a881fa Binary files /dev/null and b/objects/road_clover+grass-64x64.png differ diff --git a/objects/road_clover+grass-64x64.png.import b/objects/road_clover+grass-64x64.png.import new file mode 100644 index 0000000..769c918 --- /dev/null +++ b/objects/road_clover+grass-64x64.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2auwk46k0y28" +path.s3tc="res://.godot/imported/road_clover+grass-64x64.png-d92a937111c1a927974aecf4c3161435.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "2a29c758d2d9723c895c01e5921737a9" +} + +[deps] + +source_file="res://objects/road_clover+grass-64x64.png" +dest_files=["res://.godot/imported/road_clover+grass-64x64.png-d92a937111c1a927974aecf4c3161435.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/scenes/game.tscn b/scenes/game.tscn index 780fb90..4b7a1fa 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=9 format=3 uid="uid://d4ljkc7l57udr"] +[gd_scene load_steps=10 format=3 uid="uid://d4ljkc7l57udr"] -[ext_resource type="PackedScene" uid="uid://r1q4xvfbrc7l" path="res://scenes/roadmanager.tscn" id="1_lbhrr"] -[ext_resource type="PackedScene" uid="uid://dtncvl5af4fhr" path="res://objects/road.glb" id="1_uwrxv"] +[ext_resource type="Script" uid="uid://hufd4xlq7b6k" path="res://scripts/road_manager.gd" id="1_lbhrr"] +[ext_resource type="PackedScene" uid="uid://mu3b314l3soy" path="res://scenes/road.tscn" id="1_lnu2h"] [ext_resource type="Script" uid="uid://cs0y5pe8qnj2r" path="res://scripts/player.gd" id="2_lnu2h"] [ext_resource type="PackedScene" uid="uid://cewenjpq8wbig" path="res://objects/testcar.glb" id="2_yqjtg"] +[ext_resource type="Texture2D" uid="uid://4kfwwijnbqlw" path="res://sprites/interior_overlays/truck-interior.png" id="5_iywne"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_lnu2h"] sky_top_color = Color(0, 0.388235, 1, 1) @@ -24,62 +25,54 @@ size = Vector3(3.60051, 2.21851, 1.87103) [node name="Game" type="Node3D"] -[node name="Node3D" parent="." instance=ExtResource("1_lbhrr")] +[node name="SubViewportContainer" type="SubViewportContainer" parent="."] +texture_filter = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +stretch = true +stretch_shrink = 4 -[node name="RoadManager" parent="." instance=ExtResource("1_lbhrr")] +[node name="SubViewport" type="SubViewport" parent="SubViewportContainer"] +handle_input_locally = false +size = Vector2i(320, 240) +render_target_update_mode = 4 -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="WorldEnvironment" type="WorldEnvironment" parent="SubViewportContainer/SubViewport"] environment = SubResource("Environment_iywne") -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.866023, -0.433016, 0.250001, 0, 0.499998, 0.866027, -0.500003, 0.749999, -0.43301, 0, 0, 0) +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewportContainer/SubViewport"] +transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -0.500003, 0.749999, -0.43301, 0, 0, 0) shadow_enabled = true -[node name="RoadBlocks" type="Node3D" parent="."] - -[node name="Road" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -10.549, 9.53674e-07, 0.0019331) - -[node name="Road2" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 9.5, 0, 0) - -[node name="Road3" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -50.613, 9.53674e-07, 0.0019331) - -[node name="Road4" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -30.564, 0, 0) - -[node name="Road5" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -89.5907, 9.53674e-07, 0.0019331) - -[node name="Road6" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -69.5417, 0, 0) - -[node name="Road7" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -129.655, 9.53674e-07, 0.0019331) - -[node name="Road8" parent="RoadBlocks" instance=ExtResource("1_uwrxv")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -109.606, 0, 0) - -[node name="Player" type="CharacterBody3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.449395) +[node name="Player" type="CharacterBody3D" parent="SubViewportContainer/SubViewport"] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.510139, 0, -0.578158) script = ExtResource("2_lnu2h") -[node name="TestCar" parent="Player" instance=ExtResource("2_yqjtg")] +[node name="TestCar" parent="SubViewportContainer/SubViewport/Player" instance=ExtResource("2_yqjtg")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.53674e-07, -0.463639) +visible = false -[node name="FrontLeftWheel" type="Node3D" parent="Player/TestCar"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.8, 0.3, 1.2) - -[node name="FrontRightWheel" type="Node3D" parent="Player/TestCar"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8, 0.3, 1.2) - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Player"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/Player"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.279745, 1.10964, -0.462006) shape = SubResource("BoxShape3D_yqjtg") -[node name="Head" type="Node3D" parent="Player"] +[node name="Head" type="Node3D" parent="SubViewportContainer/SubViewport/Player"] transform = Transform3D(0.965536, 0.260269, 0, -0.260269, 0.965536, 0, 0, 0, 1, 0, 1.54334, -0.215674) -[node name="Camera3D" type="Camera3D" parent="Player/Head"] -transform = Transform3D(-4.25071e-08, -0.233123, 0.972447, -1.01901e-08, 0.972447, 0.233123, -1, 4.14113e-14, -4.37115e-08, -0.181639, 0.104743, 0.247312) +[node name="Camera3D" type="Camera3D" parent="SubViewportContainer/SubViewport/Player/Head"] +transform = Transform3D(-2.19056e-08, -0.570069, 0.821597, -5.39943e-08, 0.821597, 0.570069, -1, -3.18738e-08, -4.8778e-08, -0.181639, 0.104743, 0.247312) + +[node name="RoadManager" type="Node3D" parent="SubViewportContainer/SubViewport" node_paths=PackedStringArray("player")] +script = ExtResource("1_lbhrr") +player = NodePath("../Player") + +[node name="Road" parent="SubViewportContainer/SubViewport/RoadManager" instance=ExtResource("1_lnu2h")] + +[node name="CanvasLayer" type="CanvasLayer" parent="SubViewportContainer/SubViewport"] + +[node name="Sprite2D" type="Sprite2D" parent="SubViewportContainer/SubViewport/CanvasLayer"] +position = Vector2(160, 120) +texture = ExtResource("5_iywne") diff --git a/scenes/road.tscn b/scenes/road.tscn index 6d0d25f..a404f91 100644 --- a/scenes/road.tscn +++ b/scenes/road.tscn @@ -1,17 +1,56 @@ -[gd_scene load_steps=3 format=3 uid="uid://bl4v7fq6p7evj"] +[gd_scene load_steps=3 format=3 uid="uid://mu3b314l3soy"] [ext_resource type="PackedScene" uid="uid://dtncvl5af4fhr" path="res://objects/road.glb" id="1_mv8x7"] - -[sub_resource type="BoxShape3D" id="BoxShape3D_1s9f8"] -size = Vector3(20, 10, 20) +[ext_resource type="Texture2D" uid="uid://d5joix6cbuik" path="res://sprites/palm-tree.png" id="2_my2y2"] [node name="Road" type="Node3D"] [node name="RoadObject" parent="." instance=ExtResource("1_mv8x7")] transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) -[node name="DespawnArea" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -10) +[node name="Trees" type="Node3D" parent="."] -[node name="CollisionShape3D" type="CollisionShape3D" parent="DespawnArea"] -shape = SubResource("BoxShape3D_1s9f8") +[node name="PalmTree" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 2.93877, 2.34261, -9.49557) +flip_h = true +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree5" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, -2.83949, 2.34261, -14.0975) +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree6" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 1.1861, 2.34261, -20.8587) +flip_h = true +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree7" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 5.2136, 2.34261, -16.6129) +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree2" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 2.34261, 9.30729) +flip_h = true +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree8" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 5.74419, 2.34261, 13.1949) +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree3" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, -3.32652, 2.34261, 13.0005) +flip_h = true +billboard = 1 +texture = ExtResource("2_my2y2") + +[node name="PalmTree4" type="Sprite3D" parent="Trees"] +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 2.34261, 17.0532) +flip_h = true +billboard = 1 +texture = ExtResource("2_my2y2") diff --git a/scenes/roadmanager.tscn b/scenes/roadmanager.tscn deleted file mode 100644 index 6a9b1e1..0000000 --- a/scenes/roadmanager.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://r1q4xvfbrc7l"] - -[ext_resource type="Script" uid="uid://bkbm887f6xqpi" path="res://scripts/road_manager.gd" id="1_r1qkb"] - -[node name="RoadManager" type="Node3D"] -script = ExtResource("1_r1qkb") diff --git a/scripts/player.gd b/scripts/player.gd index a59a908..d370b1b 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -8,9 +8,6 @@ extends CharacterBody3D var current_speed: float = 0.0 -func _ready(): - add_to_group("player") - func _physics_process(delta: float) -> void: # Apply gravity if not is_on_floor(): diff --git a/scripts/road.gd b/scripts/road.gd deleted file mode 100644 index f752090..0000000 --- a/scripts/road.gd +++ /dev/null @@ -1,18 +0,0 @@ -extends Node3D - -@export var despawn_distance := 50.0 # Distance behind player to despawn -var player: Node3D - -func _ready(): - # Find the player once when road spawns - player = get_tree().get_first_node_in_group("player") - - # Set up despawn area - var area = $DespawnArea - area.body_exited.connect(_on_body_exited) - area.position.z -= 10 # Adjust for scaled position - -func _on_body_exited(body: Node): - if body == player: - if global_position.x < player.global_position.x - despawn_distance: - queue_free() \ No newline at end of file diff --git a/scripts/road.gd.uid b/scripts/road.gd.uid deleted file mode 100644 index 752aeb5..0000000 --- a/scripts/road.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b0pm2dfsugptw diff --git a/scripts/road_manager.gd b/scripts/road_manager.gd index f044f2e..21303a9 100644 --- a/scripts/road_manager.gd +++ b/scripts/road_manager.gd @@ -1,45 +1,54 @@ extends Node3D -@export var road_scene: PackedScene = preload("res://scenes/road.tscn") -@export var initial_roads := 5 # Number of roads to spawn on each side -@export var road_spacing := 20.0 # Exact spacing from original scene -@export var spawn_distance := 50.0 # Distance ahead to spawn new roads +@export var player: CharacterBody3D +@export var spawn_distance: float = 100.0 +@export var despawn_distance: float = 200.0 -var player: Node3D -var last_spawn_x := 0.0 +var road_scene = preload("res://scenes/road.tscn") +var roads = [] +var road_length: float func _ready(): - # Use call_deferred to ensure player exists - call_deferred("initialize_player") + # Calculate road length from existing instance + var temp_road = road_scene.instantiate() + # Get the MeshInstance3D from the road scene structure + var mesh_instance = temp_road.get_node("RoadObject") as MeshInstance3D + if mesh_instance: + var aabb = mesh_instance.mesh.get_aabb() + road_length = aabb.size.x * mesh_instance.scale.x + else: + push_error("Could not find RoadObject MeshInstance3D in road scene") + road_length = 20.0 # Fallback value + temp_road.queue_free() + + # Initialize with existing road + var initial_road = $Road + roads.append(initial_road) -func initialize_player(): - player = get_tree().get_first_node_in_group("player") +func _process(delta): if not player: - push_error("Player not found in 'player' group!") return - # Initialize starting roads relative to player position - var start_x = floor(player.global_position.x / 20.0) * 20.0 - for i in range(-initial_roads, initial_roads): - spawn_road(start_x + i * 20.0) - last_spawn_x = start_x + initial_roads * 20.0 - -func _process(_delta): - if not player: - return # Skip if player not found + var player_x = player.global_position.x - # Check road spawning based on player's X position - if player.global_position.x > last_spawn_x - spawn_distance: - spawn_road(last_spawn_x + 20.0) - last_spawn_x += 20.0 + # Spawn new roads ahead + var last_road = roads[-1] + var last_road_end = last_road.global_position.x + road_length + if player_x + spawn_distance > last_road_end: + spawn_road(last_road_end) + + # Despawn old roads behind + for road in roads.duplicate(): + var road_end = road.global_position.x + road_length + if player_x - road_end > despawn_distance: + despawn_road(road) -func spawn_road(x_position: float): +func spawn_road(position_x: float): var new_road = road_scene.instantiate() - # Add proper positioning based on original road spacing - new_road.global_transform = Transform3D( - Vector3(2, 0, 0), - Vector3(0, 2, 0), - Vector3(0, 0, 2), - Vector3(x_position, 0, 0) - ) + new_road.global_position = Vector3(position_x, 0, 0) add_child(new_road) + roads.append(new_road) + +func despawn_road(road: Node3D): + road.queue_free() + roads.erase(road) diff --git a/scripts/road_manager.gd.uid b/scripts/road_manager.gd.uid index af7ecd7..dd456b5 100644 --- a/scripts/road_manager.gd.uid +++ b/scripts/road_manager.gd.uid @@ -1 +1 @@ -uid://bkbm887f6xqpi +uid://hufd4xlq7b6k diff --git a/sprites/interior_overlays/truck-interior.png b/sprites/interior_overlays/truck-interior.png new file mode 100644 index 0000000..fa7485c Binary files /dev/null and b/sprites/interior_overlays/truck-interior.png differ diff --git a/sprites/interior_overlays/truck-interior.png.import b/sprites/interior_overlays/truck-interior.png.import new file mode 100644 index 0000000..338eeef --- /dev/null +++ b/sprites/interior_overlays/truck-interior.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4kfwwijnbqlw" +path="res://.godot/imported/truck-interior.png-b04ac59f5a4db67414c278f28b096834.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/interior_overlays/truck-interior.png" +dest_files=["res://.godot/imported/truck-interior.png-b04ac59f5a4db67414c278f28b096834.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/sprites/palm-tree.png b/sprites/palm-tree.png new file mode 100644 index 0000000..c1fe67b Binary files /dev/null and b/sprites/palm-tree.png differ diff --git a/sprites/palm-tree.png.import b/sprites/palm-tree.png.import new file mode 100644 index 0000000..dfcd62b --- /dev/null +++ b/sprites/palm-tree.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d5joix6cbuik" +path.s3tc="res://.godot/imported/palm-tree.png-164b1dab9fd83351c0d9e916940eff92.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://sprites/palm-tree.png" +dest_files=["res://.godot/imported/palm-tree.png-164b1dab9fd83351c0d9e916940eff92.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0