This commit is contained in:
mkwong98 2018-02-23 17:54:14 +08:00
parent 74b52f7176
commit 93e6ce73fb
9 changed files with 1044 additions and 244 deletions

View file

@ -15,6 +15,7 @@ gameObjNode::gameObjNode()
objectHeight = 0;
bgColour = 0;
isSprite = false;
brightness = 1;
}
gameObjNode::~gameObjNode()
@ -71,6 +72,9 @@ void gameObjNode::load(fstream& file, wxTreeItemId newItm){
else if(lineHdr == "<isSprite>"){
isSprite = (lineTail == "Y");
}
else if(lineHdr == "<brightness>"){
brightness = atof(lineTail.c_str());
}
else if(lineHdr == "<childObjects>"){
main::mForm->loadChildGameObjs(file, newItm);
}
@ -97,6 +101,7 @@ void gameObjNode::save(fstream& file, wxTreeItemId newItm){
if(nodeType == GAME_OBJ_NODE_TYPE_OBJECT){
file << "<bgColour>" << main::intToHex(bgColour) << "\n";
file << "<isSprite>" << (isSprite ? "Y" : "N") << "\n";
file << "<brightness>" << main::floatToStr(brightness) << "\n";
file << "<tiles>\n";
for(int i = 0; i < tiles.size(); ++i){

View file

@ -35,6 +35,7 @@ class gameObjNode : public wxTreeItemData
int objectHeight;
Uint8 bgColour;
bool isSprite;
float brightness;
vector<gameTile> tiles;

View file

@ -4,10 +4,10 @@
"hdnesPackEditormainForm.h"
"main.h"
1516099646 source:c:\work\hdnesr\trunk\hdnespackeditor\mainform.cpp
1519359034 source:c:\work\hdnesr\trunk\hdnespackeditor\mainform.cpp
"mainForm.h"
1516099646 c:\work\hdnesr\trunk\hdnespackeditor\mainform.h
1519359034 c:\work\hdnesr\trunk\hdnespackeditor\mainform.h
<wx/artprov.h>
<wx/xrc/xmlres.h>
<wx/string.h>
@ -27,6 +27,7 @@
<wx/spinctrl.h>
<wx/radiobut.h>
<wx/button.h>
<wx/slider.h>
<wx/scrolbar.h>
<wx/splitter.h>
<wx/listctrl.h>
@ -2135,7 +2136,7 @@
"begin_code.h"
"close_code.h"
1519273190 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
1519374277 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
"hdnesPackEditormainForm.h"
"hdnesPackEditornewProjectDialog.h"
"hdnesPackEditorcolourSelectDialog.h"
@ -2148,7 +2149,7 @@
"gameObjNode.h"
"image.h"
1519296558 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
1519379405 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
"common.h"
"mainForm.h"
"colourDialogClient.h"
@ -3810,13 +3811,13 @@
"wx/window.h"
"wx/containr.h"
1517995083 source:c:\work\hdnesr\trunk\hdnespackeditor\gameobjnode.cpp
1519360541 source:c:\work\hdnesr\trunk\hdnespackeditor\gameobjnode.cpp
"gameObjNode.h"
"gameTile.h"
"main.h"
"hdnesPackEditormainForm.h"
1517562677 c:\work\hdnesr\trunk\hdnespackeditor\gameobjnode.h
1519360410 c:\work\hdnesr\trunk\hdnespackeditor\gameobjnode.h
"common.h"
"gameTile.h"
<wx/treebase.h>

View file

@ -26,7 +26,7 @@
<property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Frame" expanded="1">
<object class="Frame" expanded="0">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
@ -306,16 +306,16 @@
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
<object class="wxBoxSizer" expanded="1">
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer5</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">1</property>
<object class="wxNotebook" expanded="1">
<object class="wxNotebook" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -393,7 +393,7 @@
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">Game Objects</property>
<property name="select">1</property>
@ -1092,11 +1092,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="1">
<object class="wxRadioButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1180,11 +1180,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="1">
<object class="wxRadioButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -1444,10 +1444,10 @@
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer16</property>
<property name="name">bSizer33</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
@ -1456,8 +1456,8 @@
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer18</property>
<property name="orient">wxVERTICAL</property>
<property name="name">bSizer34</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
@ -1542,6 +1542,479 @@
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer36</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Replacement:</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText12</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Brightness</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText16</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxSlider" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maxValue">100</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="minValue">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">dialReplaceBrightness</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxSL_HORIZONTAL</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">100</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCommandScroll"></event>
<event name="OnCommandScrollBottom"></event>
<event name="OnCommandScrollChanged"></event>
<event name="OnCommandScrollLineDown"></event>
<event name="OnCommandScrollLineUp"></event>
<event name="OnCommandScrollPageDown"></event>
<event name="OnCommandScrollPageUp"></event>
<event name="OnCommandScrollThumbRelease"></event>
<event name="OnCommandScrollThumbTrack"></event>
<event name="OnCommandScrollTop"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnScroll">replaceBrightnessChanged</event>
<event name="OnScrollBottom"></event>
<event name="OnScrollChanged"></event>
<event name="OnScrollLineDown"></event>
<event name="OnScrollLineUp"></event>
<event name="OnScrollPageDown"></event>
<event name="OnScrollPageUp"></event>
<event name="OnScrollThumbRelease"></event>
<event name="OnScrollThumbTrack"></event>
<event name="OnScrollTop"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">100</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">lblReplaceBrightness</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">%</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText18</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer16</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer18</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
@ -1891,89 +2364,6 @@
<property name="name">bSizer20</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Replacement:</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText12</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
@ -2324,7 +2714,7 @@
</object>
</object>
</object>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">HD Images</property>
<property name="select">0</property>
@ -3313,7 +3703,7 @@
</object>
</object>
</object>
<object class="notebookpage" expanded="1">
<object class="notebookpage" expanded="0">
<property name="bitmap"></property>
<property name="label">ROM Viewer</property>
<property name="select">0</property>

View file

@ -2,14 +2,9 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="gameObjNode.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="colourDialogClient.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1160" topLine="33" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="996" topLine="21" />
<Cursor1 position="235" topLine="0" />
</Cursor>
</File>
<File name="condition.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -22,19 +17,446 @@
<Cursor1 position="226" topLine="0" />
</Cursor>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditormainForm.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="192" topLine="9" />
<Cursor1 position="10394" topLine="82" />
</Cursor>
<Folding>
<Collapse line="34" />
<Collapse line="35" />
<Collapse line="37" />
<Collapse line="49" />
<Collapse line="59" />
<Collapse line="62" />
<Collapse line="72" />
<Collapse line="77" />
<Collapse line="86" />
<Collapse line="87" />
<Collapse line="90" />
<Collapse line="93" />
<Collapse line="98" />
<Collapse line="104" />
<Collapse line="109" />
<Collapse line="111" />
<Collapse line="112" />
<Collapse line="120" />
<Collapse line="121" />
<Collapse line="125" />
<Collapse line="129" />
<Collapse line="134" />
<Collapse line="138" />
<Collapse line="143" />
<Collapse line="147" />
<Collapse line="151" />
<Collapse line="152" />
<Collapse line="183" />
<Collapse line="184" />
<Collapse line="192" />
<Collapse line="202" />
<Collapse line="203" />
<Collapse line="207" />
<Collapse line="211" />
<Collapse line="212" />
<Collapse line="215" />
<Collapse line="220" />
<Collapse line="228" />
<Collapse line="237" />
<Collapse line="242" />
<Collapse line="256" />
<Collapse line="262" />
<Collapse line="263" />
<Collapse line="267" />
<Collapse line="271" />
<Collapse line="275" />
<Collapse line="281" />
<Collapse line="305" />
<Collapse line="306" />
<Collapse line="311" />
<Collapse line="321" />
<Collapse line="325" />
<Collapse line="329" />
<Collapse line="333" />
<Collapse line="334" />
<Collapse line="339" />
<Collapse line="340" />
<Collapse line="345" />
<Collapse line="346" />
<Collapse line="351" />
<Collapse line="361" />
<Collapse line="366" />
<Collapse line="369" />
<Collapse line="374" />
<Collapse line="377" />
<Collapse line="382" />
<Collapse line="385" />
<Collapse line="408" />
<Collapse line="412" />
<Collapse line="420" />
<Collapse line="421" />
<Collapse line="422" />
<Collapse line="424" />
<Collapse line="439" />
<Collapse line="444" />
<Collapse line="453" />
<Collapse line="465" />
<Collapse line="470" />
<Collapse line="493" />
<Collapse line="511" />
<Collapse line="512" />
<Collapse line="513" />
<Collapse line="524" />
<Collapse line="525" />
<Collapse line="526" />
<Collapse line="539" />
<Collapse line="540" />
<Collapse line="541" />
<Collapse line="543" />
<Collapse line="546" />
<Collapse line="547" />
<Collapse line="552" />
<Collapse line="566" />
<Collapse line="568" />
<Collapse line="572" />
<Collapse line="574" />
<Collapse line="577" />
<Collapse line="578" />
<Collapse line="585" />
<Collapse line="591" />
<Collapse line="600" />
<Collapse line="604" />
<Collapse line="607" />
<Collapse line="617" />
<Collapse line="623" />
<Collapse line="624" />
<Collapse line="628" />
<Collapse line="630" />
<Collapse line="635" />
<Collapse line="642" />
<Collapse line="643" />
<Collapse line="650" />
<Collapse line="671" />
<Collapse line="686" />
<Collapse line="687" />
<Collapse line="694" />
<Collapse line="697" />
<Collapse line="707" />
<Collapse line="710" />
<Collapse line="712" />
<Collapse line="719" />
<Collapse line="727" />
<Collapse line="731" />
<Collapse line="734" />
<Collapse line="738" />
<Collapse line="740" />
<Collapse line="743" />
<Collapse line="753" />
<Collapse line="761" />
<Collapse line="764" />
<Collapse line="817" />
<Collapse line="824" />
<Collapse line="831" />
<Collapse line="836" />
<Collapse line="842" />
<Collapse line="847" />
<Collapse line="853" />
<Collapse line="855" />
<Collapse line="861" />
<Collapse line="865" />
<Collapse line="869" />
<Collapse line="870" />
<Collapse line="873" />
<Collapse line="881" />
<Collapse line="885" />
<Collapse line="892" />
<Collapse line="897" />
<Collapse line="902" />
<Collapse line="913" />
<Collapse line="923" />
<Collapse line="925" />
<Collapse line="935" />
<Collapse line="937" />
<Collapse line="938" />
<Collapse line="941" />
<Collapse line="947" />
<Collapse line="951" />
<Collapse line="965" />
<Collapse line="969" />
<Collapse line="985" />
<Collapse line="986" />
<Collapse line="989" />
<Collapse line="992" />
<Collapse line="994" />
<Collapse line="1008" />
<Collapse line="1015" />
<Collapse line="1020" />
<Collapse line="1021" />
<Collapse line="1024" />
<Collapse line="1035" />
<Collapse line="1044" />
<Collapse line="1055" />
<Collapse line="1072" />
<Collapse line="1073" />
<Collapse line="1074" />
<Collapse line="1087" />
<Collapse line="1110" />
<Collapse line="1111" />
<Collapse line="1121" />
<Collapse line="1122" />
<Collapse line="1126" />
<Collapse line="1128" />
<Collapse line="1129" />
<Collapse line="1146" />
<Collapse line="1152" />
<Collapse line="1166" />
<Collapse line="1169" />
<Collapse line="1172" />
<Collapse line="1174" />
<Collapse line="1183" />
<Collapse line="1195" />
<Collapse line="1198" />
<Collapse line="1211" />
<Collapse line="1225" />
<Collapse line="1240" />
<Collapse line="1247" />
<Collapse line="1252" />
<Collapse line="1259" />
<Collapse line="1267" />
<Collapse line="1274" />
<Collapse line="1277" />
<Collapse line="1279" />
<Collapse line="1280" />
<Collapse line="1283" />
<Collapse line="1286" />
<Collapse line="1292" />
<Collapse line="1304" />
<Collapse line="1305" />
<Collapse line="1308" />
<Collapse line="1314" />
<Collapse line="1332" />
<Collapse line="1341" />
<Collapse line="1344" />
<Collapse line="1351" />
<Collapse line="1368" />
<Collapse line="1383" />
<Collapse line="1394" />
<Collapse line="1405" />
<Collapse line="1421" />
<Collapse line="1455" />
<Collapse line="1461" />
<Collapse line="1484" />
<Collapse line="1490" />
<Collapse line="1497" />
<Collapse line="1505" />
<Collapse line="1513" />
<Collapse line="1514" />
<Collapse line="1519" />
<Collapse line="1532" />
<Collapse line="1544" />
<Collapse line="1545" />
<Collapse line="1610" />
<Collapse line="1611" />
<Collapse line="1621" />
<Collapse line="1622" />
<Collapse line="1628" />
<Collapse line="1629" />
<Collapse line="1635" />
<Collapse line="1638" />
<Collapse line="1646" />
<Collapse line="1655" />
<Collapse line="1658" />
<Collapse line="1661" />
<Collapse line="1666" />
<Collapse line="1669" />
<Collapse line="1673" />
<Collapse line="1678" />
<Collapse line="1681" />
<Collapse line="1686" />
<Collapse line="1689" />
<Collapse line="1695" />
<Collapse line="1699" />
<Collapse line="1704" />
<Collapse line="1707" />
<Collapse line="1713" />
<Collapse line="1718" />
<Collapse line="1721" />
<Collapse line="1727" />
<Collapse line="1729" />
<Collapse line="1730" />
<Collapse line="1737" />
<Collapse line="1741" />
<Collapse line="1744" />
<Collapse line="1750" />
<Collapse line="1752" />
<Collapse line="1753" />
<Collapse line="1754" />
<Collapse line="1757" />
<Collapse line="1765" />
<Collapse line="1772" />
<Collapse line="1775" />
<Collapse line="1781" />
<Collapse line="1783" />
<Collapse line="1784" />
<Collapse line="1792" />
<Collapse line="1796" />
<Collapse line="1799" />
<Collapse line="1805" />
<Collapse line="1810" />
<Collapse line="1812" />
<Collapse line="1813" />
<Collapse line="1816" />
<Collapse line="1824" />
<Collapse line="1827" />
<Collapse line="1833" />
<Collapse line="1834" />
<Collapse line="1847" />
<Collapse line="1850" />
<Collapse line="1859" />
<Collapse line="1865" />
<Collapse line="1872" />
<Collapse line="1874" />
<Collapse line="1877" />
<Collapse line="1878" />
<Collapse line="1879" />
<Collapse line="1880" />
<Collapse line="1881" />
<Collapse line="1891" />
<Collapse line="1894" />
<Collapse line="1907" />
<Collapse line="1922" />
<Collapse line="1923" />
<Collapse line="1944" />
<Collapse line="1965" />
<Collapse line="1973" />
<Collapse line="1975" />
<Collapse line="1977" />
<Collapse line="1985" />
<Collapse line="1991" />
<Collapse line="1992" />
<Collapse line="1997" />
<Collapse line="2000" />
<Collapse line="2002" />
<Collapse line="2003" />
<Collapse line="2004" />
<Collapse line="2007" />
<Collapse line="2009" />
<Collapse line="2027" />
<Collapse line="2031" />
<Collapse line="2034" />
<Collapse line="2036" />
<Collapse line="2047" />
<Collapse line="2048" />
<Collapse line="2049" />
<Collapse line="2065" />
<Collapse line="2070" />
<Collapse line="2071" />
<Collapse line="2074" />
<Collapse line="2087" />
<Collapse line="2099" />
<Collapse line="2100" />
<Collapse line="2102" />
<Collapse line="2109" />
<Collapse line="2110" />
<Collapse line="2116" />
<Collapse line="2117" />
<Collapse line="2127" />
<Collapse line="2132" />
<Collapse line="2133" />
<Collapse line="2141" />
<Collapse line="2149" />
<Collapse line="2152" />
<Collapse line="2154" />
<Collapse line="2155" />
<Collapse line="2165" />
<Collapse line="2171" />
<Collapse line="2189" />
<Collapse line="2191" />
<Collapse line="2192" />
<Collapse line="2198" />
<Collapse line="2199" />
<Collapse line="2209" />
<Collapse line="2213" />
<Collapse line="2220" />
<Collapse line="2221" />
</Folding>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="27" />
</Cursor>
</File>
<File name="image.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="tileReference.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="397" topLine="4" />
</Cursor>
</File>
<File name="image.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="303" topLine="0" />
</Cursor>
</File>
<File name="main.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="338" topLine="12" />
</Cursor>
</File>
<File name="image.h" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="249" topLine="1" />
</Cursor>
</File>
<File name="mainForm.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="34741" topLine="537" />
</Cursor>
</File>
<File name="main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1007" topLine="28" />
</Cursor>
</File>
<File name="tileReference.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="209" topLine="0" />
</Cursor>
</File>
<File name="classList.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="174" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3777" topLine="97" />
</Cursor>
</File>
<File name="coreData.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1106" topLine="42" />
</Cursor>
</File>
<File name="mainForm.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="4216" topLine="118" />
</Cursor>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="398" topLine="12" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="996" topLine="21" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="7" />
</Cursor>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="9636" topLine="32" />
<Cursor1 position="10955" topLine="330" />
</Cursor>
<Folding>
<Collapse line="10" />
@ -46,44 +468,19 @@
<Collapse line="42" />
</Folding>
</File>
<File name="colourDialogClient.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="condition.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
<Cursor1 position="444" topLine="9" />
</Cursor>
</File>
<File name="classList.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="gameObjNode.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="174" topLine="0" />
<Cursor1 position="905" topLine="31" />
</Cursor>
</File>
<File name="coreData.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="gameTile.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1106" topLine="42" />
</Cursor>
</File>
<File name="tileReference.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="209" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3777" topLine="97" />
</Cursor>
</File>
<File name="gameObjNode.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2031" topLine="12" />
</Cursor>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="398" topLine="12" />
</Cursor>
</File>
<File name="main.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="338" topLine="12" />
<Cursor1 position="794" topLine="21" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -91,75 +488,14 @@
<Cursor1 position="382" topLine="9" />
</Cursor>
</File>
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditormainForm.h" open="1" top="1" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="14179" topLine="221" />
</Cursor>
<Folding>
<Collapse line="15" />
<Collapse line="30" />
<Collapse line="31" />
<Collapse line="33" />
<Collapse line="45" />
<Collapse line="55" />
<Collapse line="58" />
<Collapse line="68" />
<Collapse line="73" />
<Collapse line="82" />
<Collapse line="83" />
<Collapse line="86" />
<Collapse line="89" />
<Collapse line="94" />
<Collapse line="100" />
<Collapse line="105" />
<Collapse line="107" />
<Collapse line="108" />
<Collapse line="116" />
<Collapse line="117" />
<Collapse line="121" />
<Collapse line="125" />
<Collapse line="130" />
<Collapse line="134" />
<Collapse line="139" />
<Collapse line="143" />
<Collapse line="147" />
<Collapse line="148" />
<Collapse line="179" />
<Collapse line="180" />
<Collapse line="188" />
<Collapse line="198" />
<Collapse line="199" />
<Collapse line="203" />
<Collapse line="207" />
<Collapse line="208" />
<Collapse line="211" />
<Collapse line="216" />
<Collapse line="224" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="7" />
<Cursor1 position="4597" topLine="119" />
</Cursor>
</File>
<File name="tileReference.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="gameObjNode.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="397" topLine="4" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="27" />
</Cursor>
</File>
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="9301" topLine="237" />
</Cursor>
</File>
<File name="image.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="158" topLine="0" />
<Cursor1 position="2700" topLine="95" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
@ -171,24 +507,4 @@
<Collapse line="47" />
</Folding>
</File>
<File name="main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="473" topLine="6" />
</Cursor>
</File>
<File name="mainForm.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="34741" topLine="537" />
</Cursor>
</File>
<File name="mainForm.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="11939" topLine="283" />
</Cursor>
</File>
<File name="condition.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="444" topLine="9" />
</Cursor>
</File>
</CodeBlocks_layout_file>

View file

@ -19,6 +19,10 @@ mainForm( parent )
initGeneral();
initHDImg();
int widths[1];
widths[0] = 500;
m_statusBar->SetStatusWidths(1, widths);
//load config
string configPath;
configPath = main::exeDir + string("\\config.txt");
@ -1184,6 +1188,8 @@ void hdnesPackEditormainForm::refreshGameObj(){
rbnObjectSprite->SetValue(ndata->isSprite);
rbnObjectBG->SetValue(!ndata->isSprite);
dialReplaceBrightness->SetValue(ndata->brightness * 100);
lblReplaceBrightness->SetLabel(wxString(main::intToStr(dialReplaceBrightness->GetValue()).c_str()));
//refresh bg colour button
btnGameObjBGColour->SetBackgroundColour(coreData::cData->palette[ndata->bgColour]);
@ -1568,9 +1574,16 @@ void hdnesPackEditormainForm::gameObjsRawLUp( wxMouseEvent& event ){
corner2.y = max(p.y, gameObjLDownPos.y);
corner1 = convertGameObjRawPosition(corner1);
corner2 = convertGameObjRawPosition(corner2);
wxPoint ld = convertGameObjRawPosition(gameObjLDownPos);
for(int i = 0; i < ndata->tiles.size(); i++){
if(editCondition && i == conditionGameObjID) continue;
if(ld.x <= ndata->tiles[i].objCoordX + 8
&& ld.x >= ndata->tiles[i].objCoordX
&& ld.y <= ndata->tiles[i].objCoordY + 8
&& ld.y >= ndata->tiles[i].objCoordY){
m_statusBar->SetStatusText(wxString((ndata->tiles[i].id.writeID() + ", " + ndata->tiles[i].id.writePalette()).c_str()));
}
if(corner1.x <= ndata->tiles[i].objCoordX + 8
&& corner2.x >= ndata->tiles[i].objCoordX
&& corner1.y <= ndata->tiles[i].objCoordY + 8
@ -1631,6 +1644,15 @@ void hdnesPackEditormainForm::zoomGameObjsChanged( wxSpinEvent& event ){
}
}
void hdnesPackEditormainForm::replaceBrightnessChanged( wxScrollEvent& event ){
gameObjNode* ndata = getGameObjsSelectedObjectTreeNode();
if(ndata){
ndata->brightness = (float)dialReplaceBrightness->GetValue() / 100.0;
lblReplaceBrightness->SetLabel(wxString(main::intToStr(dialReplaceBrightness->GetValue()).c_str()));
dataChanged();
}
}
void hdnesPackEditormainForm::configGameObjs(string lineHdr, string lineTail){
}
@ -1787,6 +1809,7 @@ void hdnesPackEditormainForm::genGameObjItemTilePack(fstream& file, wxTreeItemId
gameTile newTile;
int replaceSize = 8 * coreData::cData->scale;
for(int i = 0; i < node->tiles.size(); ++i){
node->tiles[i].brightness = node->brightness;
if(node->tiles[i].hasReplacement && (withCondition == (node->tiles[i].conditions.size() > 0))){
if(node->isSprite && (node->tiles[i].hFlip || node->tiles[i].vFlip)){
//generate mirrored tile
@ -1819,8 +1842,6 @@ void hdnesPackEditormainForm::genGameObjItemTilePack(fstream& file, wxTreeItemId
newTile.x = gameObjectGenImageX * replaceSize;
newTile.y = gameObjectGenImageY * replaceSize;
file << newTile.writeConditionNames() << "<tile>" << newTile.writeLine() << "\n";
//save image file
gameObjectGenImage.SaveFile(wxString((coreData::cData->packPath + "\\editorGenImage" + main::intToStr(gameObjectGenImageCnt) + ".png").c_str()));
//move position
gameObjectGenImageX += 1;
@ -1828,6 +1849,9 @@ void hdnesPackEditormainForm::genGameObjItemTilePack(fstream& file, wxTreeItemId
gameObjectGenImageY += 1;
gameObjectGenImageX = 0;
if(gameObjectGenImageY == 32){
//save image file
gameObjectGenImage.SaveFile(wxString((coreData::cData->packPath + "\\editorGenImage" + main::intToStr(gameObjectGenImageCnt) + ".png").c_str()));
gameObjectGenImageCnt ++;
gameObjectGenImageY = 0;
}
@ -1839,6 +1863,11 @@ void hdnesPackEditormainForm::genGameObjItemTilePack(fstream& file, wxTreeItemId
}
}
genChildGameObjsTilePack(file, item, withCondition);
if(gameObjectGenImageX != 0 || gameObjectGenImageY != 0){
//save image file
gameObjectGenImage.SaveFile(wxString((coreData::cData->packPath + "\\editorGenImage" + main::intToStr(gameObjectGenImageCnt) + ".png").c_str()));
}
}
void hdnesPackEditormainForm::findGameObjNotUniqueTile(){

View file

@ -76,6 +76,7 @@ class hdnesPackEditormainForm : public mainForm, public colourDialogClient
void gameObjsRawHScrolled( wxScrollEvent& event );
void gameObjsRawLDown( wxMouseEvent& event );
void gameObjsRawLUp( wxMouseEvent& event );
void replaceBrightnessChanged( wxScrollEvent& event );
void HDImgSelected( wxListEvent& event );
void HDImgSizeChanged( wxSizeEvent& event );
@ -121,7 +122,7 @@ class hdnesPackEditormainForm : public mainForm, public colourDialogClient
//--end general session
//--rom view session
int romViewColours[4];
Uint8 romViewColours[4];
int romViewDisplayRows;
int romViewDisplayWidth;
int romViewDisplayHeight;

View file

@ -115,16 +115,53 @@ mainForm::mainForm( wxWindow* parent, wxWindowID id, const wxString& title, cons
bSizer14->Add( bSizer15, 0, wxEXPAND, 5 );
wxBoxSizer* bSizer33;
bSizer33 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer34;
bSizer34 = new wxBoxSizer( wxHORIZONTAL );
m_staticText11 = new wxStaticText( m_panel71, wxID_ANY, wxT("Original:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText11->Wrap( -1 );
bSizer34->Add( m_staticText11, 0, wxALL, 5 );
bSizer33->Add( bSizer34, 1, wxEXPAND, 5 );
wxBoxSizer* bSizer36;
bSizer36 = new wxBoxSizer( wxHORIZONTAL );
m_staticText12 = new wxStaticText( m_panel71, wxID_ANY, wxT("Replacement:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText12->Wrap( -1 );
bSizer36->Add( m_staticText12, 0, wxALL, 5 );
m_staticText16 = new wxStaticText( m_panel71, wxID_ANY, wxT("Brightness"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText16->Wrap( -1 );
bSizer36->Add( m_staticText16, 0, wxALL, 5 );
dialReplaceBrightness = new wxSlider( m_panel71, wxID_ANY, 100, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL );
bSizer36->Add( dialReplaceBrightness, 0, wxALL, 5 );
lblReplaceBrightness = new wxStaticText( m_panel71, wxID_ANY, wxT("100"), wxDefaultPosition, wxDefaultSize, 0 );
lblReplaceBrightness->Wrap( -1 );
bSizer36->Add( lblReplaceBrightness, 0, wxALL, 5 );
m_staticText18 = new wxStaticText( m_panel71, wxID_ANY, wxT("%"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText18->Wrap( -1 );
bSizer36->Add( m_staticText18, 0, wxALL, 5 );
bSizer33->Add( bSizer36, 1, wxEXPAND, 5 );
bSizer14->Add( bSizer33, 0, wxEXPAND, 5 );
wxBoxSizer* bSizer16;
bSizer16 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer18;
bSizer18 = new wxBoxSizer( wxVERTICAL );
m_staticText11 = new wxStaticText( m_panel71, wxID_ANY, wxT("Original:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText11->Wrap( -1 );
bSizer18->Add( m_staticText11, 0, wxALL, 5 );
wxFlexGridSizer* fgSizer11;
fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0 );
fgSizer11->AddGrowableCol( 0 );
@ -164,10 +201,6 @@ mainForm::mainForm( wxWindow* parent, wxWindowID id, const wxString& title, cons
wxBoxSizer* bSizer20;
bSizer20 = new wxBoxSizer( wxVERTICAL );
m_staticText12 = new wxStaticText( m_panel71, wxID_ANY, wxT("Replacement:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText12->Wrap( -1 );
bSizer20->Add( m_staticText12, 0, wxALL, 5 );
wxFlexGridSizer* fgSizer12;
fgSizer12 = new wxFlexGridSizer( 0, 2, 0, 0 );
fgSizer12->AddGrowableCol( 0 );
@ -389,6 +422,15 @@ mainForm::mainForm( wxWindow* parent, wxWindowID id, const wxString& title, cons
rbnObjectSprite->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( mainForm::gameObjSpriteClicked ), NULL, this );
rbnObjectBG->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( mainForm::gameObjBGClicked ), NULL, this );
btnGameObjBGColour->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( mainForm::gameObjBGColour ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
pnlGameObjRaw->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( mainForm::gameObjsRawEnter ), NULL, this );
pnlGameObjRaw->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( mainForm::gameObjsRawLDown ), NULL, this );
pnlGameObjRaw->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( mainForm::gameObjsRawLUp ), NULL, this );
@ -498,6 +540,15 @@ mainForm::~mainForm()
rbnObjectSprite->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( mainForm::gameObjSpriteClicked ), NULL, this );
rbnObjectBG->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( mainForm::gameObjBGClicked ), NULL, this );
btnGameObjBGColour->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( mainForm::gameObjBGColour ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
dialReplaceBrightness->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( mainForm::replaceBrightnessChanged ), NULL, this );
pnlGameObjRaw->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( mainForm::gameObjsRawEnter ), NULL, this );
pnlGameObjRaw->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( mainForm::gameObjsRawLDown ), NULL, this );
pnlGameObjRaw->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( mainForm::gameObjsRawLUp ), NULL, this );

View file

@ -27,6 +27,7 @@
#include <wx/spinctrl.h>
#include <wx/radiobut.h>
#include <wx/button.h>
#include <wx/slider.h>
#include <wx/scrolbar.h>
#include <wx/splitter.h>
#include <wx/listctrl.h>
@ -66,10 +67,14 @@ class mainForm : public wxFrame
wxStaticText* m_staticText101;
wxButton* btnGameObjBGColour;
wxStaticText* m_staticText11;
wxStaticText* m_staticText12;
wxStaticText* m_staticText16;
wxSlider* dialReplaceBrightness;
wxStaticText* lblReplaceBrightness;
wxStaticText* m_staticText18;
wxPanel* pnlGameObjRaw;
wxScrollBar* scrGameObjRawV;
wxScrollBar* scrGameObjRawH;
wxStaticText* m_staticText12;
wxPanel* pnlGameObjNew;
wxScrollBar* scrGameObjNewV;
wxScrollBar* scrGameObjNewH;
@ -114,6 +119,7 @@ class mainForm : public wxFrame
virtual void gameObjSpriteClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void gameObjBGClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void gameObjBGColour( wxCommandEvent& event ) { event.Skip(); }
virtual void replaceBrightnessChanged( wxScrollEvent& event ) { event.Skip(); }
virtual void gameObjsRawEnter( wxMouseEvent& event ) { event.Skip(); }
virtual void gameObjsRawLDown( wxMouseEvent& event ) { event.Skip(); }
virtual void gameObjsRawLUp( wxMouseEvent& event ) { event.Skip(); }