kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: making the shots pass over the shoulder (lets see if affect the gameplay... if so, we undo it)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4999 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-22 23:23:04 +00:00
parent 196c7a44b2
commit 51912a872f
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/rendermodel.cpp
+18 -10
View File
@@ -516,18 +516,10 @@ void preload_mapmodels()
}
}
VAR(dbghbox, 0, 0, 1);
VAR(dbghbox, 0, 0, 1); //FIXME remove on release
void renderhbox(playerent *d)
inline void renderhboxpart(playerent *d, vec top, vec bottom, vec up)
{
glDisable(GL_TEXTURE_2D);
glColor3f(1, 1, 1);
float y = d->yaw*RAD, p = (d->pitch/4+90)*RAD, c = cosf(p);
vec bottom(d->o), up(sinf(y)*c, -cosf(y)*c, sinf(p)), top(up);
bottom.z -= d->eyeheight;
top.mul(d->eyeheight + d->aboveeye).add(bottom);
if(d->state==CS_ALIVE && d->head.x >= 0)
{
glBegin(GL_LINE_LOOP);
@@ -575,6 +567,22 @@ void renderhbox(playerent *d)
glVertex3fv(pos.v);
}
glEnd();
}
void renderhbox(playerent *d)
{
glDisable(GL_TEXTURE_2D);
glColor3f(1, 1, 1);
float y = d->yaw*RAD, p = (d->pitch/4+90)*RAD, c = cosf(p);
vec bottom(d->o), up(sinf(y)*c, -cosf(y)*c, sinf(p)), top(up), mid(up);
bottom.z -= d->eyeheight;
float h = d->eyeheight /*+ d->aboveeye*/; // shoulder limit
mid.mul(h*0.5).add(bottom);
top.mul(h).add(bottom);
renderhboxpart(d,top,mid,up);
renderhboxpart(d,mid,bottom,up);
glEnable(GL_TEXTURE_2D);
}