Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Did first half of Object Editor. Added the Beautify buttons I missed yesterday.

Browse Source 
This was SVN commit r1725.
This commit is contained in:
Acumen 2005-01-16 13:12:28 +00:00
parent d202e580b2
commit 986d62a2f5
7 changed files with 342 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_icon_15x15.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/official/art/textures/ui/atlas/atlas_sheet_toolbar_button.png (Stored with Git LFS)
View File

Binary file not shown.

119
binaries/data/mods/official/gui/test/7_atlas.xml
View File

@ -489,6 +489,11 @@
setSizeArray("atlas_left_pane_section_terrain_water_button_place", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="button" name="atlas_left_pane_section_terrain_water_button_beautify" style="atlas_icon_border" cell_id="12" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_terrain_water_button_beautify", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_BEAUTIFY], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_terrain_water_depth_label" style="atlas_label_text" text_align="left" hidden="false">Depth
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_terrain_water_depth_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL], left_screen, top_screen, left_screen, top_screen);
@ -584,6 +589,85 @@
</object>
</object>
</object>
<!-- OBJECT EDITOR SECTION MENU -->
<object type="empty" name="atlas_left_pane_section_object" size="0 0 100% 100%" z="1" hidden="true">
<object type="text" name="atlas_left_pane_section_object_category_label" style="atlas_label_text" text_align="left" hidden="false">Category
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_category_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<!-- NOTE: This will need to be replaced with a combobox when the control becomes available. -->
<object type="input" name="atlas_left_pane_section_object_category_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_category_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="button" name="atlas_left_pane_section_object_button_custom_actor" style="atlas_button" hidden="false">Custom Actor
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_button_custom_actor", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="button" name="atlas_left_pane_section_object_button_custom_entity" style="atlas_button" hidden="false">Custom Entity
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_button_custom_entity", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ENTITY], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_object_list_bkg" sprite="atlas_window_grey" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_bkg", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG], left_screen, top_screen, left_screen, bottom_screen);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_object_list_player_label" style="atlas_label_text" text_align="left" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_player_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL], left_screen, top_screen, left_screen, top_screen);
GUIObjectSetCaption("atlas_left_pane_section_object_list_player_label","Player");
]]></action>
</object>
<object type="input" name="atlas_left_pane_section_object_list_player_input_box" sprite="atlas_input_box" style="atlas_label_text" text_align="right" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_player_input_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX], left_screen, top_screen, left_screen, top_screen);
GUIObjectSetCaption("atlas_left_pane_section_object_list_player_input_box", "1");
]]></action>
</object>
<object type="button" name="atlas_left_pane_section_object_list_player_input_box_up" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_player_input_box_up", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP], left_screen, top_screen, left_screen, top_screen);
]]></action>
<action on="Press"><![CDATA[
GUIObjectModifyCaption("atlas_left_pane_section_object_list_player_input_box", 1, 0);
]]></action>
</object>
<object type="button" name="atlas_left_pane_section_object_list_player_input_box_dn" sprite="atlas_sheet_updown_button" cell_id="1" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_player_input_box_dn", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_DN], left_screen, top_screen, left_screen, top_screen);
]]></action>
<action on="Press"><![CDATA[
GUIObjectModifyCaption("atlas_left_pane_section_object_list_player_input_box", -1, 0);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_object_list_heading" style="atlas_heading" hidden="false">Objects
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_heading", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_HEADING], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_object_list_sort_label" style="atlas_label_text" text_align="left" hidden="false">Sort
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_sort_label", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_LABEL], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<!-- NOTE: This will need to be replaced with a combobox when the control becomes available. -->
<object type="input" name="atlas_left_pane_section_object_list_sort_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list_sort_combo_box", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX], left_screen, top_screen, left_screen, top_screen);
]]></action>
</object>
<object type="text" name="atlas_left_pane_section_object_list" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_left_pane_section_object_list", atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST], left_screen, top_screen, left_screen, bottom_screen);
]]></action>
</object>
</object>
</object>
<!-- BOTTOM SELECTION PANE: Context panel along the bottom of the screen. -->
@ -617,6 +701,7 @@
]]></action>
</object>
<!-- TERRAIN EDITOR BOTTOM PANE -->
<object type="empty" name="atlas_bottom_pane_section_terrain" size="0 0 100% 100%" z="1" hidden="false">
<object type="empty" name="atlas_bottom_pane_section_terrain_other" size="0 0 100% 100%" z="1" hidden="false">
<object type="text" name="atlas_bottom_pane_section_terrain_preview" style="atlas_indent" hidden="false">
@ -670,6 +755,11 @@
setSizeArray("atlas_bottom_pane_section_terrain_brush_button_4", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_4], left_screen, bottom_screen, left_screen, bottom_screen);
]]></action>
</object>
<object type="button" name="atlas_bottom_pane_section_terrain_brush_button_beautify" style="atlas_icon_border" cell_id="13" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_bottom_pane_section_terrain_brush_button_beautify", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_BEAUTIFY], left_screen, bottom_screen, left_screen, bottom_screen);
]]></action>
</object>
</object>
<object type="empty" name="atlas_bottom_pane_section_terrain_palette" size="0 0 100% 100%" z="1" hidden="false">
<object type="text" name="atlas_bottom_pane_section_terrain_palette_bkg" sprite="atlas_window_grey" scrollbar_style="atlas_scrollbar" scrollbar="true" hidden="false">
@ -714,6 +804,34 @@
</object>
</object>
</object>
<!-- OBJECT EDITOR BOTTOM PANE -->
<object type="empty" name="atlas_bottom_pane_section_object" size="0 0 100% 100%" z="1" hidden="true">
<object type="empty" name="atlas_bottom_pane_section_object_anim" size="0 0 100% 100%" z="1" hidden="false">
<object type="text" name="atlas_bottom_pane_section_object_anim_combo_box_label" style="atlas_label_text" text_align="left" hidden="false">Animation
<action on="Load"><![CDATA[
setSizeArray("atlas_bottom_pane_section_object_anim_combo_box_label", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
]]></action>
</object>
<!-- NOTE: This will need to be replaced with a combobox when the control becomes available. -->
<object type="input" name="atlas_bottom_pane_section_object_anim_combo_box" sprite="atlas_input_box" style="atlas_label_text" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_bottom_pane_section_object_anim_combo_box", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX], left_screen, bottom_screen, left_screen, bottom_screen);
GUIObjectSetCaption("atlas_bottom_pane_section_object_anim_combo_box", "idle_a");
]]></action>
</object>
<object type="text" name="atlas_bottom_pane_section_object_anim_viewer" style="atlas_indent" hidden="false">
<action on="Load"><![CDATA[
setSizeArray("atlas_bottom_pane_section_object_anim_viewer", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER], left_screen, bottom_screen, left_screen, bottom_screen);
]]></action>
</object>
<object type="text" name="atlas_bottom_pane_section_object_anim_viewer_label" style="atlas_label_text" hidden="false">Animation Viewer
<action on="Load"><![CDATA[
setSizeArray("atlas_bottom_pane_section_object_anim_viewer_label", atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER_LABEL], left_screen, bottom_screen, left_screen, bottom_screen);
]]></action>
</object>
</object>
</object>
</object>
<!-- RB: MINIMAP: Displays whole map. Identical functionality to session map, just a little smaller. -->
@ -857,6 +975,7 @@
</object>
<object type="button" name="atlas_mainborder_toolbar_button_4" cell_id="4" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." hidden="false">
<action on="Press"><![CDATA[
atlasOpenSectionMenu("atlas_left_pane_section_object");
]]></action>
</object>
<object type="button" name="atlas_mainborder_toolbar_button_5" cell_id="5" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." hidden="false">

