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

Added proper handling of the rotation of billboards about an artbitary axis.

Browse Source 
Note, this code while mathermatically is not optimal, and will need to
reviewed in the future to optimize it.
This commit is contained in:
Robert Osfield
2004-01-23 21:47:39 +00:00
parent 2b9707cdfe
commit e247b11861
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/Billboard.cpp
View File

@@ -73,7 +73,7 @@ void Billboard::updateCache()
else _cachedMode = _mode;
_side = _axis^_normal;
_side.normalize();
_side.normalize();
}
bool Billboard::addDrawable(Drawable *gset)
@@ -140,8 +140,6 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
float ev_length = ev.length();
if (ev_length>0.0f)
{
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;
@@ -160,8 +158,6 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
float ev_length = ev.length();
if (ev_length>0.0f)
{
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;
@@ -181,7 +177,6 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
if (ev_length>0.0f)
{
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;
@@ -195,6 +190,13 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
break;
}
case(AXIAL_ROT): // need to implement
{
float ev_side = ev*_side;
float ev_normal = ev*_normal;
float rotation = atan2f(ev_side,ev_normal);
matrix.makeRotate(rotation,_axis);
break;
}
case(POINT_ROT_WORLD):
case(POINT_ROT_EYE):
{