Daniele Bartolini пре 9 година
родитељ
комит
a2b403f268

+ 1 - 1
samples/core/editors/level_editor/level_editor.lua

@@ -407,7 +407,7 @@ function SoundObject:set_local_pose(pose)
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 	if tr then SceneGraph.set_local_pose(self._sg, tr, pose) end
 end
 end
 
 
-function UnitBox:on_selected(selected)
+function SoundObject:on_selected(selected)
 	self._selected = selected
 	self._selected = selected
 end
 end
 
 

+ 43 - 37
tools/level_editor/level_editor.vala

@@ -93,43 +93,44 @@ namespace Crown
 
 
 		const Gtk.ActionEntry[] action_entries =
 		const Gtk.ActionEntry[] action_entries =
 		{
 		{
-			{ "menu-file",            null,  "_File",            null,             null, null                },
-			{ "new",                  null,  "New",              "<ctrl>N",        null, on_new              },
-			{ "open",                 null,  "Open",             "<ctrl>O",        null, on_open             },
-			{ "save",                 null,  "Save",             "<ctrl>S",        null, on_save             },
-			{ "save-as",              null,  "Save As...",       null,             null, on_save_as          },
-			{ "preferences",          null,  "Preferences",      null,             null, on_preferences      },
-			{ "quit",                 null,  "Quit",             "<ctrl>Q",        null, on_quit             },
-			{ "menu-edit",            null,  "_Edit",            null,             null, null                },
-			{ "undo",                 null,  "Undo",             "<ctrl>Z",        null, on_undo             },
-			{ "redo",                 null,  "Redo",             "<shift><ctrl>Z", null, on_redo             },
-			{ "duplicate",            null,  "Duplicate",        "<ctrl>D",        null, on_duplicate        },
-			{ "delete",               null,  "Delete",           "<ctrl>K",        null, on_delete           },
-			{ "menu-grid",            null,  "Grid",             null,             null, null                },
-			{ "grid-custom",          null,  "Custom",           "G",              null, on_custom_grid      },
-			{ "menu-rotation-snap",   null,  "Rotation Snap",    null,             null, null                },
-			{ "rotation-snap-custom", null,  "Custom",           "H",              null, on_rotation_snap    },
-			{ "menu-create",          null,  "Create",           null,             null, null                },
-			{ "menu-primitives",      null,  "Primitives",       null,             null, null                },
-			{ "primitive-cube",       null,  "Cube",             null,             null, on_create_cube      },
-			{ "primitive-sphere",     null,  "Sphere",           null,             null, on_create_sphere    },
-			{ "primitive-cone",       null,  "Cone",             null,             null, on_create_cone      },
-			{ "primitive-cylinder",   null,  "Cylinder",         null,             null, on_create_cylinder  },
-			{ "primitive-plane",      null,  "Plane",            null,             null, on_create_plane     },
-			{ "camera",               null,  "Camera",           null,             null, on_create_camera    },
-			{ "light",                null,  "Light",            null,             null, on_create_light     },
-			{ "menu-engine",          null,  "En_gine",          null,             null, null                },
-			{ "menu-view",            null,  "View",             null,             null, null                },
-			{ "resource-browser",     null,  "Resource Browser", "<ctrl>P",        null, on_resource_browser },
-			{ "restart",              null,  "_Restart",         null,             null, on_engine_restart   },
-			{ "reload-lua",           null,  "Reload Lua",       "F7",             null, on_reload_lua       },
-			{ "menu-run",             null,  "_Run",             null,             null, null                },
-			{ "game-run",             "run", "Run Game",         "F5",             null, on_run_game         },
-			{ "menu-help",            null,  "Help",             null,             null, null                },
-			{ "manual",               null,  "Manual",           "F1",             null, on_manual           },
-			{ "report-issue",         null,  "Report an Issue",  null,             null, on_report_issue     },
-			{ "open-last-log",        null,  "Open last.log",    null,             null, on_open_last_log    },
-			{ "about",                null,  "About",            null,             null, on_about            }
+			{ "menu-file",            null,  "_File",            null,             null, null                   },
+			{ "new",                  null,  "New",              "<ctrl>N",        null, on_new                 },
+			{ "open",                 null,  "Open",             "<ctrl>O",        null, on_open                },
+			{ "save",                 null,  "Save",             "<ctrl>S",        null, on_save                },
+			{ "save-as",              null,  "Save As...",       null,             null, on_save_as             },
+			{ "preferences",          null,  "Preferences",      null,             null, on_preferences         },
+			{ "quit",                 null,  "Quit",             "<ctrl>Q",        null, on_quit                },
+			{ "menu-edit",            null,  "_Edit",            null,             null, null                   },
+			{ "undo",                 null,  "Undo",             "<ctrl>Z",        null, on_undo                },
+			{ "redo",                 null,  "Redo",             "<shift><ctrl>Z", null, on_redo                },
+			{ "duplicate",            null,  "Duplicate",        "<ctrl>D",        null, on_duplicate           },
+			{ "delete",               null,  "Delete",           "<ctrl>K",        null, on_delete              },
+			{ "menu-grid",            null,  "Grid",             null,             null, null                   },
+			{ "grid-custom",          null,  "Custom",           "G",              null, on_custom_grid         },
+			{ "menu-rotation-snap",   null,  "Rotation Snap",    null,             null, null                   },
+			{ "rotation-snap-custom", null,  "Custom",           "H",              null, on_rotation_snap       },
+			{ "menu-create",          null,  "Create",           null,             null, null                   },
+			{ "menu-primitives",      null,  "Primitives",       null,             null, null                   },
+			{ "primitive-cube",       null,  "Cube",             null,             null, on_create_cube         },
+			{ "primitive-sphere",     null,  "Sphere",           null,             null, on_create_sphere       },
+			{ "primitive-cone",       null,  "Cone",             null,             null, on_create_cone         },
+			{ "primitive-cylinder",   null,  "Cylinder",         null,             null, on_create_cylinder     },
+			{ "primitive-plane",      null,  "Plane",            null,             null, on_create_plane        },
+			{ "camera",               null,  "Camera",           null,             null, on_create_camera       },
+			{ "light",                null,  "Light",            null,             null, on_create_light        },
+			{ "sound-source",         null,  "Sound Source",     null,             null, on_create_sound_source },
+			{ "menu-engine",          null,  "En_gine",          null,             null, null                   },
+			{ "menu-view",            null,  "View",             null,             null, null                   },
+			{ "resource-browser",     null,  "Resource Browser", "<ctrl>P",        null, on_resource_browser    },
+			{ "restart",              null,  "_Restart",         null,             null, on_engine_restart      },
+			{ "reload-lua",           null,  "Reload Lua",       "F7",             null, on_reload_lua          },
+			{ "menu-run",             null,  "_Run",             null,             null, null                   },
+			{ "game-run",             "run", "Run Game",         "F5",             null, on_run_game            },
+			{ "menu-help",            null,  "Help",             null,             null, null                   },
+			{ "manual",               null,  "Manual",           "F1",             null, on_manual              },
+			{ "report-issue",         null,  "Report an Issue",  null,             null, on_report_issue        },
+			{ "open-last-log",        null,  "Open last.log",    null,             null, on_open_last_log       },
+			{ "about",                null,  "About",            null,             null, on_about               }
 		};
 		};
 
 
 		const Gtk.RadioActionEntry[] grid_entries =
 		const Gtk.RadioActionEntry[] grid_entries =