193
binaries/data/mods/official/gui/test/functions_atlas.js
View File

@ -914,13 +914,22 @@ function initAtlas()
// Place button.
ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].width-15,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE].x,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_HEADING_HR].height+(ATLAS_LEFT_PANE_SECTION.TMARGIN/2)
);
// Beautify Water button.
ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_BEAUTIFY = addSizeArrayWH(atlasCoord, atlasCoord_Last,
15,
15
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE].width+1,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE].y
);
// Depth label.
ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL].width,
@ -1056,6 +1065,127 @@ function initAtlas()
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_LIST].height+ATLAS_LEFT_PANE_SECTION.BMARGIN
);
// ============================================= OBJECT EDITOR: SELECTION ==============================================
// Object category label.
ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].width-ATLAS_LEFT_PANE_SECTION.LMARGIN-ATLAS_LEFT_PANE_SECTION.RMARGIN-ATLAS_LEFT_PANE_SECTION.LMARGIN,
20
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].x+ATLAS_LEFT_PANE_SECTION.LMARGIN+ATLAS_LEFT_PANE_SECTION.LMARGIN,
atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_HEADING_2].height
);
// Object category input box.
ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL].width,
15
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL].x,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_LABEL].height
);
// Custom button.
ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_CUSTOM].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].x-4,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
);
// Custom button.
ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ENTITY = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].x+4+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ENTITY].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR].y
);
// ============================================= OBJECT EDITOR: LIST ==============================================
// Background of Object List.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].width+2,
163+2
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_CATEGORY_COMBO_BOX].x,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
);
// Player input box.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].x+10,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].y+10
);
// Up button for Player input box.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP = addSizeArrayWH(atlasCoord, atlasCoord_Last,
ATLAS_COUNTER_BOX.width,
(atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].height/2)+3
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].y-3
);
// Down button for Player input box.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_DN = addSizeArrayWH(atlasCoord, atlasCoord_Last,
ATLAS_COUNTER_BOX.width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].height-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_DN].height
);
// Player label.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].y
);
// Objects heading.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_HEADING = addSizeArrayWH(atlasCoord, atlasCoord_Last,
65,
atlasCoord[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_HEADING].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX].y
);
// Object list sort input box.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX = addSizeArrayWH(atlasCoord, atlasCoord_Last,
90,
15
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].x+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].width-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].width-10,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_HEADING].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_HEADING].height+10
);
// Object list sort label.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
35,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].x-atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_LABEL].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].y-3
);
// Object List.
ATLAS_LEFT_PANE_SECTION_OBJECT_LIST = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].width,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG].x,
atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].y+atlasCoord[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_SORT_COMBO_BOX].height+ATLAS_LEFT_PANE_SECTION.TMARGIN
);
// ============================================= BOTTOM MENU SECTIONS ===================================================
// ============================================= TERRAIN EDITOR: BRUSH SETTINGS ==============================================
@ -1152,6 +1282,15 @@ function initAtlas()
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3].y-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_3].height-ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_SPAN
);
// Beautify Terrain button.
ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_BEAUTIFY = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].width,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].height
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BUTTON_1].x,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_BRUSH_BORDER].y+10
);
// ============================================= TERRAIN EDITOR: PAINT TERRAIN ===============================================
// Terrain Palette Background.
@ -1201,6 +1340,44 @@ function initAtlas()
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last-1]].x-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW].width-atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW].width,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_BUTTON_CUSTOM].y-2
);
// ============================================= OBJECT EDITOR: ANIMATION VIEWER ===============================================
// Animation Viewer combobox label.
ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
60,
20
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
ATLAS_LEFT_PANE_SECTION.LMARGIN,
2
);
// Animation Viewer combobox.
ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX = addSizeArrayWH(atlasCoord, atlasCoord_Last,
65,
10
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].x+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].width,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].y
);
// Animation Viewer.
ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER = addSizeArrayWH(atlasCoord, atlasCoord_Last,
125,
125
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].x,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL].height
);
// Animation Viewer label.
ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER_LABEL = addSizeArrayWH(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER].width,
15
); atlasCoord_Last = addSizeArrayXY(atlasCoord, atlasCoord_Last,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER].x,
atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER].y+atlasCoord[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER].height
);
}
// ====================================================================
@ -1282,6 +1459,9 @@ function atlasOpenSectionMenu(atlasMenuName)
// Clear all section menus to begin.
GUIObjectHide("atlas_left_pane_section_map");
GUIObjectHide("atlas_left_pane_section_terrain");
GUIObjectHide("atlas_bottom_pane_section_terrain");
GUIObjectHide("atlas_left_pane_section_object");
GUIObjectHide("atlas_bottom_pane_section_object");
switch (atlasMenuName)
{
@ -1307,11 +1487,22 @@ function atlasOpenSectionMenu(atlasMenuName)
// Toggle backgrounds.
GUIObjectUnhide("atlas_left_pane");
GUIObjectUnhide("atlas_bottom_pane");
GUIObjectUnhide("atlas_bottom_pane_section_terrain");
// Reveal headings.
GUIObjectRenameandReveal("atlas_left_pane_section_heading_1", "Terrain Editor");
GUIObjectRenameandReveal("atlas_left_pane_section_heading_2", "Edit Elevation");
GUIObjectHide("atlas_left_pane_section_heading_3");
break;
case "atlas_left_pane_section_object":
// Toggle backgrounds.
GUIObjectUnhide("atlas_left_pane");
GUIObjectUnhide("atlas_bottom_pane");
GUIObjectUnhide("atlas_bottom_pane_section_object");
// Reveal headings.
GUIObjectRenameandReveal("atlas_left_pane_section_heading_1", "Object Editor");
GUIObjectRenameandReveal("atlas_left_pane_section_heading_2", "Object List");
GUIObjectHide("atlas_left_pane_section_heading_3");
break;
}
// Reveal Section Menu content.

