Added support for osg::State::s/getInitialViewMatrix();
Added slideshow3D examples to the runexamples.bat. Fixed DatabasePager to work with the latest OpenThreads.
This commit is contained in:
@@ -23,6 +23,7 @@ State::State()
|
||||
{
|
||||
_contextID = 0;
|
||||
_identity = new osg::RefMatrix(); // default RefMatrix constructs to identity.
|
||||
_initialViewMatrix = _identity;
|
||||
_projection = _identity;
|
||||
_modelView = _identity;
|
||||
|
||||
|
||||
@@ -260,14 +260,8 @@ void DatabasePager::run()
|
||||
|
||||
}
|
||||
|
||||
// // hack hack hack... sleep for 1ms so we give other threads a chance..
|
||||
// #ifdef WIN32
|
||||
// Sleep(1);
|
||||
// #else
|
||||
// usleep(1000);
|
||||
// #endif
|
||||
|
||||
yield();
|
||||
// go to sleep till our the next time our thread gets scheduled.
|
||||
Yield();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -553,6 +553,7 @@ void SceneView::draw()
|
||||
//osg::Timer_t tend = timer.tick();
|
||||
//std::cout<<"time to flush rendering objects"<<timer.delta_m(tstart,tend)<<std::endl;
|
||||
|
||||
if (_viewMatrix.valid()) _state->setInitialViewMatrix(_viewMatrix.get());
|
||||
|
||||
RenderLeaf* previous = NULL;
|
||||
if (_displaySettings.valid() && _displaySettings->getStereo())
|
||||
|
||||
Reference in New Issue
Block a user