slapin/kicking-high
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Started implementing prologue

Browse Source
This commit is contained in:
Segey Lapin
2019-08-19 23:38:12 +03:00
parent 005ef6cf6d
commit a339140e0c
55 changed files with 4633 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
proto2/autoloads/notifications.gd
View File

@@ -7,6 +7,7 @@ extends Node
# Called when the node enters the scene tree for the first time.
var quest_notification_scene = preload("res://ui/start_quest_notification.tscn")
var quest_complete_notification_scene = preload("res://ui/quest_complete_notification.tscn")
var narration_notification_scene = preload("res://ui/narration_notification.tscn")
var qn: Node
func _ready():
pass # Replace with function body.
@@ -18,7 +19,7 @@ func _ready():
var queue = []
const cooldown_time: float = 3.0
var time_count: float = 0.0
enum {N_QUEST, N_QUEST_COMPLETE, N_OTHER}
enum {N_QUEST, N_QUEST_COMPLETE, N_NARRATION, N_OTHER}
enum {STATE_INIT, STATE_IDLE, STATE_DISPLAY}
var state: int = STATE_INIT
func quest_notfication(title, desc):
@@ -26,6 +27,14 @@ func quest_notfication(title, desc):
func quest_complete_notfication(title, desc):
queue.push_back({"type": N_QUEST_COMPLETE, "title": title, "desc": desc})
func narration_notification(text):
queue.push_back({"type": N_NARRATION, "text": text})
var _main: Node
func set_main(main: Node):
_main = main
func _process(delta):
match(state):
@@ -50,14 +59,19 @@ func _process(delta):
match(data.type):
N_QUEST:
qn = quest_notification_scene.instance()
get_node("/root/main").add_child(qn)
_main.add_child(qn)
qn.display_notification(data.title, data.desc)
time_count = 0.0
N_QUEST_COMPLETE:
qn = quest_complete_notification_scene.instance()
get_node("/root/main").add_child(qn)
_main.add_child(qn)
qn.display_notification(data.title)
time_count = 0.0
N_NARRATION:
qn = narration_notification_scene.instance()
_main.add_child(qn)
qn.display_notification(data.text)
time_count = 0.0
state = STATE_IDLE
if time_count < 2000.0:
time_count += delta

58
proto2/autoloads/roadmap.gd
View File

@@ -25,6 +25,7 @@ var vertex_queue = []
var vertices = []
var front = []
var lots: Lots
var grid: GridData
class Lots:
enum {LOT_FOREST, LOT_AIRPORT, LOT_PARK, LOT_CEMETERY, LOT_RESIDENTAL, LOT_INDUSTRIAL}
@@ -150,11 +151,61 @@ class Lots:
continue
lots.push_back({
"polygon": polygon,
"xform": xform
"xform": xform,
"type": lot_types[lot_type_name].type,
"type_name": lot_type_name
})
break
func get_point3d(v: Vector2):
var v3d : = Vector3()
v3d.x = v.x - map_width * 0.5
v3d.z = v.y - map_height * 0.5
class GridData:
var grid = {}
var p2id = {}
func _point2grid(v: Vector2):
var grid_x = int(v.x / 100.0)
var grid_y = int(v.y / 100.0)
return hash([grid_x, grid_y])
func add_point_to_grid(p: Vector2, id: int) -> bool:
var g = _point2grid(p)
if grid.has(g):
if !p in grid[g]:
grid[g].push_back(p)
p2id[p] = id
return true
else:
return false
else:
grid[g] = PoolVector2Array()
grid[g].push_back(p)
p2id[p] = id
return true
func radius_search(p: Vector2, radius: float):
var p0 = Vector2(p.x - radius, p.y - radius)
var p1 = Vector2(p.x + radius, p.y + radius)
var p0x = _point2grid(p0) - Vector2(1, 1)
var p1x = _point2grid(p0) + Vector2(1, 1)
var posx = int(p0x.x)
var posy = int(p0x.y)
var rangex = p1x - p0x
var rangex_x = int(rangex.x)
var rangex_y = int(rangex.y)
var points = []
for gy in range(rangex_y):
for gx in range(rangex_x):
var id = hash([posx + gx, posy + gy])
if grid.has(id):
points += Array(grid[id])
var radius_sq = radius * radius
var ret = PoolIntArray()
for e in points:
if e.distance_squared_to(p) <= radius_sq:
ret.push_back(p2id[e])
return ret
#class PointDB:
# var _points: PoolVector2Array = PoolVector2Array()
# var _triangles: PoolIntArray = PoolIntArray()
@@ -1270,6 +1321,9 @@ func _process(delta):
state = STATE_POLYGONS2
print("polygons built")
STATE_POLYGONS2:
grid = GridData.new()
for v in range(vertices.size()):
grid.add_point_to_grid(vertices[v].pos, v)
# if polygon_queue.size() > 0:
# var item = polygon_queue.pop_front()
# var p1 = item[0]