tools: add ability to specify actor class in Sprite Importer

CHANGELOG.md

@@ -16,6 +16,8 @@ Changelog
 * runtime: removed "io" and "os" libraries from Lua API
 * runtime: small fixes and performance improvements
 * runtime: sprite's frame number now wraps if it is greater than the total number of frames in the sprite
+* tools: added the ability to specify a circle collider in the Sprite Importer
+* tools: added the ability to specify the actor class in the Sprite Importer
 * tools: fixed a crash when entering empty commands in the console
 * tools: fixed an issue that prevented some operations in the Level Editor from being (un/re)done
 * tools: fixed an issue that prevented the data compiler from restoring and saving its state when launched by the Level Editor

tools/level_editor/project.vala

@@ -317,14 +317,15 @@ end
 			Vector2 pivot_xy = sprite_cell_pivot_xy(cell_w, cell_h, sid.pivot.active);
 
 			bool collision_enabled = sid.collision_enabled.active;
-            string circle_square_active_name = (string)sid.circle_square.visible_child_name;
-            int circle_collision_center_x = (int)sid.circle_collision_center_x.value;
-            int circle_collision_center_y = (int)sid.circle_collision_center_y.value;
-            int circle_collision_radius = (int)sid.circle_collision_radius.value;
+			string circle_square_active_name = (string)sid.circle_square.visible_child_name;
+			int circle_collision_center_x = (int)sid.circle_collision_center_x.value;
+			int circle_collision_center_y = (int)sid.circle_collision_center_y.value;
+			int circle_collision_radius = (int)sid.circle_collision_radius.value;
 			int collision_x = (int)sid.collision_x.value;
 			int collision_y = (int)sid.collision_y.value;
 			int collision_w = (int)sid.collision_w.value;
 			int collision_h = (int)sid.collision_h.value;
+			string actor_class = (string)sid.actor_class.value;
 
 			sid.destroy();
 
