tonytins/citylimits-next
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minimap: simplified formula is k = M/32

Browse source
This commit is contained in:
Antti Hakkarainen 2023-02-15 00:14:43 +02:00
parent 7805b02f0d
commit 0d2f305eb5
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
project.godot
View file

@ -59,5 +59,4 @@ camera_move={
[rendering] [rendering]
driver/threads/thread_model=2
environment/defaults/default_clear_color=Color(0, 0, 0, 1) environment/defaults/default_clear_color=Color(0, 0, 0, 1)

2
scripts/Main.gd
View file

@ -20,7 +20,7 @@ var map_filenames:Array = [
"res://maps/tampere_256px.png", "res://maps/tampere_256px.png",
"res://maps/tampere_10x10km_4096px.png" "res://maps/tampere_10x10km_4096px.png"
] ]
var map_filename:String = map_filenames[2] var map_filename:String = map_filenames[1]
var _world_generator:WorldGenerator var _world_generator:WorldGenerator

10
scripts/Minimap.gd
View file

@ -6,7 +6,6 @@ signal set_camera_position(pos:Vector2)
@onready var minimap_texture:ImageTexture = null @onready var minimap_texture:ImageTexture = null
@onready var sprite:Sprite2D @onready var sprite:Sprite2D
var is_mouse_inside_minimap:bool = false var is_mouse_inside_minimap:bool = false
var position_multiplier var position_multiplier
@ -20,12 +19,11 @@ func _draw():
pass pass
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(_delta): func _process(_delta):
if !is_mouse_inside_minimap: if !is_mouse_inside_minimap:
Globals.camera_marker.position = Vector2i( Globals.camera_marker.position = Vector2i(
Globals.CAMERA_POSITION.x / position_multiplier, # 8 on 256 size map. need a forumla to calculate this Globals.CAMERA_POSITION.x / position_multiplier,
Globals.CAMERA_POSITION.y / position_multiplier, # 8 on 256 size map Globals.CAMERA_POSITION.y / position_multiplier,
) )
@ -34,9 +32,7 @@ func _on_main_worldgen_ready():
self.set_minimap() self.set_minimap()
self.setup_camera_marker() self.setup_camera_marker()
# log2(x) = log10(x) / log10(2) position_multiplier = Globals.map_size / 32
var power = log(Globals.map_size) / log(2) - 8
position_multiplier = 8 * pow(2, power)
func _on_mouse_entered(): func _on_mouse_entered():