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

- see if this fixes color picking

Browse Source
This commit is contained in:
Mark Vejvoda
2013-01-15 00:52:00 +00:00
parent 6f0c700acf
commit 17a599ced3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/shared_lib/sources/graphics/model.cpp
View File

@@ -1528,13 +1528,15 @@ void BaseColorPickEntity::beginPicking() {
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glClear(GL_COLOR_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT);
glDisable(GL_TEXTURE_2D); //glDisable(GL_TEXTURE_2D);
//glDisable(GL_FOG); //glDisable(GL_FOG);
glDisable(GL_LIGHTING); //glDisable(GL_LIGHTING);
glDisable(GL_BLEND); //glDisable(GL_BLEND);
//glDisable(GL_MULTISAMPLE); //glDisable(GL_MULTISAMPLE);
//glDisable(GL_DITHER); //glDisable(GL_DITHER);
glPushAttrib(GL_TEXTURE_2D | GL_LIGHTING | GL_BLEND | GL_MULTISAMPLE | GL_DITHER);
} }
void BaseColorPickEntity::endPicking() { void BaseColorPickEntity::endPicking() {
@@ -1546,6 +1548,7 @@ void BaseColorPickEntity::endPicking() {
//glEnable(GL_BLEND); //glEnable(GL_BLEND);
//glEnable(GL_MULTISAMPLE); //glEnable(GL_MULTISAMPLE);
//glEnable(GL_DITHER); //glEnable(GL_DITHER);
glPopAttrib();
} }
vector<int> BaseColorPickEntity::getPickedList(int x,int y,int w,int h, vector<int> BaseColorPickEntity::getPickedList(int x,int y,int w,int h,