uMod2 Alpha Version: known bugs: I disabled the remove device function inside the gui, because something in the event handling goes terrible wrong.

Implemented a some new features.
This commit is contained in:
code@koerner-de.net
2012-07-15 18:59:03 +00:00
parent d99107a919
commit 0bc7eebede
69 changed files with 7975 additions and 2393 deletions
+67 -22
View File
@@ -20,6 +20,8 @@ along with Universal Modding Engine. If not, see <http://www.gnu.org/licenses/>
#ifndef uMod_GAME_H_
#define uMod_GAME_H_
#include "uMod_TreeView.h"
#include "uMod_Main.h"
//this class is intended as a storing object for each game
@@ -32,11 +34,19 @@ public:
void Init(void);
int SaveToFile( const wxString &file_name);
int LoadFromFile( const wxString &file_name);
int SaveToString( wxString &content);
int LoadFromString( const wxString &content);
//int GetActiveTexture( uMod_TextureElement_SortedArrayPtr &texture);
bool &ShowCollPane(void) {return myShowCollPane;}
bool &SupportTPF(void) {return mySupportTPF;}
const bool &SupportTPF(void) const {return mySupportTPF;}
int GetChecked( bool* array, int num) const;
int SetChecked( bool* array, int num);
int SetSaveSingleTexture(bool val);
bool GetSaveSingleTexture(void) const {return SaveSingleTexture;}
@@ -44,13 +54,6 @@ public:
int SetSaveAllTextures(bool val);
bool GetSaveAllTextures(void) const {return SaveAllTextures;}
void SetFiles(const wxArrayString &files);
void GetFiles( wxArrayString &files) const;
//void AddTexture( const wxString &textures);
int GetNumberOfFiles(void) const {return Files.GetCount();}
int SendTextures(void);
int GetKeyBack() const {return KeyBack;}
int SetKeyBack(int key) {KeyBack=key; return 0;}
@@ -61,11 +64,43 @@ public:
int GetKeyNext() const {return KeyNext;}
int SetKeyNext(int key) {KeyNext=key; return 0;}
int SetFontColour(const int *colour) {FontColour[0]=colour[0];FontColour[1]=colour[1];FontColour[2]=colour[2];return 0;}
int GetFontColour(int *colour) const {colour[0]=FontColour[0];colour[1]=FontColour[1];colour[2]=FontColour[2];return 0;}
bool &ShowSingleTextureString() {return myShowSingleTextureString;}
const bool &ShowSingleTextureString() const {return myShowSingleTextureString;}
int SetFontColour(const unsigned char *colour) {FontColour[0]=colour[0];FontColour[1]=colour[1];FontColour[2]=colour[2];FontColour[3]=colour[3];return 0;}
int GetFontColour(unsigned char *colour) const {colour[0]=FontColour[0];colour[1]=FontColour[1];colour[2]=FontColour[2];colour[3]=FontColour[3];return 0;}
int SetTextureColour(const unsigned char *colour) {TextureColour[0]=colour[0];TextureColour[1]=colour[1];TextureColour[2]=colour[2];TextureColour[3]=colour[3];return 0;}
int GetTextureColour(unsigned char *colour) const {colour[0]=TextureColour[0];colour[1]=TextureColour[1];colour[2]=TextureColour[2];colour[3]=TextureColour[3];return 0;}
bool &UseSizeFilter(void) {return myUseSizeFilter;}
const bool &UseSizeFilter(void) const {return myUseSizeFilter;}
int &HeightMin(void) {return myHeightMin;}
const int &HeightMin(void) const {return myHeightMin;}
int &HeightMax(void) {return myHeightMax;}
const int &HeightMax(void) const {return myHeightMax;}
int &WidthMin(void) {return myWidthMin;}
const int &WidthMin(void) const {return myWidthMin;}
int &WidthMax(void) {return myWidthMax;}
const int &WidthMax(void) const {return myWidthMax;}
int &DepthMin(void) {return myDepthMin;}
const int &DepthMin(void) const {return myDepthMin;}
int &DepthMax(void) {return myDepthMax;}
const int &DepthMax(void) const {return myDepthMax;}
bool &UseFormatFilter(void) {return myUseFormatFilter;}
const bool &UseFormatFilter(void) const {return myUseFormatFilter;}
unsigned long &FormatFilter(void) {return myFormatFilter;}
const unsigned long &FormatFilter(void) const {return myFormatFilter;}
unsigned long &FileFormat(void) {return myFileFormat;}
const unsigned long &FileFormat(void) const {return myFileFormat;}
int SetTextureColour(const int *colour) {TextureColour[0]=colour[0];TextureColour[1]=colour[1];TextureColour[2]=colour[2];return 0;}
int GetTextureColour(int *colour) const {colour[0]=TextureColour[0];colour[1]=TextureColour[1];colour[2]=TextureColour[2];return 0;}
int SetOpenPath(const wxString &path) {OpenPath=path; return 0;}
wxString GetOpenPath(void) const {return OpenPath;}
@@ -76,22 +111,32 @@ public:
uMod_GameInfo& operator = (const uMod_GameInfo &rhs);
private:
bool myShowCollPane;
bool *Checked;
int NumberOfChecked;
int LengthOfChecked;
bool mySupportTPF;
bool SaveSingleTexture;
bool SaveAllTextures;
wxArrayString Files;
int KeyBack;
int KeySave;
int KeyNext;
int FontColour[3];
int TextureColour[3];
bool myUseSizeFilter;
int myHeightMin;
int myHeightMax;
int myWidthMin;
int myWidthMax;
int myDepthMin;
int myDepthMax;
bool myUseFormatFilter;
unsigned long myFormatFilter;
unsigned long myFileFormat;
bool myShowSingleTextureString;
unsigned char FontColour[4];
unsigned char TextureColour[4];
wxString OpenPath;
wxString SavePath;