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

default selection is colorpicking now

Browse Source
This commit is contained in:
Titus Tscharntke 2013-06-20 21:42:01 +00:00
parent 8d36c07a61
commit 511ba5134f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5087,7 +5087,7 @@ string Game::getDebugStats(std::map<int,string> &factionDebugInfo) {
str+= "ExploredCellsLookupItemCache: " + world.getExploredCellsLookupItemCacheStats()+"\n";
str+= "FowAlphaCellsLookupItemCache: " + world.getFowAlphaCellsLookupItemCacheStats()+"\n";
str += "Selection type: "+toLower(Config::getInstance().getString("SelectionType",Config::selectBufPicking))+"\n";
str += "Selection type: "+toLower(Config::getInstance().getString("SelectionType",Config::colorPicking))+"\n";
//str+= "AllFactionsCacheStats: " + world.getAllFactionsCacheStats()+"\n";
//str+= "AttackWarningCount: " + intToStr(world.getUnitUpdater()->getAttackWarningCount()) + "\n";

2
source/glest_game/graphics/renderer.cpp
View File

@ -6645,7 +6645,7 @@ Vec3f Renderer::computeScreenPosition(const Vec3f &worldPos) {
void Renderer::computeSelected( Selection::UnitContainer &units, const Object *&obj,
const bool withObjectSelection,
const Vec2i &posDown, const Vec2i &posUp) {
const string selectionType=toLower(Config::getInstance().getString("SelectionType",Config::selectBufPicking));
const string selectionType=toLower(Config::getInstance().getString("SelectionType",Config::colorPicking));
if(selectionType==Config::colorPicking) {
selectUsingColorPicking(units,obj, withObjectSelection,posDown, posUp);

20
source/glest_game/menu/menu_state_options_graphics.cpp
View File

@ -110,7 +110,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelScreenModes.setText(lang.get("Resolution"));
listBoxScreenModes.registerGraphicComponent(containerName,"listBoxScreenModes");
listBoxScreenModes.init(currentColumnStart, currentLine, 170);
listBoxScreenModes.init(currentColumnStart, currentLine, 200);
string currentResString = config.getString("ScreenWidth") + "x" +
config.getString("ScreenHeight") + "-" +
@ -145,7 +145,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelGammaCorrection.setText(lang.get("GammaCorrection"));
listBoxGammaCorrection.registerGraphicComponent(containerName,"listBoxGammaCorrection");
listBoxGammaCorrection.init(currentColumnStart, currentLine, 170);
listBoxGammaCorrection.init(currentColumnStart, currentLine, 200);
for (float f=0.5;f<3.0f;f=f+0.1f) {
listBoxGammaCorrection.pushBackItem(floatToStr(f));
}
@ -161,7 +161,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelFilter.setText(lang.get("Filter"));
listBoxFilter.registerGraphicComponent(containerName,"listBoxFilter");
listBoxFilter.init(currentColumnStart, currentLine, 170);
listBoxFilter.init(currentColumnStart, currentLine, 200);
listBoxFilter.pushBackItem("Bilinear");
listBoxFilter.pushBackItem("Trilinear");
listBoxFilter.setSelectedItem(config.getString("Filter"));
@ -173,12 +173,12 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelSelectionType.setText(lang.get("SelectionType"));
listBoxSelectionType.registerGraphicComponent(containerName,"listBoxSelectionType");
listBoxSelectionType.init(currentColumnStart, currentLine, 170);
listBoxSelectionType.pushBackItem("SelectBuffer");
listBoxSelectionType.pushBackItem("ColorPicking");
listBoxSelectionType.pushBackItem("FrustumPicking");
listBoxSelectionType.init(currentColumnStart, currentLine, 200);
listBoxSelectionType.pushBackItem("SelectBuffer (nvidia)");
listBoxSelectionType.pushBackItem("ColorPicking (default)");
listBoxSelectionType.pushBackItem("FrustumPicking (bad)");
const string selectionType=toLower(config.getString("SelectionType",Config::selectBufPicking));
const string selectionType=toLower(config.getString("SelectionType",Config::colorPicking));
if( selectionType==Config::colorPicking)
listBoxSelectionType.setSelectedItemIndex(1);
else if ( selectionType==Config::frustumPicking )
@ -193,7 +193,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelShadows.setText(lang.get("Shadows"));
listBoxShadows.registerGraphicComponent(containerName,"listBoxShadows");
listBoxShadows.init(currentColumnStart, currentLine, 170);
listBoxShadows.init(currentColumnStart, currentLine, 200);
for(int i= 0; i<Renderer::sCount; ++i){
listBoxShadows.pushBackItem(lang.get(Renderer::shadowsToStr(static_cast<Renderer::Shadows>(i))));
}
@ -207,7 +207,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
labelShadowTextureSize.setText(lang.get("ShadowTextureSize"));
listBoxShadowTextureSize.registerGraphicComponent(containerName,"listBoxShadowTextureSize");
listBoxShadowTextureSize.init(currentColumnStart, currentLine, 170);
listBoxShadowTextureSize.init(currentColumnStart, currentLine, 200);
listBoxShadowTextureSize.pushBackItem("256");
listBoxShadowTextureSize.pushBackItem("512");
listBoxShadowTextureSize.pushBackItem("1024");