mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 11:19:48 +02:00
Code Issues Projects Releases Wiki Activity

- added the ability to hold CTRL when adding particle types to add instead of replace

Browse Source
This commit is contained in:
Mark Vejvoda
2010-06-24 14:00:20 +00:00
parent 87a1eee48d
commit 4d1593a503
2 changed files with 206 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/g3d_viewer/main.h
View File

@@ -34,6 +34,7 @@ public:
miFileLoad,
miFileLoadParticleXML,
miFileLoadProjectileParticleXML,
miFileClearAll,
miModeWireframe,
miModeNormals,
miModeGrid,
@@ -59,8 +60,6 @@ private:
Model *model;
//string modelPath;
//string ParticlePath;
std::vector<string> modelPathList;
std::vector<string> particlePathList;
std::vector<string> particleProjectilePathList;
@@ -77,6 +76,7 @@ private:
std::vector<ParticleSystemTypeProjectile *> projectileParticleSystemTypes;
std::vector<ProjectileParticleSystem *> projectileParticleSystems;
bool isControlKeyPressed;
void loadModel(string path);
void loadParticle(string path);
void loadProjectileParticle(string path);
@@ -93,6 +93,7 @@ public:
void onMenuFileLoad(wxCommandEvent &event);
void onMenuFileLoadParticleXML(wxCommandEvent &event);
void onMenuFileLoadProjectileParticleXML(wxCommandEvent &event);
void onMenuFileClearAll(wxCommandEvent &event);
void onMenuModeNormals(wxCommandEvent &event);
void onMenuModeWireframe(wxCommandEvent &event);
void onMenuModeGrid(wxCommandEvent &event);