Map icons

Icon.gd

@@ -1,19 +1,10 @@
 extends Sprite3D
 
+const Utils = preload("utils.gd")
+
 var texture_path
 func set_icon_image(texture_path: String):
 	self.texture_path = texture_path
-
-	var texture_file = File.new()
-	var image = Image.new()
-	texture_file.open(texture_path, File.READ)
-	image.load_png_from_buffer(texture_file.get_buffer(texture_file.get_len()))
-	texture_file.close()
-	image.lock()
-
-	var texture = ImageTexture.new()
-	texture.create_from_image(image) #, 6)
-
-
+	var texture = Utils.new().generate_texture(texture_path, 'RGB')
 	self.texture = texture
 	self.material_override.set_shader_param("texture_albedo", texture)

Icon2D.gd

@@ -0,0 +1,10 @@
+extends Sprite
+
+const Utils = preload("utils.gd")
+
+func set_icon_image(texture_path: String):
+	var texture = Utils.new().generate_texture(texture_path, 'RGB')
+	self.texture = texture
+	# TODO: Figure out a better heuristic. Why 0.05?
+	var scaling_factor = 0.05
+	self.apply_scale(Vector2(scaling_factor, scaling_factor))

Icon2D.tscn

@@ -0,0 +1,29 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://Icon2D.gd" type="Script" id=1]
+
+[sub_resource type="Shader" id=1]
+code = "shader_type canvas_item;
+render_mode unshaded,blend_mix;
+
+uniform vec2 minimap_corner;
+uniform vec2 minimap_corner2;
+
+void fragment() {
+	COLOR = vec4(0,0,0,0);
+	vec2 screen_pixel_size = vec2(textureSize(SCREEN_TEXTURE, 0));
+	vec2 screen_pixel = SCREEN_UV * screen_pixel_size;
+	if (screen_pixel.x > minimap_corner.x && screen_pixel.x < minimap_corner2.x
+	&& screen_pixel.y > minimap_corner.y && screen_pixel.y < minimap_corner2.y) {
+		COLOR = texture(TEXTURE, vec2(UV.y, -UV.x));
+	}
+}"
+
+[sub_resource type="ShaderMaterial" id=2]
+shader = SubResource( 1 )
+shader_param/minimap_corner = Vector2( 0, 0 )
+shader_param/minimap_corner2 = Vector2( 0, 0 )
+
+[node name="Icon2D" type="Sprite"]
+material = SubResource( 2 )
+script = ExtResource( 1 )

Spatial.gd

@@ -11,6 +11,8 @@ var compass_is_top_right: bool
 
 var edit_panel_open: bool = false
 
+const Utils = preload("utils.gd")
+
 # This is the path to the texture that will be used for the next created 3d-path
 # object or icon object in the UI
 var next_texture_path: String = ""
@@ -284,8 +286,9 @@ func reset_minimap_masks():
 		compass_corner2 = compass_corner1 + Vector2(compass_width, compass_height)
 
 	for minimap_path in $Control/MiniMap.get_children():
-		minimap_path.material.set_shader_param("minimap_corner", compass_corner1)
-		minimap_path.material.set_shader_param("minimap_corner2", compass_corner2)
+		if minimap_path.material != null:
+			minimap_path.material.set_shader_param("minimap_corner", compass_corner1)
+			minimap_path.material.set_shader_param("minimap_corner2", compass_corner2)
 
 var markerdata = {}
 var marker_file_path = ""
@@ -329,6 +332,7 @@ var route_scene = load("res://Route.tscn")
 var icon_scene = load("res://Icon.tscn")
 var path2d_scene = load("res://Route2D.tscn")
 var gizmo_scene = load("res://Gizmo/PointEdit.tscn")
+var icon2d_scene = load("res://Icon2D.tscn")
 
 ##########Gizmo Stuff###########
 # How long the ray to search for 3D clickable object should be.
@@ -436,53 +440,28 @@ func gen_new_path(points: Array, texture_path: String):
 	# TODO: We want to have two copies of each texture in memory one for 2D 
 	# which does not use srgb to render properly, and one for 3D which forces
 	# srgb to render properly. Issue #23.
-	var texture_file = File.new()
-	var image = Image.new()
-	if !texture_file.file_exists(texture_path):
-		print("Warning: File does not exist: ", texture_path)
-	texture_file.open(texture_path, File.READ)
-	image.load_png_from_buffer(texture_file.get_buffer(texture_file.get_len()))
-	texture_file.close()
-	image.lock()
-	var texture = ImageTexture.new()
-	texture.storage = ImageTexture.STORAGE_COMPRESS_LOSSLESS
-	texture.create_from_image(image, 22)
-
-
+	var texture_3d = Utils.new().generate_texture(texture_path, 'sRGB')
+	var texture_2d = Utils.new().generate_texture(texture_path, 'RGB')
 
 	# Create a new 3D route
 	var new_route = route_scene.instance()
