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

colorpicking improved again and hopefully fixed false clicks on attacks ... ( works with low display resolutions too now)

Browse Source
This commit is contained in:
Titus Tscharntke
2013-04-27 17:38:35 +00:00
parent 8ba869c4b7
commit 6849d432bf
2 changed files with 37 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6795,11 +6795,11 @@ void Renderer::selectUsingFrustumSelection(Selection::UnitContainer &units,
int y = (posDown.y+posUp.y) / 2; int y = (posDown.y+posUp.y) / 2;
int w = abs(posDown.x-posUp.x); int w = abs(posDown.x-posUp.x);
int h = abs(posDown.y-posUp.y); int h = abs(posDown.y-posUp.y);
if(w < 1) { if(w < 2) {
w = 1; w = 2;
} }
if(h < 1) { if(h < 2) {
h = 1; h = 2;
} }
gluPickMatrix(x, y, w, h, view); gluPickMatrix(x, y, w, h, view);
@@ -6857,11 +6857,11 @@ void Renderer::selectUsingSelectionBuffer(Selection::UnitContainer &units,
int y = (posDown.y+posUp.y) / 2; int y = (posDown.y+posUp.y) / 2;
int w = abs(posDown.x-posUp.x); int w = abs(posDown.x-posUp.x);
int h = abs(posDown.y-posUp.y); int h = abs(posDown.y-posUp.y);
if(w < 1) { if(w < 2) {
w = 1; w = 2;
} }
if(h < 1) { if(h < 2) {
h = 1; h = 2;
} }
//declarations //declarations
@@ -6955,11 +6955,11 @@ void Renderer::selectUsingColorPicking(Selection::UnitContainer &units,
int y = min(y1,y2); int y = min(y1,y2);
int w = max(x1,x2) - min(x1,x2); int w = max(x1,x2) - min(x1,x2);
int h = max(y1,y2) - min(y1,y2); int h = max(y1,y2) - min(y1,y2);
if(w < 1) { if(w < 2) {
w = 1; w = 2;
} }
if(h < 1) { if(h < 2) {
h = 1; h = 2;
} }
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();

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

@@ -1429,7 +1429,7 @@ Pixmap2D *PixelBufferWrapper::getPixelBufferFor(int x,int y,int w,int h, int col
glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[index]); glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[index]);
GLubyte* src = (GLubyte*)glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB); GLubyte* src = (GLubyte*)glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB);
if(src) { if(src) {
pixmapScreenShot = new Pixmap2D(w+1, h+1, colorComponents); pixmapScreenShot = new Pixmap2D(w, h, colorComponents);
memcpy(pixmapScreenShot->getPixels(),src,(size_t)pixmapScreenShot->getPixelByteCount()); memcpy(pixmapScreenShot->getPixels(),src,(size_t)pixmapScreenShot->getPixelByteCount());
glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB); // release pointer to the mapped buffer glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB); // release pointer to the mapped buffer
//pixmapScreenShot->save("debugPBO.png"); //pixmapScreenShot->save("debugPBO.png");
@@ -1568,7 +1568,9 @@ void BaseColorPickEntity::beginPicking() {
// turn off texturing, lighting and fog // turn off texturing, lighting and fog
//glClearColor (0.0,0.0,0.0,0.0); //glClearColor (0.0,0.0,0.0,0.0);
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glClear(GL_COLOR_BUFFER_BIT);
//reset current background. This is neeeded to get a proper black background!
glClear(GL_COLOR_BUFFER_BIT);
glPushAttrib(GL_ENABLE_BIT); glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
@@ -1602,85 +1604,48 @@ vector<int> BaseColorPickEntity::getPickedList(int x,int y,int w,int h,
pickedModels.reserve(rendererModels.size()); pickedModels.reserve(rendererModels.size());
//printf("In [%s::%s] Line: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); //printf("In [%s::%s] Line: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
//static auto_ptr<unsigned char> cachedPixels;
static auto_ptr<Pixmap2D> cachedPixels; static auto_ptr<Pixmap2D> cachedPixels;
//static int cachedPixelsW = -1;
//static int cachedPixelsH = -1;
//printf("In [%s::%s] Line: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
static Chrono lastSnapshot(true);
const int selectionMillisecondUpdate = -1;
if(rendererModels.empty() == false) { if(rendererModels.empty() == false) {
if(PixelBufferWrapper::getIsPBOEnable() == true) { if(PixelBufferWrapper::getIsPBOEnable() == true) {
// Only update the pixel buffer every x milliseconds or as required Pixmap2D *pixmapScreenShot = BaseColorPickEntity::pbo->getPixelBufferFor(x,y,w,h, COLOR_COMPONENTS);
if(cachedPixels.get() == NULL || cachedPixels->getW() != w+1 ||cachedPixels->getH() != h+1 || //pixmapScreenShot->saveTga("/tmp/toll.tga");
lastSnapshot.getMillis() > selectionMillisecondUpdate) { cachedPixels.reset(pixmapScreenShot);
//printf("Updating selection millis = %ld\n",lastSnapshot.getMillis());
lastSnapshot.reset();
//Pixmap2D *pixmapScreenShot = BaseColorPickEntity::pbo->getPixelBufferFor(x,y,w,h, COLOR_COMPONENTS);
cachedPixels.reset(BaseColorPickEntity::pbo->getPixelBufferFor(x,y,w,h, COLOR_COMPONENTS));
//cachedPixels.reset(new unsigned char[(unsigned int)pixmapScreenShot->getPixelByteCount()]);
//memcpy(cachedPixels.get(),pixmapScreenShot->getPixels(),(size_t)pixmapScreenShot->getPixelByteCount());
//cachedPixelsW = w+1;
//cachedPixelsH = h+1;
//delete pixmapScreenShot;
}
} }
else { else {
// Only update the pixel buffer every x milliseconds or as required Pixmap2D *pixmapScreenShot = new Pixmap2D(w, h, COLOR_COMPONENTS);
if(cachedPixels.get() == NULL || cachedPixels->getW() != w+1 ||cachedPixels->getH() != h+1 ||
lastSnapshot.getMillis() > selectionMillisecondUpdate) {
//printf("Updating selection millis = %ld\n",lastSnapshot.getMillis());
lastSnapshot.reset();
//Pixmap2D *pixmapScreenShot = new Pixmap2D(w+1, h+1, COLOR_COMPONENTS);
cachedPixels.reset(new Pixmap2D(w+1, h+1, COLOR_COMPONENTS));
//glPixelStorei(GL_PACK_ALIGNMENT, 1); //glPixelStorei(GL_PACK_ALIGNMENT, 1);
//glReadPixels(x, y, w, h, GL_RGB, GL_UNSIGNED_BYTE, pixmapScreenShot->getPixels()); glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixmapScreenShot->getPixels());
//glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixmapScreenShot->getPixels()); //pixmapScreenShot->saveTga("/tmp/toll.tga");
glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, cachedPixels->getPixels()); cachedPixels.reset(pixmapScreenShot);
//glPixelStorei(GL_UNPACK_ALIGNMENT, 1); //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
//cachedPixels.reset(new unsigned char[(unsigned int)pixmapScreenShot->getPixelByteCount()]);
//memcpy(cachedPixels.get(),pixmapScreenShot->getPixels(),(size_t)pixmapScreenShot->getPixelByteCount());
//cachedPixelsW = w+1;
//cachedPixelsH = h+1;
//delete pixmapScreenShot;
}
} }
unsigned char *pixelBuffer = cachedPixels->getPixels(); unsigned char *pixelBuffer = cachedPixels->getPixels();
// Enable screenshots to debug selection scene
//pixmapScreenShot->save("debug.png");
//printf("In [%s::%s] Line: %d x,y,w,h [%d,%d,%d,%d] pixels = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,x,y,w,h,pixmapScreenShot->getPixelByteCount());
// now our picked screen pixel color is stored in pixel[3]
// so we search through our object list looking for the object that was selected
map<int,bool> modelAlreadyPickedList; map<int,bool> modelAlreadyPickedList;
map<unsigned char,map<unsigned char, map<unsigned char,bool> > > colorAlreadyPickedList; map<unsigned char,map<unsigned char, map<unsigned char,bool> > > colorAlreadyPickedList;
int skipSteps=4; int skipSteps=4;
unsigned char *oldpixel = &pixelBuffer[0]; unsigned char *oldpixel = &pixelBuffer[0];
for(int hh = 0; hh <= h && pickedModels.size() < rendererModels.size(); hh=hh+skipSteps) {
for(int ww=0;ww <= w && pickedModels.size() < rendererModels.size(); ww=ww+skipSteps){ // now we check the screenshot if we find pixels in color of unit identity
// to speedup we only check every "skipSteps" line and pixel in a row if we find such a color.
// this is exact enough for MG purpose
for(int hh = 0; hh < h && pickedModels.size() < rendererModels.size(); hh=hh+skipSteps) {
for(int ww=0;ww < w && pickedModels.size() < rendererModels.size(); ww=ww+skipSteps){
int index = (hh*w+ww) * COLOR_COMPONENTS; int index = (hh*w+ww) * COLOR_COMPONENTS;
unsigned char *pixel = &pixelBuffer[index]; unsigned char *pixel = &pixelBuffer[index];
if(pixel[3]==0) continue; //printf("pixel[0]=%d pixel[1]=%d pixel[2]=%d\n",pixel[0],pixel[1],pixel[2]);
if(index>0) if(pixel[0]==0 && pixel[1]==0 && pixel[2]==0)
{ {
oldpixel = &pixelBuffer[index-1*COLOR_COMPONENTS]; continue;
if(memcmp(pixel,oldpixel,4)) continue;
} }
// if(index>0)
// {
// oldpixel = &pixelBuffer[index-1*COLOR_COMPONENTS];
// if(memcmp(pixel,oldpixel,3)) continue;
// }
// Skip duplicate scanned colors // Skip duplicate scanned colors
map<unsigned char,map<unsigned char, map<unsigned char,bool> > >::const_iterator iterFind1 = colorAlreadyPickedList.find(pixel[0]); map<unsigned char,map<unsigned char, map<unsigned char,bool> > >::const_iterator iterFind1 = colorAlreadyPickedList.find(pixel[0]);