void PrintPlane (plane_t *p)
{
- Sys_Printf ("(%5.2f, %5.2f, %5.2f) : %5.2f\n", p->normal[0], p->normal[1],
+ Sys_Printf ("(%5.2f, %5.2f, %5.2f) : %5.2f\n", p->normal[0], p->normal[1],
p->normal[2], p->dist);
}
int bestaxis;
float dot,best;
int i;
-
+
best = 0;
bestaxis = 0;
-
+
for (i=0 ; i<6 ; i++)
{
dot = DotProduct (pln->normal, baseaxis[i*3]);
bestaxis = i;
}
}
-
+
VectorCopy (baseaxis[bestaxis*3+1], xv);
VectorCopy (baseaxis[bestaxis*3+2], yv);
}
{
//return ShadeForNormal(p->normal);
-
+
int i;
float f;
// other
f= (lightaxis[0] + lightaxis[1] + lightaxis[2]) / 3;
return f;
-
+
}
vec3_t vecs[2];
f->texdef.shift[0] -= vShift[0] / f->texdef.scale[0];
f->texdef.shift[1] -= vShift[1] / f->texdef.scale[1];
-
+
// clamp the shifts
Clamp(f->texdef.shift[0], f->d_texture->width);
Clamp(f->texdef.shift[1], f->d_texture->height);
================
*/
/*!\todo Replace all face_t::d_texture access with face_t::pShader::GetTexture.*/
-void Face_SetColor (brush_t *b, face_t *f, float fCurveColor)
+void Face_SetColor (brush_t *b, face_t *f, float fCurveColor)
{
// set shading for face
f->d_shade = SetShadeForPlane (&f->plane);
else if (td->rotate == 270)
{ sinv = -1 ; cosv = 0; }
else
- {
+ {
ang = td->rotate / 180 * Q_PI;
sinv = sin(ang);
cosv = cos(ang);
sv = 1;
else
sv = 2;
-
+
if (pvecs[1][0])
tv = 0;
else if (pvecs[1][1])
tv = 1;
else
tv = 2;
-
+
for (i=0 ; i<2 ; i++) {
ns = cosv * pvecs[i][sv] - sinv * pvecs[i][tv];
nt = sinv * pvecs[i][sv] + cosv * pvecs[i][tv];
}
}
+long double HighestImpactSign (long double a, long double b)
+{
+ // returns the sign of the value with larger abs
+ if (a + b > 0)
+ return +1;
+ else
+ return -1;
+}
+
+void Face_TexdefFromTextureVectors (face_t *f, long double STfromXYZ[2][4], vec3_t pvecs[2], int sv, int tv)
+{
+ texdef_t *td;
+ qtexture_t *q;
+ int j;
+ long double ang;
+
+ td = &f->texdef;
+ q = f->d_texture;
+
+ // undo the texture transform
+ for (j=0 ; j<4 ; j++) {
+ STfromXYZ[0][j] *= q->width;
+ STfromXYZ[1][j] *= q->height;
+ }
+
+ // shift
+ td->shift[0] = STfromXYZ[0][3];
+ td->shift[1] = STfromXYZ[1][3];
+
+ /**
+ * SOLVE:
+ * STfromXYZ[0][sv] = (cosv * pvecs[0][sv] - sinv * pvecs[0][tv]) / td->scale[0];
+ * STfromXYZ[0][tv] = (sinv * pvecs[0][sv] + cosv * pvecs[0][tv]) / td->scale[0];
+ * STfromXYZ[1][sv] = (cosv * pvecs[1][sv] - sinv * pvecs[1][tv]) / td->scale[1];
+ * STfromXYZ[1][tv] = (sinv * pvecs[1][sv] + cosv * pvecs[1][tv]) / td->scale[1];
+ * FOR:
+ * sinv, cosv, td->scale[0], td->scale[1]
+ * WE KNOW:
+ * sinv^2 + cosv^2 = 1
+ * pvecs[0][sv] is +/-1
+ * pvecs[0][tv] is 0
+ * pvecs[1][sv] is 0
+ * pvecs[1][tv] is +/-1
+ * THUS:
+ * STfromXYZ[0][sv] = +cosv * pvecs[0][sv] / td->scale[0];
+ * STfromXYZ[0][tv] = +sinv * pvecs[0][sv] / td->scale[0];
+ * STfromXYZ[1][sv] = -sinv * pvecs[1][tv] / td->scale[1];
+ * STfromXYZ[1][tv] = +cosv * pvecs[1][tv] / td->scale[1];
+ */
+
+ td->scale[0] = sqrt(STfromXYZ[0][sv]*STfromXYZ[0][sv] + STfromXYZ[0][tv]*STfromXYZ[0][tv]);
+ td->scale[1] = sqrt(STfromXYZ[1][sv]*STfromXYZ[1][sv] + STfromXYZ[1][tv]*STfromXYZ[1][tv]);
+
+ if (td->scale[0])
+ td->scale[0] = 1 / td->scale[0]; // avoid NaNs
+ if (td->scale[1])
+ td->scale[1] = 1 / td->scale[1];
+
+ long double sign0tv = (STfromXYZ[0][tv] > 0) ? +1 : -1;
+ ang = atan2( sign0tv * STfromXYZ[0][tv], sign0tv * STfromXYZ[0][sv]); // atan2(y, x) with y positive is in [0, PI[
+
+ // STOP
+ // We have until now ignored the fact that td->scale[0] or td->scale[1] may
+ // have either sign (+ or -). Due to roundoff errors, our choice of
+ // sign0tv may even have been wrong in a sense.
+ // sign0tv may NOT indicate the appropriate sign for td->scale[0] (namely,
+ // if cosv is near zero)!
+ // let's look at the signs again
+ // sign0sv = signcosv * pvecs[0][sv] / td->scale[0]sign
+ // sign0tv = pvecs[0][sv] / td->scale[0]sign
+ // sign1sv = -1 * pvecs[1][tv] / td->scale[1]sign
+ // sign1tv = signcosv * pvecs[1][tv] / td->scale[1]sign
+ // -->
+ // td->scale[1]sign = sign1tv * signcosv * pvecs[1][tv]
+ // td->scale[1]sign = -sign1sv * signsinv * pvecs[1][tv]
+ // td->scale[0]sign = sign0tv * signsinv * pvecs[0][sv]
+ // td->scale[0]sign = sign0sv * signcosv * pvecs[0][sv]
+ // which to choose?
+ // the one with the larger impact on the original texcoords, of course
+ // to minimize the effect of roundoff errors that may flip the signs!
+
+ td->scale[0] *= HighestImpactSign(STfromXYZ[0][tv] * +sin(ang), STfromXYZ[0][sv] * cos(ang)) * pvecs[0][sv];
+ td->scale[1] *= HighestImpactSign(STfromXYZ[1][sv] * -sin(ang), STfromXYZ[1][tv] * cos(ang)) * pvecs[1][tv];
+
+ td->rotate = ang * 180 / Q_PI; // FIXME possibly snap this to 0/90/180 (270 can't happen)?
+}
+
+
/*
================
Face_MakePlane
t2[j] = f->planepts[2][j] - f->planepts[1][j];
t3[j] = f->planepts[1][j];
}
-
+
CrossProduct(t1,t2, f->plane.normal);
if (VectorCompare (f->plane.normal, vec3_origin))
Sys_FPrintf (SYS_WRN, "WARNING: brush plane with no normal\n");
xyzst[4] = DotProduct (xyzst, STfromXYZ[1]) + STfromXYZ[1][3];
}
+long double SarrusDetScalar(long double a1, long double b1, long double c1, long double a2, long double b2, long double c2, long double a3, long double b3, long double c3)
+{
+ return a1 * b2 * c3 + a2 * b3 * c1 + a3 * b1 * c2
+ - a1 * c2 * b3 - a2 * c3 * b1 - a3 * c1 * b2;
+}
+
+void SarrusSolve(long double a1, long double b1, long double c1, long double d1, long double a2, long double b2, long double c2, long double d2, long double a3, long double b3, long double c3, long double d3, long double *a, long double *b, long double *c)
+{
+ long double det;
+ det = SarrusDetScalar(a1, b1, c1,
+ a2, b2, c2,
+ a3, b3, c3);
+ *a = SarrusDetScalar(d1, b1, c1,
+ d2, b2, c2,
+ d3, b3, c3) / det;
+ *b = SarrusDetScalar(a1, d1, c1,
+ a2, d2, c2,
+ a3, d3, c3) / det;
+ *c = SarrusDetScalar(a1, b1, d1,
+ a2, b2, d2,
+ a3, b3, d3) / det;
+}
+
+void Face_TexdefFromTextureCoordinates ( float *xyzst1, float *xyzst2, float *xyzst3, qtexture_t *q, face_t *f)
+{
+ vec3_t pvecs[2];
+ int sv, tv, uv;
+
+ long double STfromXYZ[2][4];
+
+ // get natural texture axis
+ TextureAxisFromPlane(&f->plane, pvecs[0], pvecs[1]);
+
+ if (pvecs[0][0])
+ sv = 0;
+ else if (pvecs[0][1])
+ sv = 1;
+ else
+ sv = 2;
+
+ if (pvecs[1][0])
+ tv = 0;
+ else if (pvecs[1][1])
+ tv = 1;
+ else
+ tv = 2;
+
+ uv = 3 - sv - tv; // the "other one"
+
+ // find the STfromXYZ 4-vectors
+ /*
+ SARRUS-SOLVE:
+ xyzst1[3] == xyzst1[sv] * STfromXYZ[0][sv] + xyzst1[tv] * STfromXYZ[0][tv] + STfromXYZ[0][3];
+ xyzst2[3] == xyzst2[sv] * STfromXYZ[0][sv] + xyzst2[tv] * STfromXYZ[0][tv] + STfromXYZ[0][3];
+ xyzst3[3] == xyzst3[sv] * STfromXYZ[0][sv] + xyzst3[tv] * STfromXYZ[0][tv] + STfromXYZ[0][3];
+ FOR: STfromXYZ[0]
+ GIVEN: one coord of them (uv) is empty (see Face_TextureVectors)
+ SARRUS-SOLVE:
+ xyzst1[4] == xyzst1[sv] * STfromXYZ[1][sv] + xyzst1[tv] * STfromXYZ[1][tv] + STfromXYZ[1][3];
+ xyzst2[4] == xyzst2[sv] * STfromXYZ[1][sv] + xyzst2[tv] * STfromXYZ[1][tv] + STfromXYZ[1][3];
+ xyzst3[4] == xyzst3[sv] * STfromXYZ[1][sv] + xyzst3[tv] * STfromXYZ[1][tv] + STfromXYZ[1][3];
+ FOR: STfromXYZ[1]
+ GIVEN: one coord of them (uv) is empty (see Face_TextureVectors)
+ */
+
+ STfromXYZ[0][uv] = 0;
+ SarrusSolve(
+ xyzst1[sv], xyzst1[tv], 1, xyzst1[3],
+ xyzst2[sv], xyzst2[tv], 1, xyzst2[3],
+ xyzst3[sv], xyzst3[tv], 1, xyzst3[3],
+ &STfromXYZ[0][sv], &STfromXYZ[0][tv], &STfromXYZ[0][3]
+ );
+
+ STfromXYZ[1][uv] = 0;
+ SarrusSolve(
+ xyzst1[sv], xyzst1[tv], 1, xyzst1[4],
+ xyzst2[sv], xyzst2[tv], 1, xyzst2[4],
+ xyzst3[sv], xyzst3[tv], 1, xyzst3[4],
+ &STfromXYZ[1][sv], &STfromXYZ[1][tv], &STfromXYZ[1][3]
+ );
+
+ /*
+ printf("%s\n", q->name);
+
+ printf("%f == %Lf\n", xyzst1[3], DotProduct (xyzst1, STfromXYZ[0]) + STfromXYZ[0][3]);
+ printf("%f == %Lf\n", xyzst2[3], DotProduct (xyzst2, STfromXYZ[0]) + STfromXYZ[0][3]);
+ printf("%f == %Lf\n", xyzst3[3], DotProduct (xyzst3, STfromXYZ[0]) + STfromXYZ[0][3]);
+ printf("%f == %Lf\n", xyzst1[4], DotProduct (xyzst1, STfromXYZ[1]) + STfromXYZ[1][3]);
+ printf("%f == %Lf\n", xyzst2[4], DotProduct (xyzst2, STfromXYZ[1]) + STfromXYZ[1][3]);
+ printf("%f == %Lf\n", xyzst3[4], DotProduct (xyzst3, STfromXYZ[1]) + STfromXYZ[1][3]);
+
+ float newSTfromXYZ[2][4];
+
+ printf("old: %Lf,%Lf,%Lf,%Lf %Lf,%Lf,%Lf,%Lf\n",
+ STfromXYZ[0][0], STfromXYZ[0][1], STfromXYZ[0][2], STfromXYZ[0][3],
+ STfromXYZ[1][0], STfromXYZ[1][1], STfromXYZ[1][2], STfromXYZ[1][3]);
+ */
+
+ Face_TexdefFromTextureVectors (f, STfromXYZ, pvecs, sv, tv);
+
+ /*
+ Face_TextureVectors(f, newSTfromXYZ);
+
+ printf("new: %f,%f,%f,%f %f,%f,%f,%f\n",
+ newSTfromXYZ[0][0], newSTfromXYZ[0][1], newSTfromXYZ[0][2], newSTfromXYZ[0][3],
+ newSTfromXYZ[1][0], newSTfromXYZ[1][1], newSTfromXYZ[1][2], newSTfromXYZ[1][3]);
+
+ float newxyzst1[5];
+ float newxyzst2[5];
+ float newxyzst3[5];
+ VectorCopy(xyzst1, newxyzst1);
+ VectorCopy(xyzst2, newxyzst2);
+ VectorCopy(xyzst3, newxyzst3);
+ EmitTextureCoordinates (newxyzst1, q, f);
+ EmitTextureCoordinates (newxyzst2, q, f);
+ EmitTextureCoordinates (newxyzst3, q, f);
+ printf("Face_TexdefFromTextureCoordinates: %f,%f %f,%f %f,%f -> %f,%f %f,%f %f,%f\n",
+ xyzst1[3], xyzst1[4],
+ xyzst2[3], xyzst2[4],
+ xyzst3[3], xyzst3[4],
+ newxyzst1[3], newxyzst1[4],
+ newxyzst2[3], newxyzst2[4],
+ newxyzst3[3], newxyzst3[4]);
+ // TODO why do these differ, but not the previous ones? this makes no sense whatsoever
+ */
+}
+
+
+
//==========================================================================
/*
s = sin (a/180*Q_PI);
c = cos (a/180*Q_PI);
for (i=0 ; i<3 ; i++)
- mid[i] = (b->mins[i] + b->maxs[i])*0.5;
+ mid[i] = (b->mins[i] + b->maxs[i])*0.5;
qglBegin (GL_LINE_STRIP);
qglVertex3fv (mid);
// flip the plane, because we want to keep the back side
VectorSubtract (vec3_origin,clip->plane.normal, plane.normal);
plane.dist = -clip->plane.dist;
-
+
w = Winding_Clip (w, &plane, false);
if (!w)
return w;
}
-
+
if (w->numpoints < 3)
{
free(w);
f->planepts[i][j] = floor (f->planepts[i][j] + 0.5);
}
}
-
+
/*
** Brush_Build
**
{
bool bLocalConvert;
-
+
#ifdef _DEBUG
if (!g_qeglobals.m_bBrushPrimitMode && bConvert)
Sys_Printf("Warning : conversion from brush primitive to old brush format not implemented\n");
const aabb_t *aabb = b->owner->model.pRender->GetAABB();
VectorAdd(aabb->origin, aabb->extents, b->maxs);
VectorSubtract(aabb->origin, aabb->extents, b->mins);
- }
+ }
//Patch_BuildPoints (b); // does nothing but set b->patchBrush true if the texdef contains SURF_PATCH !
}
}
-/*
+/*
=================
Brush_GetKeyValue
=================
if (strchr( fa->texdef.GetName(), ' ' ))
{
char Msg1[1024];
-
+
sprintf( Msg1, "Can't save texture with spaces in name. Rename %s\nNOTE: This message may popup several times .. once for each buggy face detected.", fa->texdef.GetName() );
-
+
Sys_Printf("%s\n", Msg1 );
gtk_MessageBox(g_pParentWnd->m_pWidget, Msg1, "Error saving map", MB_OK );
strcpy( pname, SHADER_NOT_FOUND );
// TODO: clean this detection part when bug will have disappeared
if (fa->texdef.GetName()[0] == '(')
{
- char *text = "Bug #103494 detected, dropping texture. Please report to timo@qeradiant.com if you have a way to reproduce!\nNOTE: this message may popup several times .. once for each buggy face detected.";
+ const char *text = "Bug #103494 detected, dropping texture. Please report to timo@qeradiant.com if you have a way to reproduce!\nNOTE: this message may popup several times .. once for each buggy face detected.";
Sys_Printf("%s\n", text);
gtk_MessageBox(g_pParentWnd->m_pWidget, text, "Error saving map", MB_OK );
// need to cleanup this dead face name or we may loop endlessly
}
b = Brush_Alloc();
-
+
pts[0][0][0] = mins[0];
pts[0][0][1] = mins[1];
-
+
pts[1][0][0] = mins[0];
pts[1][0][1] = maxs[1];
-
+
pts[2][0][0] = maxs[0];
pts[2][0][1] = maxs[1];
-
+
pts[3][0][0] = maxs[0];
pts[3][0][1] = mins[1];
-
+
for (i=0 ; i<4 ; i++)
{
pts[i][0][2] = mins[2];
VectorCopy (pts[i][1], f->planepts[1]);
VectorCopy (pts[i][0], f->planepts[2]);
}
-
+
f = Face_Alloc();
f->texdef = *texdef;
f->texdef.flags &= ~SURF_KEEP;
*/
void Brush_MakeSided (int sides)
{
- int i, axis;
+ int i, axis = 0;
vec3_t mins, maxs;
brush_t *b;
texdef_t *texdef;
}
b = Brush_Alloc();
-
+
// create top face
f = Face_Alloc();
f->texdef = *texdef;
//Sys_Printf("p2: %f %f %f\n",p2[0],p2[1],p2[2]);
//Sys_Printf("p3: %f %f %f\n",p3[0],p3[1],p3[2]);
//Sys_Printf("origin: %f %f %f\n",origin[0],origin[1],origin[2]);
-
+
// test ray against triangle
// get triangle plane normal
//VectorSubtract(p1, p2, v1);
// VectorSubtract(origin, p1, v2);
// CrossProduct(v1, v2, normal[2]);
//}
-
+
for (i=0; i<3; i++)
{
VectorNormalize(normal[i]);
vec3_t vRay[2];
float angle = FloatForKey (b->owner, "angle"); // FIXME: should be set when this entity key is set
-
+
VectorSubtract (origin, b->owner->origin, vRay[0]);
VectorCopy (dir, vRay[1]);
{
for (j = 0; j < 3; j++)
VectorCopy(model->pVertList[model->pTriList[i].indexes[j]].v, xyz[j]);
-
+
if (Triangle_Ray(vRay[0], vRay[1], true, xyz[0], xyz[2], xyz[1], t, u, v))
{
bIntersect = true;
Itersects a ray with a brush
Returns the face hit and the distance along the ray the intersection occured at
Returns NULL and 0 if not hit at all
-
-http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=556
==============
*/
extern bool Patch_Ray(patchMesh_t *patch, vec3_t origin, vec3_t dir, double *t, double *u, double *v);
d1 = DotProduct (p1, dir);
*dist = d1;
-
+
// new test stuff for patches
if (!g_PrefsDlg.m_bPatchBBoxSelect && b->patchBrush)
{
// IMPORTANT NOTE:
// modifications to the discarding code here should be matched in the selection code
- // see Brush_Draw
-
+ // see Brush_Draw
+
// do some last minute filtering
if (firstface && nFlags & SF_CAMERA)
{
*dist = 0;
return NULL;
}
- }
+ }
if (g_qeglobals.d_savedinfo.exclude & EXCLUDE_CLIP)
{
if (strstr(firstface->texdef.GetName(), "clip"))
{
if (b->next || b->prev)
Error ("Brush_AddToList: already linked");
-
+
if (blist == &selected_brushes || blist == &active_brushes)
{
if (b->patchBrush && blist == &selected_brushes)
blist->next->prev = b;
blist->next = b;
b->prev = blist;
-
+
// TTimo messaging
- DispatchRadiantMsg( RADIANT_SELECTION );
+ DispatchRadiantMsg( RADIANT_SELECTION );
}
void Brush_RemoveFromList (brush_t *b)
{
if (!b->next || !b->prev)
Error ("Brush_RemoveFromList: not linked");
-
+
if (b->patchBrush)
{
Patch_Deselect(b->pPatch);
SetFaceTexdef
Doesn't set the curve flags
-
+
NOTE : ( TTimo )
never trust f->d_texture here, f->texdef and f->d_texture are out of sync when called by Brush_SetTexture
use Texture_ForName() to find the right shader
FIXME : send the right shader ( qtexture_t * ) in the parameters ?
-
+
TTimo: surface plugin, added an IPluginTexdef* parameter
if not NULL, get ->Copy() of it into the face ( and remember to hook )
if NULL, ask for a default
void SetFaceTexdef (face_t *f, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale, IPluginTexdef* pPlugTexdef) {
int oldFlags;
int oldContents;
-
+
oldFlags = f->texdef.flags;
oldContents = f->texdef.contents;
ConvertTexMatWithQTexture( brushprimit_texdef, NULL, &f->brushprimit_texdef, QERApp_Shader_ForName( f->texdef.GetName() )->getTexture() );
}
else
- {
+ {
if (bFitScale)
{
f->texdef = *texdef;
f->texdef.flags = (f->texdef.flags & ~SURF_KEEP) | (oldFlags & SURF_KEEP);
f->texdef.contents = (f->texdef.contents & ~CONTENTS_KEEP) | (oldContents & CONTENTS_KEEP);
}
-
+
#ifdef _DEBUG
void Brush_SetTexture2 (brush_t *b, IShader *pShader, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale, IPluginTexdef* pTexdef)
{
- for (face_t* f = b->brush_faces ; f ; f = f->next)
+ for (face_t* f = b->brush_faces ; f ; f = f->next)
SetFaceTexdef2 (b, f, pShader, texdef, brushprimit_texdef, bFitScale, pTexdef);
Brush_Build( b );
if (b->patchBrush)
void Brush_SetTexture (brush_t *b, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale, IPluginTexdef* pTexdef)
{
- for (face_t* f = b->brush_faces ; f ; f = f->next)
+ for (face_t* f = b->brush_faces ; f ; f = f->next)
SetFaceTexdef (f, texdef, brushprimit_texdef, bFitScale, pTexdef);
Brush_Build( b );
if (b->patchBrush)
}
- // if shearing, take all the planes adjacent to
+ // if shearing, take all the planes adjacent to
// selected faces and rotate their points so the
// edge clipped by a selcted face has two of the points
if (!shear)
// any points on f will become new control points
for (i=0 ; i<w->numpoints ; i++)
{
- d = DotProduct (w->points[i], f->plane.normal)
+ d = DotProduct (w->points[i], f->plane.normal)
- f->plane.dist;
if (d > -ON_EPSILON && d < ON_EPSILON)
break;
VectorCopy (w->points[i], f2->planepts[0]);
if (++i == w->numpoints)
i = 0;
-
+
// see if the next point is also on the plane
d = DotProduct (w->points[i]
, f->plane.normal) - f->plane.dist;
continue;
Brush_SelectFaceForDragging (b, f, shear);
- }
+ }
}
bool g_bBuildWindingsNoTexBuild = false;
if (!w)
continue;
-
+
for (i=0 ; i<w->numpoints ; i++)
{
// add to bounding box
else // multiplier = gridsize / component difference, rounded up
mult[i] = (int)ceil(fabs(g_qeglobals.d_gridsize / diff[j][i]));
}
-
+
if (mult[0] > 1 && mult[1] > 1 && mult[2] > 1) // if all multipliers are greater than 1
{
n = (mult[0] >= mult[1] && mult[0] >= mult[2]) ? 0 : (mult[1] >= mult[0] && mult[1] >= mult[2]) ? 1 : 2;
qglBegin(GL_TRIANGLE_FAN);
else
qglBegin(GL_POLYGON);
-
+
for (int i=0 ; i<w->numpoints ; i++)
{
if (nGLState & DRAW_GL_TEXTURE_2D)
qglEnd();
}
+#define Q2_SURF_TRANS33 0x00000010
+#define Q2_SURF_TRANS66 0x00000020
+
void Brush_Draw(brush_t *b)
{
face_t *face;
// guarantee the texture will be set first
bool bTrans;
+ float transVal;
prev = NULL;
for (face = b->brush_faces,order = 0 ; face ; face=face->next, order++)
{
continue; // freed face
}
- bTrans = (face->pShader->getFlags() & QER_TRANS);
+ bTrans = (face->pShader->getFlags() & QER_TRANS);
+ transVal = face->pShader->getTrans();
+ // try to read the texture def surface flags to get trans
+ if (!bTrans) {
+ if (face->texdef.flags & Q2_SURF_TRANS33) {
+ bTrans = true;
+ transVal = 0.33f;
+ } else if (face->texdef.flags & Q2_SURF_TRANS66) {
+ bTrans = true;
+ transVal = 0.66f;
+ }
+ }
if (bTrans && !(nGLState & DRAW_GL_BLEND))
continue;
if (!bTrans && nGLState & DRAW_GL_BLEND)
continue;
-
+
// IMPORTANT NOTE:
// modifications to the discarding code here should be matched in the selection code
// see Brush_Ray
prev = face->d_texture;
qglBindTexture( GL_TEXTURE_2D, face->d_texture->texture_number );
}
-
+
if (nGLState & DRAW_GL_LIGHTING && !g_PrefsDlg.m_bGLLighting)
{
if (!b->owner->eclass->fixedsize)
- material[3] = face->pShader->getTrans();
+ material[3] = transVal;
else
material[3] = 1;
VectorCopy(face->d_color, material);
{
pShader = face->pShader;
VectorCopy(pShader->getTexture()->color, material);
- material[3] = identity[3] = pShader->getTrans();
+ material[3] = identity[3] = transVal;
if (nGLState & DRAW_GL_TEXTURE_2D)
qglColor4fv(identity);
else
qglColor4fv(material);
}
-
+
// draw the polygon
Brush_FaceDraw(face, nGLState);
entity_t *FindEntity(const char *pszKey, const char *pszValue)
{
entity_t *pe;
-
+
pe = entities.next;
-
+
for (; pe != NULL && pe != &entities ; pe = pe->next)
{
if (!strcmp(ValueForKey(pe, pszKey), pszValue))
Patch_DrawXY(b->pPatch);
if (!g_bPatchShowBounds)
return;
- }
+ }
if (b->owner->eclass->fixedsize)
{
if (face->plane.normal[1] >= 0) // stop axes being mirrored
continue;
}
- else
+ else
{
if (face->plane.normal[0] <= 0)
continue;
vec3_t vecs[2];
vec3_t coords[4];
texdef_t *td;
-
+
if (nHeight < 1)
nHeight = 1;
if (nWidth < 1)
nWidth = 1;
-
+
ClearBounds (mins, maxs);
-
+
w = face->face_winding;
if (!w)
{
{
AddPointToBounds( w->points[i], mins, maxs );
}
-
+
if (g_qeglobals.m_bBrushPrimitMode)
Face_FitTexture_BrushPrimit( face, mins, maxs, nHeight, nWidth );
else
{
-
+
td = &face->texdef;
//
// get the current angle
ang = td->rotate / 180 * Q_PI;
sinv = sin(ang);
cosv = cos(ang);
-
+
// get natural texture axis
TextureAxisFromPlane(&face->plane, vecs[0], vecs[1]);
-
+
min_s = DotProduct( mins, vecs[0] );
min_t = DotProduct( mins, vecs[1] );
max_s = DotProduct( maxs, vecs[0] );
rot_height = (max_t - min_t);
td->scale[0] = -(rot_width/((float)(face->d_texture->width*nWidth)));
td->scale[1] = -(rot_height/((float)(face->d_texture->height*nHeight)));
-
+
td->shift[0] = min_s/td->scale[0];
temp = (int)(td->shift[0] / (face->d_texture->width*nWidth));
temp = (temp+1)*face->d_texture->width*nWidth;
td->shift[0] = (int)(temp - td->shift[0])%(face->d_texture->width*nWidth);
-
+
td->shift[1] = min_t/td->scale[1];
temp = (int)(td->shift[1] / (face->d_texture->height*nHeight));
temp = (temp+1)*(face->d_texture->height*nHeight);
td->shift[1] = (int)(temp - td->shift[1])%(face->d_texture->height*nHeight);
-
+
td->shift[1] = min_t/td->scale[1];
temp = (int)(td->shift[1] / (face->d_texture->height*nHeight));
temp = (temp+1)*(face->d_texture->height*nHeight);
td->shift[1] = (int)(temp - td->shift[1])%(face->d_texture->height*nHeight);
-
+
}
}
{ 0, 1, 0 },
{ 1, 0, 0 },
{ 0,-1, 0 } };
-
+
unsigned short Indices[24] = { 2, 1, 5, 6,
1, 0, 4, 5,
0, 1, 2, 3,
qglVertexPointer(3, GL_FLOAT, 0, Coords); // filling the arrays
qglNormalPointer(GL_FLOAT, 0, Normals);
-
+
//glLockArraysEXT(0, count); // extension GL_EXT_compiled_vertex_array
-
+
qglDrawElements(GL_QUADS, 24, GL_UNSIGNED_SHORT, Indices);
-
+
//glUnlockArraysEXT; // extension GL_EXT_compiled_vertex_array
*/
}
projects / xonotic / netradiant.git / blobdiff