tonytins/citylimits
1
0
Fork 0
mirror of https://github.com/tonytins/citylimits synced 2025-05-05 14:14:49 -04:00
Code Issues Projects Releases Wiki Activity

Split 2D and 3D scripts

Browse source 
- Moved data structure code to /scripts
This commit is contained in:
Tony Bark 2023-12-14 02:29:02 -05:00
parent 36edaaf17b
commit ceae7ebfa6
23 changed files with 77 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scenes/main2d.tscn
View file

@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=3 uid="uid://bliiefbfmdvs2"]
[gd_scene load_steps=7 format=3 uid="uid://bliiefbfmdvs2"]
[ext_resource type="Script" path="res://scripts/builder.gd" id="1_0v0e8"]
[ext_resource type="Script" path="res://scripts/2d/builder2d.gd" id="1_0v0e8"]
[ext_resource type="Texture2D" uid="uid://bng0d1sou7c8a" path="res://sprites/coin.png" id="2_thubv"]
[ext_resource type="Texture2D" uid="uid://cbk07cxgshg26" path="res://sprites/selector.png" id="2_xat7u"]
[ext_resource type="Script" path="res://scripts/2d/view2d.gd" id="3_2wqv3"]
[ext_resource type="FontFile" uid="uid://d0cxd77jybrcn" path="res://fonts/lilita_one_regular.ttf" id="3_twyvq"]
[sub_resource type="LabelSettings" id="LabelSettings_i6wk0"]
@ -12,11 +13,12 @@ shadow_color = Color(0, 0, 0, 0.392157)
[node name="Main2D" type="Node2D"]
[node name="Builder" type="Node2D" parent="." node_paths=PackedStringArray("selector", "selector_container", "view_camera", "cash_display")]
[node name="Builder" type="Node2D" parent="." node_paths=PackedStringArray("selector", "selector_container", "view_camera", "tile_map", "cash_display")]
script = ExtResource("1_0v0e8")
selector = NodePath("Selector")
selector_container = NodePath("Selector/Container")
view_camera = NodePath("../View/Camera2D")
view_camera = NodePath("../View/Camera")
tile_map = NodePath("../TileMap")
cash_display = NodePath("../CanvasLayer/Interface/Wallet/Cash")
[node name="Selector" type="Node2D" parent="Builder"]
@ -28,10 +30,14 @@ texture = ExtResource("2_xat7u")
[node name="Container" type="Node2D" parent="Builder/Selector"]
[node name="View" type="Node2D" parent="."]
script = ExtResource("3_2wqv3")
[node name="Camera2D" type="Camera2D" parent="View"]
[node name="Camera" type="Camera2D" parent="View"]
position = Vector2(566, 362)
[node name="TileMap" type="TileMap" parent="."]
format = 2
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Interface" type="Control" parent="CanvasLayer"]

2
scenes/main3d.tscn
View file

@ -12,7 +12,7 @@
[ext_resource type="Resource" uid="uid://cqvwy36htu81" path="res://structures/road-split.tres" id="7_kqu4g"]
[ext_resource type="Resource" uid="uid://dveu4dnue0d54" path="res://structures/road-intersection.tres" id="8_1swhv"]
[ext_resource type="Resource" uid="uid://dqqe3iofnleup" path="res://structures/pavement-fountain.tres" id="8_4il2q"]
[ext_resource type="Script" path="res://scripts/3d/view.gd" id="8_yovpv"]
[ext_resource type="Script" path="res://scripts/3d/view3d.gd" id="8_yovpv"]
[ext_resource type="Resource" uid="uid://tm532uesguhk" path="res://structures/grass.tres" id="9_ifw7y"]
[ext_resource type="Resource" uid="uid://bh65eqgid4kxy" path="res://structures/building-small-c.tres" id="10_84or2"]
[ext_resource type="Resource" uid="uid://ccb475jeg7ym5" path="res://structures/grass-trees.tres" id="10_vaeah"]

0
scripts/builder.gd → scripts/2d/builder2d.gd
View file

50
scripts/2d/view2d.gd Normal file
View file

@ -0,0 +1,50 @@
extends Node2D
var camera_position:Vector2
var camera_rotation:Vector2
@onready var camera = $Camera
func _ready():
# camera_rotation = rotation_degrees # Initial rotation
pass
func _process(delta):
# Set position and rotation to targets
position = position.lerp(camera_position, delta * 10)
# rotation_degrees = rotation_degrees.lerp(camera_rotation, delta * 6)
handle_input(delta)
# Handle input
func handle_input(_delta):
# Rotation
var input := Vector2.ZERO
input.x = Input.get_axis("camera_left", "camera_right")
input.y = Input.get_axis("camera_forward", "camera_back")
# input = input.rotated(Vector2.UP, rotation.y).normalized()
camera_position += input / 4
# Back to center
if Input.is_action_pressed("camera_center"):
camera_position = Vector2()
func _input(event):
# Rotate camera using mouse (hold 'middle' mouse button)
#if event is InputEventMouseMotion:
#if Input.is_action_pressed("camera_rotate"):
#camera_rotation += Vector2(0, -event.relative.x / 10, 0)
pass

