iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Merge pull request 'ssggraph: Remove car deformations' (#40) from rm-deformations into main

Browse source 
Reviewed-on: speed-dreams/speed-dreams-code#40
This commit is contained in:
Xavier Del Campo Romero 2025-01-28 17:25:40 +01:00
commit 5cf9c09950
3 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/modules/graphic/ssggraph/grcar.cpp
View file

@ -753,61 +753,6 @@ grInitShadow(tCarElt *car)
} }
} }
void
grPropagateDamage (ssgEntity* l, const sgVec3 &poc, const sgVec3 &force, int cnt)
{
//showEntityType (l);
if (l->isAKindOf (ssgTypeBranch()))
{
ssgBranch* br = (ssgBranch*) l;
for (int i = 0 ; i < br -> getNumKids () ; i++ )
{
ssgEntity* ln = br->getKid (i);
grPropagateDamage(ln, poc, force, cnt+1);
}
}
if (l->isAKindOf (ssgTypeVtxTable()))
{
sgVec3* v;
int Nv;
ssgVtxTable* vt = (ssgVtxTable*) l;
Nv = vt->getNumVertices();
vt->getVertexList ((void**) &v);
tdble sigma = sgLengthVec3 (force);
tdble invSigma = 5.0;
// if (sigma < 0.1)
// invSigma = 10.0;
// else
// invSigma = 1.0/sigma;
for (int i=0; i<Nv; i++) {
tdble r = sgDistanceSquaredVec3 (poc, v[i]);
tdble f = exp(-r*invSigma)*5.0;
v[i][0] += force[0]*f;
v[i][1] += force[1]*f;
// use sigma as a random number generator (!)
v[i][2] += (force[2]+0.02*sin(2.0*r + 10.0*sigma))*f;
//printf ("(%f %f %f)\n", v[i][0], v[i][1], v[i][2]);
}
}
}
void
grPropagateDamage (tSituation *s)
{
for (int i = 0; i < s->_ncars; i++)
{
tCarElt* car = s->cars[i];
tCollisionState* collision_state = &car->priv.collision_state;
if (collision_state->collision_count > 0)
{
grPropagateDamage(grCarInfo[car->index].carEntity,
collision_state->pos, collision_state->force, 0);
}
}
}
void void
grPreInitCar(tCarElt *car) grPreInitCar(tCarElt *car)
{ {

2
src/modules/graphic/ssggraph/grcar.h
View file

@ -117,8 +117,6 @@ extern void grInitShadow(tCarElt *car);
extern void grInitCar(tCarElt *car); extern void grInitCar(tCarElt *car);
extern void grDrawCar(tSituation *, tCarElt*, tCarElt *, int, int, double curTime, class cGrPerspCamera *curCam); extern void grDrawCar(tSituation *, tCarElt*, tCarElt *, int, int, double curTime, class cGrPerspCamera *curCam);
extern void grInitCommonState(void); extern void grInitCommonState(void);
//extern void grPropagateDamage (ssgEntity* l, sgVec3 poc, sgVec3 force, int cnt);
extern void grPropagateDamage (tSituation *);
extern void grDrawCarShadow(void); extern void grDrawCarShadow(void);
extern bool grShadowStatic; extern bool grShadowStatic;

11
src/modules/graphic/ssggraph/grmain.cpp
View file

@ -754,11 +754,6 @@ refresh(tSituation *s)
TRACE_GL("refresh: start"); TRACE_GL("refresh: start");
// Moved car collision damage propagation from grcar::grDrawCar.
// Because it has to be done only once per graphics update, whereas grDrawCar
// is called once for each car and for each screen.
grPropagateDamage(s);
// Update sky if dynamic time enabled. // Update sky if dynamic time enabled.
grUpdateSky(s->currentTime, s->accelTime); grUpdateSky(s->currentTime, s->accelTime);
@ -993,10 +988,4 @@ shutdownView(void)
} }
} }
//void SsgGraph::bendCar(int index, sgVec3 poc, sgVec3 force, int count)
//{
// if (grCarInfo)
// grPropagateDamage (grCarInfo[index].carEntity, poc, force, count);
//}
} // namespace ssggraph } // namespace ssggraph