-#	var new_curve = Curve3D.new()
-#	for point in points:
-#		new_curve.add_point(Vector3(point[0], point[1], -point[2]))
-#		points_2d.append(Vector2(point[0], -point[2]))
-
-#	new_path.curve = new_curve
 	new_route.texture_path = texture_path # Save the location of the image for later
-	#path_3d_markers.append(new_path)
 
 	var points_3d := PoolVector3Array()
 	for point in points:
 		points_3d.append(Vector3(point[0], point[1], -point[2]))
 
 	new_route.create_mesh(points_3d)
-	new_route.set_texture(texture)
+	new_route.set_texture(texture_3d)
 	paths.add_child(new_route)
 
-
-
-
-
-
-
 	for point in points:
 		points_2d.append(Vector2(point[0], -point[2]))
-
-
+
 	# Create a new 2D Path
 	var new_2d_path = path2d_scene.instance()
 	new_2d_path.points = points_2d
-	new_2d_path.texture = texture
+	new_2d_path.texture = texture_2d
 	minimap.add_child(new_2d_path)
 
 	self.currently_active_path = new_route
@@ -501,6 +480,11 @@ func gen_new_icon(position: Vector3, texture_path: String):
 	#icon_markers.append(new_icon)
 	icons.add_child(new_icon)
 
+	var minimap_icon = icon2d_scene.instance()
+	minimap_icon.set_position(Vector2(position[0], position[2]))
+	minimap_icon.set_icon_image(texture_path)
+	minimap.add_child(minimap_icon)
+
 # This function take all of the currently rendered objects and converts it into
 # the data format that is saved/loaded from.
 func data_from_renderview():

Spatial.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://Spatial.gd" type="Script" id=1]
 [ext_resource path="res://shaders/range_indicators.shader" type="Shader" id=2]
@@ -12,6 +12,7 @@
 [ext_resource path="res://icon_new_path.png" type="Texture" id=10]
 [ext_resource path="res://icon_new_point.png" type="Texture" id=11]
 [ext_resource path="res://SettingsDialog.gd" type="Script" id=12]
+[ext_resource path="res://Icon2D.gd" type="Script" id=13]
 
 [sub_resource type="Shader" id=1]
 code = "shader_type canvas_item;
@@ -70,6 +71,9 @@ scale = Vector2( 2, 2 )
 
 [node name="Line2D" parent="Control/MiniMap" instance=ExtResource( 4 )]
 
+[node name="Icon2D" type="Sprite" parent="Control/MiniMap"]
+script = ExtResource( 13 )
+
 [node name="GlobalMenuButton" type="Control" parent="Control"]
 margin_left = 287.348
 margin_right = 314.348

project.godot

@@ -14,13 +14,19 @@ _global_script_classes=[ {
 "language": "NativeScript",
 "path": "res://tacoparser.gdns"
 }, {
+"base": "Reference",
+"class": "Utils",
+"language": "GDScript",
+"path": "res://utils.gd"
+}, {
 "base": "",
 "class": "X11_FG",
 "language": "NativeScript",
 "path": "res://Spatial.gdns"
 } ]
 _global_script_class_icons={
 "TacoParser": "",
+"Utils": "",
 "X11_FG": ""
 }
 

utils.gd

@@ -0,0 +1,25 @@
+class_name Utils
+
+func load_image_from_path(path: String):
+	var file = File.new()
+	if !file.file_exists(path):
+		print("Warning: File does not exist: ", path)
+	var image = Image.new()
+	file.open(path, File.READ)
+	image.load_png_from_buffer(file.get_buffer(file.get_len()))
+	file.close()
+	image.lock()
+	return image
+
+func generate_texture(texture_path: String, color_space: String):
+	var image = load_image_from_path(texture_path)
+	var texture = ImageTexture.new()
+	var flag = 7
+	var accepted_color_spaces = ['sRGB', 'RGB']
+	if color_space == 'sRGB':
+		flag = 22
+	if !accepted_color_spaces.has(color_space):
+		print("Only RGB and sRGB accepted. Defaulting to RGB.")
+	texture.create_from_image(image, flag)
+	texture.storage = ImageTexture.STORAGE_COMPRESS_LOSSLESS
+	return texture