@@ -470,7 +471,7 @@ end
 				if (collision_enabled)
 				{
 					// Create collider (geometry)
-                    if (circle_square_active_name == "square_collider")
+					if (circle_square_active_name == "square_collider")
 					{
 						// d-----a
 						// |     |
@@ -558,58 +559,60 @@ end
 						mesh["nodes"] = nodes;
 
 						SJSON.save(mesh, Path.build_filename(_source_dir.get_path(), resource_name) + ".mesh");
-					} else {
+					}
+					else
+					{
 						// d-----a
 						// |     |
 						// |     |
 						// c-----b
-                        int radius = circle_collision_radius;
+						int radius = circle_collision_radius;
 
 						double PIXELS_PER_METER = 32.0;
-                        int rings = 2;
-                        int radial_segments = 20;
-                        Vector3 center = {};
-                        // dont used, because compile_sphere doesnt need it
-                        center.x = circle_collision_center_x / PIXELS_PER_METER;
-                        center.y = circle_collision_center_y / PIXELS_PER_METER;
+						int rings = 2;
+						int radial_segments = 20;
+						Vector3 center = {};
+						// dont used, because compile_sphere doesnt need it
+						center.x = circle_collision_center_x / PIXELS_PER_METER;
+						center.y = circle_collision_center_y / PIXELS_PER_METER;
 
 
 						ArrayList<Value?> position = new ArrayList<Value?>();
 						ArrayList<Value?> indices_data = new ArrayList<Value?>();
-                        int prevrow = 0;
-                        int thisrow = 0;
-                        int point = 0;
-                        for (int i = 0; i < rings; ++i) {
-                            double theta = 2*Math.PI*i/radial_segments;
-                            double phi = Math.PI*i/rings;
-                            for (int j = 0; j < radial_segments; ++j) {
-                                position.add(radius*Math.cos(theta)*Math.sin(phi)/PIXELS_PER_METER);
-                                position.add(radius*Math.cos(phi)/PIXELS_PER_METER);
-                                position.add(radius*Math.sin(theta)*Math.cos(phi)/PIXELS_PER_METER);
-                                // Create triangles in ring using indices.
-                                if (i > 0 && j > 0) {
-                                    indices_data.add(prevrow + j - 1);
-                                    indices_data.add(prevrow + j);
-                                    indices_data.add(thisrow + j - 1);
-
-                                    indices_data.add(prevrow + j);
-                                    indices_data.add(thisrow + j);
-                                    indices_data.add(thisrow + j - 1);
-                                }
-                                point++;
-                            }
-                            if (i > 0) {
-                                indices_data.add(prevrow + radial_segments - 1);
-                                indices_data.add(prevrow);
-                                indices_data.add(thisrow + radial_segments - 1);
-
-                                indices_data.add(prevrow);
-                                indices_data.add(prevrow + radial_segments);
-                                indices_data.add(thisrow + radial_segments - 1);
-                            }
-                            prevrow = thisrow;
-                            thisrow = point;
-                        }
+						int prevrow = 0;
+						int thisrow = 0;
+						int point = 0;
+						for (int i = 0; i < rings; ++i) {
+							double theta = 2*Math.PI*i/radial_segments;
+							double phi = Math.PI*i/rings;
+							for (int j = 0; j < radial_segments; ++j) {
+								position.add(radius*Math.cos(theta)*Math.sin(phi)/PIXELS_PER_METER);
+								position.add(radius*Math.cos(phi)/PIXELS_PER_METER);
+								position.add(radius*Math.sin(theta)*Math.cos(phi)/PIXELS_PER_METER);
+								// Create triangles in ring using indices.
+								if (i > 0 && j > 0) {
+									indices_data.add(prevrow + j - 1);
+									indices_data.add(prevrow + j);
+									indices_data.add(thisrow + j - 1);
+
+									indices_data.add(prevrow + j);
+									indices_data.add(thisrow + j);
+									indices_data.add(thisrow + j - 1);
+								}
+								point++;
+							}
+							if (i > 0) {
+								indices_data.add(prevrow + radial_segments - 1);
+								indices_data.add(prevrow);
+								indices_data.add(thisrow + radial_segments - 1);
+
+								indices_data.add(prevrow);
+								indices_data.add(prevrow + radial_segments);
+								indices_data.add(thisrow + radial_segments - 1);
+							}
+							prevrow = thisrow;
+							thisrow = point;
+						}
 
 						ArrayList<Value?> data = new ArrayList<Value?>();
 						data.add(indices_data);
@@ -651,10 +654,10 @@ end
 						if (!unit.has_component("collider", ref id))
 						{
 							db.create(id);
-                            if (circle_square_active_name == "square_collider")
-                                db.set_property_string(id, "data.shape", "box");
-                            else
-                                db.set_property_string(id, "data.shape", "sphere");
+							if (circle_square_active_name == "square_collider")
+								db.set_property_string(id, "data.shape", "box");
+							else
+								db.set_property_string(id, "data.shape", "sphere");
 							db.set_property_string(id, "data.scene", resource_name);
 							db.set_property_string(id, "data.name", "collider");
 							db.set_property_string(id, "type", "collider");
@@ -663,10 +666,10 @@ end
 						}
 						else
 						{
-                            if (circle_square_active_name == "square_collider")
-                                unit.set_component_property_string(id, "data.shape", "box");
-                            else
-                                unit.set_component_property_string(id, "data.shape", "sphere");
+							if (circle_square_active_name == "square_collider")
+								unit.set_component_property_string(id, "data.shape", "box");
+							else
+								unit.set_component_property_string(id, "data.shape", "sphere");
 							unit.set_component_property_string(id, "data.scene", resource_name);
 							unit.set_component_property_string(id, "data.name", "collider");
 							unit.set_component_property_string(id, "type", "collider");
@@ -680,7 +683,7 @@ end
 						if (!unit.has_component("actor", ref id))
 						{
 							db.create(id);
-							db.set_property_string(id, "data.class", "static");
+							db.set_property_string(id, "data.class", actor_class);
 							db.set_property_string(id, "data.collision_filter", "default");
 							db.set_property_bool  (id, "data.lock_rotation_x", true);
 							db.set_property_bool  (id, "data.lock_rotation_y", true);
@@ -696,7 +699,7 @@ end
 						}
 						else
 						{
-							unit.set_component_property_string(id, "data.class", "static");
+							unit.set_component_property_string(id, "data.class", actor_class);
 							unit.set_component_property_string(id, "data.collision_filter", "default");
 							unit.set_component_property_bool  (id, "data.lock_rotation_x", true);
 							unit.set_component_property_bool  (id, "data.lock_rotation_y", true);

tools/level_editor/properties_view.vala

@@ -388,7 +388,7 @@ namespace Crown
 		Level _level;
 
 		// Widgets
-		private Gtk.Entry _class;
+		private ComboBoxMap _class;
 		private Gtk.Entry _collision_filter;
 		private SpinButtonDouble _mass;
 		private Gtk.Entry _material;

tools/level_editor/sprite_import_dialog.vala

@@ -119,18 +119,19 @@ public class SpriteImportDialog : Gtk.Dialog
 	public SpinButtonDouble depth;
 
 	public Gtk.CheckButton collision_enabled;
-    public string circle_square_active_name;
-    public Gtk.StackSwitcher circle_square_switcher;
-    public Gtk.Stack circle_square;
+	public string circle_square_active_name;
+	public Gtk.StackSwitcher circle_square_switcher;
+	public Gtk.Stack circle_square;
 
-    public Gtk.SpinButton circle_collision_center_x;
-    public Gtk.SpinButton circle_collision_center_y;
-    public Gtk.SpinButton circle_collision_radius;
+	public Gtk.SpinButton circle_collision_center_x;
+	public Gtk.SpinButton circle_collision_center_y;
+	public Gtk.SpinButton circle_collision_radius;
 
 	public Gtk.SpinButton collision_x;
 	public Gtk.SpinButton collision_y;
 	public Gtk.SpinButton collision_w;
 	public Gtk.SpinButton collision_h;
+	public ComboBoxMap actor_class;
 
 	// Widgets
 	public SpriteImportDialog(string png)
@@ -286,7 +287,7 @@ public class SpriteImportDialog : Gtk.Dialog
 				cr.set_source_rgba(0.3, 0.3, 0.3, 0.6);
 				cr.fill();
 
-                cr.arc(circle_collision_center_x.value, circle_collision_center_y.value, circle_collision_radius.value, 0, 2*Math.PI);
+				cr.arc(circle_collision_center_x.value, circle_collision_center_y.value, circle_collision_radius.value, 0, 2*Math.PI);
 				cr.set_source_rgba(0.3, 0.3, 0.3, 0.6);
 				cr.fill();
 
@@ -323,13 +324,19 @@ public class SpriteImportDialog : Gtk.Dialog
 		collision_w.value = 32;
 		collision_h = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
 		collision_h.value = 32;
-
-        circle_collision_center_x = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
-        circle_collision_center_x.value = cell_w.value/2.0;
-        circle_collision_center_y = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
-        circle_collision_center_y.value = cell_h.value/2.0;;
-        circle_collision_radius = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
-        circle_collision_radius.value = 32;
+		actor_class = new ComboBoxMap();
+		actor_class.append("static", "static");
+		actor_class.append("dynamic", "dynamic");
+		actor_class.append("keyframed", "keyframed");
+		actor_class.append("trigger", "trigger");
+		actor_class.value = "static";
+
+		circle_collision_center_x = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
+		circle_collision_center_x.value = cell_w.value/2.0;
+		circle_collision_center_y = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
+		circle_collision_center_y.value = cell_h.value/2.0;;
+		circle_collision_radius = new Gtk.SpinButton.with_range(-double.MAX, double.MAX, 1.0);
+		circle_collision_radius.value = 32;
 
 		cells_h.value_changed.connect (() => {
 			if (cell_wh_auto.active)
@@ -361,13 +368,13 @@ public class SpriteImportDialog : Gtk.Dialog
 		});
 
 		cell_w.value_changed.connect (() => {
-            circle_collision_center_x.value = cell_w.value/2.0;
+			circle_collision_center_x.value = cell_w.value/2.0;
 			_drawing_area.queue_draw();
 			_preview.queue_draw();
 		});
 
 		cell_h.value_changed.connect(() => {
-            circle_collision_center_y.value = cell_h.value/2.0;
+			circle_collision_center_y.value = cell_h.value/2.0;
 			_drawing_area.queue_draw();
 			_preview.queue_draw();
 		});
@@ -397,9 +404,11 @@ public class SpriteImportDialog : Gtk.Dialog
 			collision_y.sensitive = !collision_y.sensitive;
 			collision_w.sensitive = !collision_w.sensitive;
 			collision_h.sensitive = !collision_h.sensitive;
-            circle_collision_center_x.sensitive = !circle_collision_center_x.sensitive;
-            circle_collision_center_y.sensitive = !circle_collision_center_y.sensitive;
-            circle_collision_radius.sensitive = !circle_collision_radius.sensitive;
+			circle_square_switcher.sensitive = !circle_square_switcher.sensitive;
+			circle_collision_center_x.sensitive = !circle_collision_center_x.sensitive;
+			circle_collision_center_y.sensitive = !circle_collision_center_y.sensitive;
+			circle_collision_radius.sensitive = !circle_collision_radius.sensitive;
+			actor_class.sensitive = !actor_class.sensitive;
 		});
 
 		collision_x.value_changed.connect(() => {
@@ -482,8 +491,9 @@ public class SpriteImportDialog : Gtk.Dialog
 		grid.attach(depth,        1, 12, 1, 1);
 
 		grid.attach(collision_enabled, 1, 13, 1, 1);
-        circle_square = new Gtk.Stack();
-        Gtk.Grid square_grid = new Gtk.Grid();
+		grid.attach(actor_class,       1, 14, 1, 1);
+		circle_square = new Gtk.Stack();
+		Gtk.Grid square_grid = new Gtk.Grid();
 		square_grid.attach(label_with_alignment("Collision X", Gtk.Align.END),  0, 0, 1, 1);
 		square_grid.attach(label_with_alignment("Collision Y", Gtk.Align.END),  0, 1, 1, 1);
 		square_grid.attach(label_with_alignment("Collision W", Gtk.Align.END),  0, 2, 1, 1);
@@ -495,23 +505,22 @@ public class SpriteImportDialog : Gtk.Dialog
 		square_grid.row_spacing = 6;
 		square_grid.column_spacing = 12;
 
-        Gtk.Grid circle_grid = new Gtk.Grid();
+		Gtk.Grid circle_grid = new Gtk.Grid();
 		circle_grid.attach(label_with_alignment("Collision X", Gtk.Align.END),  0, 0, 1, 1);
 		circle_grid.attach(label_with_alignment("Collision Y", Gtk.Align.END),  0, 1, 1, 1);
 		circle_grid.attach(label_with_alignment("Radius", Gtk.Align.END),  0, 2, 1, 1);
-        circle_grid.attach(circle_collision_center_x, 1, 0, 1, 1);
-        circle_grid.attach(circle_collision_center_y, 1, 1, 1, 1);
-        circle_grid.attach(circle_collision_radius, 1, 2, 1, 1);
+		circle_grid.attach(circle_collision_center_x, 1, 0, 1, 1);
+		circle_grid.attach(circle_collision_center_y, 1, 1, 1, 1);
+		circle_grid.attach(circle_collision_radius, 1, 2, 1, 1);
 		circle_grid.row_spacing = 6;
 		circle_grid.column_spacing = 12;
 
-        circle_square.add_titled(square_grid, "square_collider", "Square Collider");
-        circle_square.add_titled(circle_grid, "circle_collider", "Circle Collider");
-        circle_square_switcher = new Gtk.StackSwitcher();
-        circle_square_switcher.set_stack(circle_square);
-        grid.attach(circle_square_switcher, 0, 14, 2, 1);
-        grid.attach(circle_square, 0, 15, 2, 5);
-        
+		circle_square.add_titled(square_grid, "square_collider", "Square Collider");
+		circle_square.add_titled(circle_grid, "circle_collider", "Circle Collider");
+		circle_square_switcher = new Gtk.StackSwitcher();
+		circle_square_switcher.set_stack(circle_square);
+		grid.attach(circle_square_switcher, 1, 15, 1, 1);
+		grid.attach(circle_square, 1, 16, 1, 5);
 
 		grid.row_spacing = 6;
 		grid.column_spacing = 12;
@@ -547,52 +556,52 @@ public class SpriteImportDialog : Gtk.Dialog
 	public void load(Hashtable importer_settings)
 	{
 		// Load settings
-		cells_h.value                           = (double)importer_settings["num_h"];
-		cells_v.value                           = (double)importer_settings["num_v"];
-		cell_w.value                            = (double)importer_settings["cell_w"];
-		cell_h.value                            = (double)importer_settings["cell_h"];
-		offset_x.value                          = (double)importer_settings["offset_x"];
-		offset_y.value                          = (double)importer_settings["offset_y"];
-		spacing_x.value                         = (double)importer_settings["spacing_x"];
-		spacing_y.value                         = (double)importer_settings["spacing_y"];
-		layer.value                             = (double)importer_settings["layer"];
-		depth.value                             = (double)importer_settings["depth"];
-		pivot.active                            = (int)(double)importer_settings["pivot"];
-		collision_enabled.active                = (bool)importer_settings["collision_enabled"];
-		collision_x.value                       = (double)importer_settings["collision_x"];
-		collision_y.value                       = (double)importer_settings["collision_y"];
-		collision_w.value                       = (double)importer_settings["collision_w"];
-		collision_h.value                       = (double)importer_settings["collision_h"];
-        circle_collision_center_x.value         = importer_settings.has_key("circle_collision_center_x") ? (double)importer_settings["circle_collision_center_x"] : cell_w.value;
-        circle_collision_center_y.value         = importer_settings.has_key("circle_collision_center_y") ? (double)importer_settings["circle_collision_center_y"] : cell_h.value;
-		circle_collision_radius.value           = (double)importer_settings["circle_collision_radius"];
-        circle_collision_radius.value           = importer_settings.has_key("circle_collision_radius") ? (double)importer_settings["circle_collision_radius"] : 32;
-		circle_square.visible_child_name        = (string)importer_settings["circle_square_active_name"];
-        circle_square.visible_child_name        = importer_settings.has_key("circle_square_active_name") ? (string)importer_settings["circle_square_active_name"] : "square_collider";
+		cells_h.value                    = (double)importer_settings["num_h"];
+		cells_v.value                    = (double)importer_settings["num_v"];
+		cell_w.value                     = (double)importer_settings["cell_w"];
+		cell_h.value                     = (double)importer_settings["cell_h"];
+		offset_x.value                   = (double)importer_settings["offset_x"];
+		offset_y.value                   = (double)importer_settings["offset_y"];
+		spacing_x.value                  = (double)importer_settings["spacing_x"];
+		spacing_y.value                  = (double)importer_settings["spacing_y"];
+		layer.value                      = (double)importer_settings["layer"];
+		depth.value                      = (double)importer_settings["depth"];
+		pivot.active                     = (int)(double)importer_settings["pivot"];
+		collision_enabled.active         = (bool)importer_settings["collision_enabled"];
+		collision_x.value                = (double)importer_settings["collision_x"];
+		collision_y.value                = (double)importer_settings["collision_y"];
+		collision_w.value                = (double)importer_settings["collision_w"];
+		collision_h.value                = (double)importer_settings["collision_h"];
+		circle_collision_center_x.value  = importer_settings.has_key("circle_collision_center_x") ? (double)importer_settings["circle_collision_center_x"] : cell_w.value;
+		circle_collision_center_y.value  = importer_settings.has_key("circle_collision_center_y") ? (double)importer_settings["circle_collision_center_y"] : cell_h.value;
+		circle_collision_radius.value    = importer_settings.has_key("circle_collision_radius") ? (double)importer_settings["circle_collision_radius"] : 32;
+		circle_square.visible_child_name = importer_settings.has_key("circle_square_active_name") ? (string)importer_settings["circle_square_active_name"] : "square_collider";
+		actor_class.value                = importer_settings.has_key("actor_class") ? (string)importer_settings["actor_class"] : "static";
 	}
 
 	public void save(Hashtable importer_settings)
 	{
-		importer_settings["num_h"]                      = cells_h.value;
-		importer_settings["num_v"]                      = cells_v.value;
-		importer_settings["cell_w"]                     = cell_w.value;
-		importer_settings["cell_h"]                     = cell_h.value;
-		importer_settings["offset_x"]                   = offset_x.value;
-		importer_settings["offset_y"]                   = offset_y.value;
-		importer_settings["spacing_x"]                  = spacing_x.value;
-		importer_settings["spacing_y"]                  = spacing_y.value;
-		importer_settings["layer"]                      = layer.value;
-		importer_settings["depth"]                      = depth.value;
-		importer_settings["pivot"]                      = pivot.active;
-		importer_settings["collision_enabled"]          = collision_enabled.active;
-		importer_settings["collision_x"]                = collision_x.value;
-		importer_settings["collision_y"]                = collision_y.value;
-		importer_settings["collision_w"]                = collision_w.value;
-		importer_settings["collision_h"]                = collision_h.value;
-        importer_settings["circle_collision_center_x"]  = circle_collision_center_x.value;
-        importer_settings["circle_collision_center_y"]  = circle_collision_center_y.value;
-        importer_settings["circle_collision_radius"]    = circle_collision_radius.value;
-        importer_settings["circle_square_active_name"]  = circle_square.visible_child_name;
+		importer_settings["num_h"]                     = cells_h.value;
+		importer_settings["num_v"]                     = cells_v.value;
+		importer_settings["cell_w"]                    = cell_w.value;
+		importer_settings["cell_h"]                    = cell_h.value;
+		importer_settings["offset_x"]                  = offset_x.value;
+		importer_settings["offset_y"]                  = offset_y.value;
+		importer_settings["spacing_x"]                 = spacing_x.value;
+		importer_settings["spacing_y"]                 = spacing_y.value;
+		importer_settings["layer"]                     = layer.value;
+		importer_settings["depth"]                     = depth.value;
+		importer_settings["pivot"]                     = pivot.active;
+		importer_settings["collision_enabled"]         = collision_enabled.active;
+		importer_settings["collision_x"]               = collision_x.value;
+		importer_settings["collision_y"]               = collision_y.value;
+		importer_settings["collision_w"]               = collision_w.value;
+		importer_settings["collision_h"]               = collision_h.value;
+		importer_settings["circle_collision_center_x"] = circle_collision_center_x.value;
+		importer_settings["circle_collision_center_y"] = circle_collision_center_y.value;
+		importer_settings["circle_collision_radius"]   = circle_collision_radius.value;
+		importer_settings["circle_square_active_name"] = circle_square.visible_child_name;
+		importer_settings["actor_class"]               = actor_class.value;
 	}
 }