0
scripts/3d/view.gd → scripts/3d/view3d.gd
View file

0
scripts/3d/data_map.gd → scripts/data_map.gd
View file

0
scripts/3d/data_structure.gd → scripts/data_structure.gd
View file

0
scripts/3d/structure.gd → scripts/structure.gd
View file

2
structures/building-garage.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://bqb6g3t0tebno"]
[ext_resource type="PackedScene" uid="uid://d0nnrx2y4px2v" path="res://models/building-garage.glb" id="1_gyclk"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_jrinw"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_jrinw"]
[resource]
script = ExtResource("2_jrinw")

2
structures/building-small-a.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://cntgl86ianngh"]
[ext_resource type="PackedScene" uid="uid://cnycdi6t5tj01" path="res://models/building-small-a.glb" id="1_v5apy"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_q3i1h"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_q3i1h"]
[resource]
script = ExtResource("2_q3i1h")

2
structures/building-small-b.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://c5fveedgvunju"]
[ext_resource type="PackedScene" uid="uid://d2h51qlls136h" path="res://models/building-small-b.glb" id="1_klt7o"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_a2t3e"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_a2t3e"]
[resource]
script = ExtResource("2_a2t3e")

2
structures/building-small-c.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://bh65eqgid4kxy"]
[ext_resource type="PackedScene" uid="uid://m74mvao50wnm" path="res://models/building-small-c.glb" id="1_6yyww"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_rkiq0"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_rkiq0"]
[resource]
script = ExtResource("2_rkiq0")

2
structures/building-small-d.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://dtal0tl2ee336"]
[ext_resource type="PackedScene" uid="uid://h0vrvst3cumo" path="res://models/building-small-d.glb" id="1_164xq"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_8ewai"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_8ewai"]
[resource]
script = ExtResource("2_8ewai")

2
structures/grass-trees-tall.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://y6jafhfnhbrp"]
[ext_resource type="PackedScene" uid="uid://dy26b1ba2j2v1" path="res://models/grass-trees-tall.glb" id="1_nbdd1"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_b2sah"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_b2sah"]
[resource]
script = ExtResource("2_b2sah")

2
structures/grass-trees.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://ccb475jeg7ym5"]
[ext_resource type="PackedScene" uid="uid://b1711sieed2u6" path="res://models/grass-trees.glb" id="1_lcgc1"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_pnpij"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_pnpij"]
[resource]
script = ExtResource("2_pnpij")

2
structures/grass.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://tm532uesguhk"]
[ext_resource type="PackedScene" uid="uid://cr3btp34bp3eg" path="res://models/grass.glb" id="1_2n0ef"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_1i4lf"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_1i4lf"]
[resource]
script = ExtResource("2_1i4lf")

2
structures/pavement-fountain.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://dqqe3iofnleup"]
[ext_resource type="PackedScene" uid="uid://6v0t536s83vb" path="res://models/pavement-fountain.glb" id="1_r2n53"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_wqyte"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_wqyte"]
[resource]
script = ExtResource("2_wqyte")

2
structures/pavement.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://ch8vtcpine1lc"]
[ext_resource type="PackedScene" uid="uid://cpv75mfsda1ml" path="res://models/pavement.glb" id="1_gudnj"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_i48go"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_i48go"]
[resource]
script = ExtResource("2_i48go")

2
structures/road-corner.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://d2jplegnkl6u2"]
[ext_resource type="PackedScene" uid="uid://c4ccm2qr5wa58" path="res://models/road-corner.glb" id="1_r8n8k"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="3_oloyn"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="3_oloyn"]
[resource]
script = ExtResource("3_oloyn")

2
structures/road-intersection.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://dveu4dnue0d54"]
[ext_resource type="PackedScene" uid="uid://euxdh7lkq0oj" path="res://models/road-intersection.glb" id="1_pnjl2"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_3eq5k"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_3eq5k"]
[resource]
script = ExtResource("2_3eq5k")

2
structures/road-split.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://cqvwy36htu81"]
[ext_resource type="PackedScene" uid="uid://mu30r6rmht07" path="res://models/road-split.glb" id="1_ku0rj"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_xa71m"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_xa71m"]
[resource]
script = ExtResource("2_xa71m")

2
structures/road-straight-lightposts.tres
View file

@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://mxrnqinnsqnt"]
[ext_resource type="PackedScene" uid="uid://5kchntr735l" path="res://models/road-straight-lightposts.glb" id="1_i07jw"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="2_470aq"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="2_470aq"]
[resource]
script = ExtResource("2_470aq")

2
structures/road-straight.tres
View file

@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="Structure" load_steps=3 format=3 uid="uid://dv14kkhb6umkv"]
[ext_resource type="Script" path="res://scripts/3d/structure.gd" id="1_5fmmh"]
[ext_resource type="Script" path="res://scripts/structure.gd" id="1_5fmmh"]
[ext_resource type="PackedScene" uid="uid://b4tgtg0j2dgh8" path="res://models/road-straight.glb" id="1_ump1f"]
[resource]