fixed up voxel, voxelview and default voxelset

Clark was here :V
ClarkThyLord · Jan 23, 2020 · 6de41de · 6de41de
1 parent 58ea885
commit 6de41de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/addons/Voxel-Core/defaults/VoxelSet.default.gd b/addons/Voxel-Core/defaults/VoxelSet.default.gd
@@ -12,12 +12,12 @@ extends "res://addons/Voxel-Core/src/VoxelSet.gd"
 
 # The following will initialize the object as needed
 func _load():
-	set_voxel(Voxel.colored(Color.black, {}, {'name': 'black'}), 'black')
-	set_voxel(Voxel.colored(Color.white, {}, {'name': 'white'}))
-	set_voxel(Voxel.colored(Color.red, {}, {'name': 'red'}))
-	set_voxel(Voxel.colored(Color.green, {}, {'name': 'green'}))
-	set_voxel(Voxel.colored(Color.blue, {}, {'name': 'blue'}))
-	set_voxel(Voxel.colored(Color.yellow, {}, {'name': 'yellow'}))
-	set_voxel(Voxel.colored(Color.cyan, {}, {'name': 'cyan'}))
-	set_voxel(Voxel.colored(Color.purple, {}, {'name': 'purple'}))
-	set_voxel(Voxel.colored(Color.magenta, {}, {'name': 'magenta'}))
+	set_voxel(Voxel.colored(Color.black), 'black')
+	set_voxel(Voxel.colored(Color.white), 'white')
+	set_voxel(Voxel.colored(Color.red), 'red')
+	set_voxel(Voxel.colored(Color.green), 'green')
+	set_voxel(Voxel.colored(Color.blue), 'blue')
+	set_voxel(Voxel.colored(Color.yellow), 'yellow')
+	set_voxel(Voxel.colored(Color.cyan), 'cyan')
+	set_voxel(Voxel.colored(Color.purple), 'purple')
+	set_voxel(Voxel.colored(Color.magenta), 'magenta')
diff --git a/addons/Voxel-Core/engine/BottomPanel/VoxelSetView/VoxelView/VoxelView.gd b/addons/Voxel-Core/engine/BottomPanel/VoxelSetView/VoxelView/VoxelView.gd
@@ -63,7 +63,7 @@ func setup(voxelsetview, id, voxel : Dictionary) -> void:
 	Represents = voxel
 	VoxelSetView = voxelsetview
 
-	hint_tooltip = 'ID: ' + str(id)
+	hint_tooltip = 'ID: ' + str(id) + str((' | Name: ' + voxel['data']['vsn']) if voxel.has('data') and voxel['data'].has('vsn') else '')
 
 	get_node('CenterContainer/Color').color = Voxel.get_color(voxel)
 

diff --git a/addons/Voxel-Core/src/Voxel.gd b/addons/Voxel-Core/src/Voxel.gd
@@ -165,7 +165,10 @@ static func basic(data : Dictionary = {}) -> Dictionary:
 #   get_data({ ... })   ->   { ... }
 #
 static func get_data(voxel : Dictionary) -> Dictionary:
-	return voxel['data'] if typeof(voxel.get('data')) == TYPE_DICTIONARY else {}
+	if typeof(voxel.get('data')) == TYPE_NIL:
+		voxel['data'] = {}
+	return voxel['data']
+#	return voxel['data'] if typeof(voxel.get('data')) == TYPE_DICTIONARY else {}
 
 # Helper function for setting 'data' of given Voxel
 # voxel   :   Dictionary   -   Voxel to modify