2
binaries/data/mods/official/gui/test/functions_coord.js
View File

@ -148,7 +148,7 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
else
if (rleft == left_screen && rtop == top_screen && rright == left_screen && rbottom == bottom_screen)
// Object is aligned between left top and left bottom.
getGUIObjectByName(objectName).size = new GUISize(objectArrayElement.x, objectArrayElement.y, objectArrayElement.x+objectArrayElement.width, 0, rleft, rtop, rright, rbottom);
getGUIObjectByName(objectName).size = new GUISize(objectArrayElement.x, objectArrayElement.y, objectArrayElement.x+objectArrayElement.width, -objectArrayElement.height, rleft, rtop, rright, rbottom);
else
if (rleft == left_screen && rtop == mid_screen && rright == left_screen && rbottom == mid_screen)
// Object is aligned to middle left.

14
binaries/data/mods/official/gui/test/sprite1.xml
View File

@ -1055,6 +1055,20 @@
<image texture="atlas/atlas_sheet_icon_15x15.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
</sprite>
<sprite name="atlas_sheet_icon_border">
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->
<image backcolor="0 255 0" size="0 0 100%-1 1" />
<!-- Right border -->
<image backcolor="0 255 0" size="100%-1 0 100% 100%" />
<!-- Bottom border -->
<image backcolor="0 255 0" size="0 100%-1 100% 100%" />
<!-- Left border -->
<image backcolor="0 255 0" size="0 0 1 100%-1" />
<image texture="atlas/atlas_sheet_icon_15x15.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
</sprite>
<!--
==========================================
TEMPORARY IMAGES

12
binaries/data/mods/official/gui/test/styles.xml
View File

@ -160,4 +160,16 @@
text_align="center"
text_valign="center"
/>
<style name="atlas_icon_border"
sprite="atlas_sheet_icon"
sprite_over="atlas_sheet_icon_border"
sprite_pressed="atlas_sheet_icon_border"
tooltip_style="atlas_tooltip"
tooltip="[font=tahoma10b]Icon[font=tahoma10]\nClick to perform this function."
textcolor="0 0 0"
font="tahoma10"
text_align="center"
text_valign="center"
/>
</styles>