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

Replaced use of observer_ptr<> with straight C pointer to avoid thrashing of an observer_ptr<> every frame.

Browse Source 
Changed include to point to new Observer header
This commit is contained in:
Robert Osfield 2010-02-18 21:18:49 +00:00
parent 649319ccaa
commit 6196652ef0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/RenderInfo
View File

@ -53,8 +53,8 @@ public:
const State* getState() const { return _state.get(); } const State* getState() const { return _state.get(); }
void setView(View* view) { _view = view; } void setView(View* view) { _view = view; }
View* getView() { return _view.get(); } View* getView() { return _view; }
const View* getView() const { return _view.get(); } const View* getView() const { return _view; }
void pushCamera(Camera* camera) { _cameras.push_back(camera); } void pushCamera(Camera* camera) { _cameras.push_back(camera); }
void popCamera() { if (!_cameras.empty()) _cameras.pop_back(); } void popCamera() { if (!_cameras.empty()) _cameras.pop_back(); }
@ -70,7 +70,7 @@ protected:
typedef std::vector<Camera*> Cameras; typedef std::vector<Camera*> Cameras;
ref_ptr<State> _state; ref_ptr<State> _state;
observer_ptr<View> _view; View* _view;
Cameras _cameras; Cameras _cameras;
ref_ptr<Referenced> _userData; ref_ptr<Referenced> _userData;
}; };

2
include/osg/State
View File

@ -19,7 +19,7 @@
#include <osg/Matrix> #include <osg/Matrix>
#include <osg/Uniform> #include <osg/Uniform>
#include <osg/BufferObject> #include <osg/BufferObject>
#include <osg/observer_ptr> #include <osg/Observer>
#include <osg/FrameStamp> #include <osg/FrameStamp>
#include <osg/DisplaySettings> #include <osg/DisplaySettings>