@@ -961,6 +962,11 @@ namespace Crown
 			_engine.send_script(LevelEditorApi.set_placeable(PlaceableType.UNIT, "core/units/light"));
 			_engine.send_script(LevelEditorApi.set_placeable(PlaceableType.UNIT, "core/units/light"));
 		}
 		}
 
 
+		private void on_create_sound_source(Gtk.Action action)
+		{
+			_engine.send_script(LevelEditorApi.set_placeable(PlaceableType.SOUND, ""));
+		}
+
 		private void on_resource_browser(Gtk.Action action)
 		private void on_resource_browser(Gtk.Action action)
 		{
 		{
 			_resource_browser.show_all();
 			_resource_browser.show_all();

+ 1 - 0
tools/ui/level_editor_menu.xml

@@ -64,6 +64,7 @@
 			</menu>
 			</menu>
 			<menuitem action="camera"></menuitem>
 			<menuitem action="camera"></menuitem>
 			<menuitem action="light"></menuitem>
 			<menuitem action="light"></menuitem>
+			<menuitem action="sound-source"></menuitem>
 		</menu>
 		</menu>
 		<menu action="menu-view">
 		<menu action="menu-view">
 			<menuitem action="resource-browser"></menuitem>
 			<menuitem action="resource-browser"></menuitem>