Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CameraMoveSpeed can be modified

This commit is contained in:
titiger 2014-01-11 15:53:53 +01:00
parent 4235e642be
commit 9ea0debc51
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/game/game_camera.cpp
View File

@ -58,7 +58,7 @@ GameCamera::GameCamera() : pos(0.f, defaultHeight, 0.f),
//} //}
//config //config
speed= 15.f / GameConstants::cameraFps; speed= Config::getInstance().getFloat("CameraMoveSpeed","15") / GameConstants::cameraFps;
clampBounds= !Config::getInstance().getBool("PhotoMode"); clampBounds= !Config::getInstance().getBool("PhotoMode");
clampDisable = false; clampDisable = false;

19
source/glest_game/menu/menu_state_options.cpp
View File

@ -204,6 +204,19 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program
checkBoxMouseMoveScrollsWorld.setValue(config.getBool("MouseMoveScrollsWorld","true")); checkBoxMouseMoveScrollsWorld.setValue(config.getBool("MouseMoveScrollsWorld","true"));
currentLine-=lineOffset; currentLine-=lineOffset;
//CameraMoveSpeed
labelCameraMoveSpeed.registerGraphicComponent(containerName,"labelCameraMoveSpeed");
labelCameraMoveSpeed.init(currentLabelStart,currentLine);
labelCameraMoveSpeed.setText(lang.getString("CameraMoveSpeed"));
listCameraMoveSpeed.registerGraphicComponent(containerName,"listCameraMoveSpeed");
listCameraMoveSpeed.init(currentColumnStart, currentLine, 80);
for(int i=15; i<=50; i+=5){
listCameraMoveSpeed.pushBackItem(intToStr(i));
}
listCameraMoveSpeed.setSelectedItem(intToStr((int) (config.getFloat("CameraMoveSpeed","15"))));
currentLine-=lineOffset;
labelVisibleHud.registerGraphicComponent(containerName,"lavelVisibleHud"); labelVisibleHud.registerGraphicComponent(containerName,"lavelVisibleHud");
labelVisibleHud.init(currentLabelStart ,currentLine); labelVisibleHud.init(currentLabelStart ,currentLine);
labelVisibleHud.setText(lang.getString("VisibleHUD")); labelVisibleHud.setText(lang.getString("VisibleHUD"));
@ -374,6 +387,7 @@ void MenuStateOptions::reloadUI() {
labelDisableScreenshotConsoleText.setText(lang.getString("ScreenShotConsoleText")); labelDisableScreenshotConsoleText.setText(lang.getString("ScreenShotConsoleText"));
labelMouseMoveScrollsWorld.setText(lang.getString("MouseScrollsWorld")); labelMouseMoveScrollsWorld.setText(lang.getString("MouseScrollsWorld"));
labelCameraMoveSpeed.setText(lang.getString("CameraMoveSpeed"));
buttonOk.setText(lang.getString("Save")); buttonOk.setText(lang.getString("Save"));
@ -906,6 +920,7 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
checkBoxDisableScreenshotConsoleText.mouseClick(x, y); checkBoxDisableScreenshotConsoleText.mouseClick(x, y);
checkBoxMouseMoveScrollsWorld.mouseClick(x, y); checkBoxMouseMoveScrollsWorld.mouseClick(x, y);
listCameraMoveSpeed.mouseClick(x, y);
checkBoxVisibleHud.mouseClick(x, y); checkBoxVisibleHud.mouseClick(x, y);
checkBoxChatStaysActive.mouseClick(x, y); checkBoxChatStaysActive.mouseClick(x, y);
checkBoxTimeDisplay.mouseClick(x, y); checkBoxTimeDisplay.mouseClick(x, y);
@ -936,6 +951,7 @@ void MenuStateOptions::mouseMove(int x, int y, const MouseState *ms){
listBoxScreenShotType.mouseMove(x, y); listBoxScreenShotType.mouseMove(x, y);
checkBoxDisableScreenshotConsoleText.mouseMove(x, y); checkBoxDisableScreenshotConsoleText.mouseMove(x, y);
checkBoxMouseMoveScrollsWorld.mouseMove(x, y); checkBoxMouseMoveScrollsWorld.mouseMove(x, y);
listCameraMoveSpeed.mouseMove(x, y);
checkBoxVisibleHud.mouseMove(x, y); checkBoxVisibleHud.mouseMove(x, y);
checkBoxChatStaysActive.mouseMove(x, y); checkBoxChatStaysActive.mouseMove(x, y);
checkBoxTimeDisplay.mouseMove(x, y); checkBoxTimeDisplay.mouseMove(x, y);
@ -1019,6 +1035,8 @@ void MenuStateOptions::render(){
renderer.renderLabel(&labelMouseMoveScrollsWorld); renderer.renderLabel(&labelMouseMoveScrollsWorld);
renderer.renderCheckBox(&checkBoxMouseMoveScrollsWorld); renderer.renderCheckBox(&checkBoxMouseMoveScrollsWorld);
renderer.renderLabel(&labelCameraMoveSpeed);
renderer.renderListBox(&listCameraMoveSpeed);
renderer.renderLabel(&labelVisibleHud); renderer.renderLabel(&labelVisibleHud);
renderer.renderLabel(&labelChatStaysActive); renderer.renderLabel(&labelChatStaysActive);
@ -1058,6 +1076,7 @@ void MenuStateOptions::saveConfig(){
config.setBool("DisableScreenshotConsoleText", !checkBoxDisableScreenshotConsoleText.getValue()); config.setBool("DisableScreenshotConsoleText", !checkBoxDisableScreenshotConsoleText.getValue());
config.setBool("MouseMoveScrollsWorld", checkBoxMouseMoveScrollsWorld.getValue()); config.setBool("MouseMoveScrollsWorld", checkBoxMouseMoveScrollsWorld.getValue());
config.setString("CameraMoveSpeed", listCameraMoveSpeed.getSelectedItem());
config.setBool("VisibleHud", checkBoxVisibleHud.getValue()); config.setBool("VisibleHud", checkBoxVisibleHud.getValue());
config.setBool("ChatStaysActive", checkBoxChatStaysActive.getValue()); config.setBool("ChatStaysActive", checkBoxChatStaysActive.getValue());
config.setBool("TimeDisplay", checkBoxTimeDisplay.getValue()); config.setBool("TimeDisplay", checkBoxTimeDisplay.getValue());

3
source/glest_game/menu/menu_state_options.h
View File

@ -58,6 +58,9 @@ private:
GraphicLabel labelMouseMoveScrollsWorld; GraphicLabel labelMouseMoveScrollsWorld;
GraphicCheckBox checkBoxMouseMoveScrollsWorld; GraphicCheckBox checkBoxMouseMoveScrollsWorld;
GraphicLabel labelCameraMoveSpeed;
GraphicListBox listCameraMoveSpeed;
GraphicLabel labelVisibleHud; GraphicLabel labelVisibleHud;
GraphicCheckBox checkBoxVisibleHud; GraphicCheckBox checkBoxVisibleHud;
GraphicLabel labelTimeDisplay; GraphicLabel labelTimeDisplay;