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

- bugfixes for g3d viewer animation speed when going too high or low

Browse Source 
- added current display anim-speed in the status bar
This commit is contained in:
Mark Vejvoda
2011-01-13 19:27:26 +00:00
parent 469cf14b92
commit 26010071e7
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/g3d_viewer/main.cpp
View File

@@ -130,7 +130,7 @@ MainWindow::MainWindow(const string &modelPath)
lastX= 0; lastX= 0;
lastY= 0; lastY= 0;
anim= 0.0f; anim= 0.0f;
statusbarText="";
CreateStatusBar(); CreateStatusBar();
wxInitAllImageHandlers(); wxInitAllImageHandlers();
@@ -350,7 +350,7 @@ void MainWindow::onMenuFileClearAll(wxCommandEvent &event){
loadProjectileParticle(""); loadProjectileParticle("");
loadSplashParticle(""); // as above loadSplashParticle(""); // as above
GetStatusBar()->SetStatusText(ToUnicode("")); GetStatusBar()->SetStatusText(ToUnicode(statusbarText.c_str()));
timer->Start(100); timer->Start(100);
isControlKeyPressed = false; isControlKeyPressed = false;
} }
@@ -373,7 +373,10 @@ void MainWindow::loadModel(string path) {
Model *tmpModel= new ModelGl(); Model *tmpModel= new ModelGl();
renderer->loadTheModel(tmpModel, modelPath); renderer->loadTheModel(tmpModel, modelPath);
model= tmpModel; model= tmpModel;
GetStatusBar()->SetStatusText(ToUnicode(getModelInfo().c_str()));
statusbarText = getModelInfo();
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0);
GetStatusBar()->SetStatusText(ToUnicode(statusTextValue.c_str()));
timer->Start(100); timer->Start(100);
titlestring = extractFileFromDirectoryPath(modelPath) + " - "+ titlestring; titlestring = extractFileFromDirectoryPath(modelPath) + " - "+ titlestring;
} }
@@ -687,11 +690,23 @@ void MainWindow::onMenuModeGrid(wxCommandEvent &event){
} }
void MainWindow::onMenuSpeedSlower(wxCommandEvent &event){ void MainWindow::onMenuSpeedSlower(wxCommandEvent &event){
speed/= 1.5f; speed /= 1.5f;
if(speed < 0) {
speed = 0;
}
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0);
GetStatusBar()->SetStatusText(ToUnicode(statusTextValue.c_str()));
} }
void MainWindow::onMenuSpeedFaster(wxCommandEvent &event){ void MainWindow::onMenuSpeedFaster(wxCommandEvent &event){
speed*= 1.5f; speed *= 1.5f;
if(speed > 1) {
speed = 1;
}
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0 );
GetStatusBar()->SetStatusText(ToUnicode(statusTextValue.c_str()));
} }
// set menu checkboxes to what player color is used // set menu checkboxes to what player color is used
@@ -795,9 +810,9 @@ void MainWindow::onMenuColorMagenta(wxCommandEvent &event){
void MainWindow::onTimer(wxTimerEvent &event){ void MainWindow::onTimer(wxTimerEvent &event){
wxPaintEvent paintEvent; wxPaintEvent paintEvent;
anim= anim+speed; anim = anim + speed;
if(anim>1.0f){ if(anim > 1.0f){
anim-= 1.f; anim -= 1.f;
} }
onPaint(paintEvent); onPaint(paintEvent);
} }
@@ -831,8 +846,24 @@ void MainWindow::onKeyDown(wxKeyEvent &e) {
// here also because + and - hotkeys don't work for numpad automaticly // here also because + and - hotkeys don't work for numpad automaticly
if (e.GetKeyCode() == 388) speed*= 1.5f; //numpad+ if (e.GetKeyCode() == 388) {
else if (e.GetKeyCode() == 390) speed/= 1.5f; //numpad- speed *= 1.5f; //numpad+
if(speed > 1.0) {
speed = 1.0;
}
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0);
GetStatusBar()->SetStatusText(ToUnicode(statusTextValue.c_str()));
}
else if (e.GetKeyCode() == 390) {
speed /= 1.5f; //numpad-
if(speed < 0) {
speed = 0;
}
string statusTextValue = statusbarText + " animation speed: " + floatToStr(speed * 1000.0);
GetStatusBar()->SetStatusText(ToUnicode(statusTextValue.c_str()));
}
else if (e.GetKeyCode() == 87) { else if (e.GetKeyCode() == 87) {
glClearColor(0.6f, 0.6f, 0.6f, 1.0f); //w key //backgroundcolor constant 0.3 -> 0.6 glClearColor(0.6f, 0.6f, 0.6f, 1.0f); //w key //backgroundcolor constant 0.3 -> 0.6

1
source/g3d_viewer/main.h
View File

@@ -85,6 +85,7 @@ private:
std::vector<ProjectileParticleSystem *> projectileParticleSystems; std::vector<ProjectileParticleSystem *> projectileParticleSystems;
std::vector<ParticleSystemTypeSplash *> splashParticleSystemTypes; // as above std::vector<ParticleSystemTypeSplash *> splashParticleSystemTypes; // as above
std::vector<SplashParticleSystem *> splashParticleSystems; std::vector<SplashParticleSystem *> splashParticleSystems;
string statusbarText;
bool isControlKeyPressed; bool isControlKeyPressed;
void loadModel(string path); void loadModel(string path);