FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added callbacks to allow users to modify the underlying functionality of

Browse Source 
LOD, Billboard and Drawabel objects.
This commit is contained in:
Robert Osfield
2002-02-07 01:07:11 +00:00
parent a4ea331f3a
commit b00d103f4e
6 changed files with 134 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/osg/Billboard.cpp
View File

@@ -19,6 +19,7 @@ Billboard::Billboard(const Billboard& billboard,const CopyOp& copyop):
_mode(billboard._mode),
_axis(billboard._axis),
_positionList(billboard._positionList),
_computeBillboardCallback(_computeBillboardCallback),
_cachedMode(billboard._cachedMode) {}
Billboard::~Billboard()
@@ -97,90 +98,32 @@ const bool Billboard::removeDrawable( Drawable *gset )
return false;
}
void Billboard::calcTransform(const Vec3& eye_local, const Vec3& /*up_local*/, const Vec3& pos_local, Matrix& mat) const
void Billboard::computeMatrix(Matrix& matrix, const Vec3& eye_local, const Vec3& /*up_local*/, const Vec3& pos_local) const
{
Vec3 ev(pos_local-eye_local);
switch(_cachedMode)
{
case(AXIAL_ROT_Z_AXIS):
case(AXIAL_ROT): // need to implement
case(AXIAL_ROT_Z_AXIS): // need to implement
case(AXIAL_ROT_Y_AXIS): // need to implement
case(AXIAL_ROT_X_AXIS): // implemented correctly..
{
ev.z() = 0.0f;
float ev_length = ev.length();
if (ev_length>0.0f)
{
mat.makeIdentity();
matrix.makeIdentity();
//float rotation_zrotation_z = atan2f(ev.x(),ev.y());
//mat.makeRotate(inRadians(rotation_z),0.0f,0.0f,1.0f);
float inv = 1.0f/ev_length;
float c = ev.y()*inv;
float s = ev.x()*inv;
mat(0,0) = c;
mat(0,1) = -s;
mat(1,0) = s;
mat(1,1) = c;
}
break;
}
case(AXIAL_ROT_Y_AXIS):
{
ev.z() = 0.0f;
float ev_length = ev.length();
if (ev_length>0.0f)
{
mat.makeIdentity();
//float rotation_zrotation_z = atan2f(ev.x(),ev.y());
//mat.makeRotate(inRadians(rotation_z),0.0f,0.0f,1.0f);
float inv = 1.0f/ev_length;
float c = ev.y()*inv;
float s = ev.x()*inv;
mat(0,0) = c;
mat(0,1) = -s;
mat(1,0) = s;
mat(1,1) = c;
}
break;
}
case(AXIAL_ROT_X_AXIS):
{
ev.z() = 0.0f;
float ev_length = ev.length();
if (ev_length>0.0f)
{
mat.makeIdentity();
//float rotation_zrotation_z = atan2f(ev.x(),ev.y());
//mat.makeRotate(inRadians(rotation_z),0.0f,0.0f,1.0f);
float inv = 1.0f/ev_length;
float c = ev.y()*inv;
float s = ev.x()*inv;
mat(0,0) = c;
mat(0,1) = -s;
mat(1,0) = s;
mat(1,1) = c;
}
break;
}
case(AXIAL_ROT):
{
ev.z() = 0.0f;
float ev_length = ev.length();
if (ev_length>0.0f)
{
mat.makeIdentity();
//float rotation_zrotation_z = atan2f(ev.x(),ev.y());
//mat.makeRotate(inRadians(rotation_z),0.0f,0.0f,1.0f);
float inv = 1.0f/ev_length;
float c = ev.y()*inv;
float s = ev.x()*inv;
mat(0,0) = c;
mat(0,1) = -s;
mat(1,0) = s;
mat(1,1) = c;
matrix(0,0) = c;
matrix(0,1) = -s;
matrix(1,0) = s;
matrix(1,1) = c;
}
break;
}
@@ -209,14 +152,14 @@ void Billboard::calcTransform(const Vec3& eye_local, const Vec3& /*up_local*/, c
cp /= cp_len;
float rotation_cp = acosf(dot);
mat.makeRotate(-inRadians(rotation_cp),cp[0],cp[1],cp[2]);
matrix.makeRotate(-inRadians(rotation_cp),cp[0],cp[1],cp[2]);
}
}
break;
}
}
mat.setTrans(pos_local);
matrix.setTrans(pos_local);
}

10
src/osg/Drawable.cpp
View File

@@ -24,6 +24,16 @@ Drawable::Drawable()
}
Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
Object(drawable,copyop),
_dstate(copyop(drawable._dstate.get())),
_supportsDisplayList(drawable._supportsDisplayList),
_useDisplayList(drawable._useDisplayList),
_globjList(drawable._globjList),
_bbox(drawable._bbox),
_bbox_computed(drawable._bbox_computed),
_drawCallback(drawable._drawCallback)
{}
Drawable::~Drawable()
{

2
src/osg/LOD.cpp
View File

@@ -39,7 +39,7 @@ void LOD::setRange(const unsigned int index, const float range)
}
const int LOD::evaluate(const Vec3& eye_local, const float bias) const
const int LOD::evaluateLODChild(const Vec3& eye_local, const float bias) const
{
// For cache coherency, use _rangeList2 exclusively
if (_rangeList2.empty()) return -1;