Updates for IRIX build, and docs updates.

This commit is contained in:
Robert Osfield
2002-02-12 22:51:18 +00:00
parent 18d1365a22
commit 3ef8e4b0dd
7 changed files with 25 additions and 37 deletions

View File

@@ -395,13 +395,14 @@ void Camera::setLookAt(const double eyeX, const double eyeY, const double eyeZ,
* note, does not affect any ModelTransforms that are applied.*/
void Camera::transformLookAt(const Matrix& matrix)
{
// cout << "transformLookAt"<<matrix<<std::endl;
_up = (_up+_eye)*matrix;
_eye = _eye*matrix;
_center = _center*matrix;
_up -= _eye;
_up.normalize();
_lookAtType=USE_EYE_CENTER_AND_UP;
_dirty = true;
}

View File

@@ -91,6 +91,7 @@ void Registry::readCommandLine(std::vector<std::string>& commandLine)
if (itr!=commandLine.end())
{
loadLibrary(*itr);
++itr;
}
commandLine.erase(start,itr);
found = true;
@@ -112,6 +113,7 @@ void Registry::readCommandLine(std::vector<std::string>& commandLine)
{
std::string libName = osgDB::Registry::instance()->createLibraryNameForExt(*itr);
loadLibrary(libName);
++itr;
}
commandLine.erase(start,itr);
found = true;

View File

@@ -44,10 +44,6 @@ class DynGeoSet : public osg::GeoSet
public:
DynGeoSet();
virtual osg::Object* clone() const { return new DynGeoSet(); }
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const DynGeoSet*>(obj)!=NULL; }
virtual const char* className() const { return "GeoSet"; }
int compare(const DynGeoSet& rhs) const
{

View File

@@ -1,6 +1,5 @@
#!smake
SHELL = /bin/sh
OSGHOME = $(shell cd ../../..; pwd)
include $(OSGHOME)/Make/makedefs

View File

@@ -177,6 +177,7 @@ void SceneView::cull()
// take a copy of camera, and init it home
osg::Camera* camera = new Camera(*_camera);
camera->home();
camera->attachTransform(osg::Camera::NO_ATTACHED_TRANSFORM);
_cullVisitor->setLODBias(_lodBias);
@@ -281,7 +282,7 @@ void SceneView::cull()
_far_plane = 1000.0f;
}
_camera->setNearFar(_near_plane,_far_plane);
camera->setNearFar(_near_plane,_far_plane);
}
}