Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="d93fed55188c4b987b8011c05e3c4a85"
source_md5="07ec0ee604426ade08b9c15b7c3958d7"
dest_md5="ba38d23a0722eba4877bfde8baeea36e"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="f3297387732f4537e31ffe279116fe29"
source_md5="0b093f99c1a81ddda7de76c4c200a43c"
dest_md5="86d2cc1796ef79379722546fea1ca712"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="9bad7f3b947804872c4bf0068d4a3edb"
source_md5="4dc59564642cff79cafe628920e915a1"
dest_md5="2646ff76fac2ea8743cfd53690b3c5c2"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="c7a02bf139df58f1e562443c5d3808fc"
source_md5="527e652bae8efd51bc9a0b798b35ce3d"
dest_md5="02922d8956435359b8c416a11e67018c"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="57ebbbd546bea01b4f1bcdca0fb34f87"
source_md5="c7f86a2fdf19e11330b358d2575cd561"
dest_md5="36aafbc9bbe31d98c2dbd65fba3ba520"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="d9e082a392c1fa1aa8e31c1d7e838638"
source_md5="b43ca2196c4f366ea839f1f8f8ef0f41"
dest_md5="f266efef8011bf4dde5f04c729733942"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="bd5d398c63fadda96641a92c5ce4fc0c"
source_md5="276c85e8cb73cd46b25b3fbb134b2700"
dest_md5="4bb50d986bea1242a7a7d274f2b755c1"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="583706c8b28a9bb56070340269d1ffdc"
source_md5="0d89a9bece74b684dc8cbe4cc1b6ad0d"
dest_md5="a8194a78d59e155db6d107308662729e"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="a2f47f54693d925df441274566d80c66"
source_md5="be81fe653461897f0bcf66f092279346"
dest_md5="37fdfdbad6920ab208873df98c940519"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="8a1ded2b02ae32c861caab3c8c33a799"
source_md5="bce0493626e5e264e1db461f42c1b62e"
dest_md5="d025d5832d5a4323a9c3c8d428c51bdc"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="2265de702969598868ae26e2cf8c514b"
source_md5="a2772d8ae8ac1ddad5745e1f744ba9ce"
dest_md5="0aba1f56db0fdc28b461c133c7add38a"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="7c9a1d1375eed0a0af1a5f4ccdbc82a2"
source_md5="f7789f264566cc9ec80be351e8ab5d77"
dest_md5="5338884b535fc6b92bc3a16a72b82190"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="dd9dd385dbfea58b31e05efcf47f57ac"
source_md5="d25ed20643fe2c23da6f4403d58e7e22"
dest_md5="9d54751542275418b015a95ec521be2d"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="c8fc37e9e44468f3361445537cf772f7"
source_md5="6b64d7cda5d7b9e1aee22f3010a9bfb7"
dest_md5="572af38774db2079adb4b7b443e087c0"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="a5ec395afee5bb7ec5a55b21df11979c"
source_md5="0899fd885f4df40120c90e3d08512904"
dest_md5="122f27560aa82ce62d2c95ec3730e039"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="cf0abe01a29d773812d39a464945c52a"
source_md5="7fc3268a4b6df033a81dd4e4cc1c3e3b"
dest_md5="770970d05abc6ce7259b062760c5674b"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="fe4ae8d3525f3edda3f3de393ae3b1cb"
source_md5="24a18d10ed493769221e0f571adf74b9"
dest_md5="54ce1291bddca88090fc6381e72afe54"

26 changes: 26 additions & 0 deletions Prototype/MainCamera.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
extends Camera2D

var is_panning = false

var last_mouse = Vector2(0.0,0.0)


#Seems like get_global_mouse_transform doesn't update immediately after the camera is moved
func custom_get_global_mouse_position():
return transform.affine_inverse().xform(get_viewport().get_mouse_position())

func _unhandled_input(event):
if event.is_action("pan"):
is_panning = event.is_action_pressed("pan")
if event.is_action_pressed("zoom_in"):
zoom *= 0.9
if event.is_action_pressed("zoom_out"):
zoom *= 1.1
func _process(delta):
scale = Vector2(1.0/zoom.x, 1.0/zoom.y)
var delta_mouse = last_mouse - custom_get_global_mouse_position()

if is_panning:
translate(delta_mouse)

last_mouse = custom_get_global_mouse_position()
4 changes: 3 additions & 1 deletion Prototype/TestScene.tscn
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]

[ext_resource path="res://MainCamera.gd" type="Script" id=1]
[ext_resource path="res://Utils/UnitController.tscn" type="PackedScene" id=2]
[ext_resource path="res://Battlefield/BattleField.tscn" type="PackedScene" id=3]
[ext_resource path="res://TestScene.gd" type="Script" id=4]
Expand Down Expand Up @@ -81,6 +82,7 @@ team = 1
[node name="Camera2D" type="Camera2D" parent="."]
position = Vector2( 512, 128 )
current = true
script = ExtResource( 1 )

[node name="UnitController" parent="." instance=ExtResource( 2 )]
z_index = 10
Expand Down
18 changes: 18 additions & 0 deletions Prototype/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,24 @@ texture={
"svg/scale": 1.0
}

[input]

pan={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":3,"pressed":false,"doubleclick":false,"script":null)
]
}
zoom_in={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null)
]
}
zoom_out={
"deadzone": 0.5,
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null)
]
}

[layer_names]

2d_physics/layer_9="Unit"
Expand Down