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

Updates to Makefiles to include osgText.

Browse Source 
Also a couple of undefined methods in osgText::Text have been added.
This commit is contained in:
Robert Osfield
2001-11-02 20:11:37 +00:00
parent 42faf78b47
commit 06abf2266b
15 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Matrix
View File

@@ -293,7 +293,7 @@ inline ostream& operator<< (ostream& os, const Matrix& m )
for(int row=0; row<4; ++row) {
os << "\t";
for(int col=0; col<4; ++col)
os << m(col,row) << " ";
os << m(row,col) << " ";
os << endl;
}
os << "}" << endl;

6
include/osg/Node
View File

@@ -24,10 +24,10 @@ class Group;
* and accept methods. Use when subclassing from Node to make it
* more convinient to define the required pure virtual methods.*/
#define META_Node(name) \
virtual Object* clone() const { return new name (); } \
virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const name *>(obj)!=NULL; } \
virtual osg::Object* clone() const { return new name (); } \
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const name *>(obj)!=NULL; } \
virtual const char* className() const { return #name; } \
virtual void accept(NodeVisitor& nv) { if (nv.validNodeMask(*this)) nv.apply(*this); } \
virtual void accept(osg::NodeVisitor& nv) { if (nv.validNodeMask(*this)) nv.apply(*this); } \
/** Base class for all internal nodes in the scene graph.

4
include/osg/Object
View File

@@ -14,8 +14,8 @@ namespace osg {
* the standard pure virtual clone, isSameKindAs and className methods
* which are required for all Object subclasses.*/
#define META_Object(name) \
virtual Object* clone() const { return new name (); } \
virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const name *>(obj)!=NULL; } \
virtual osg::Object* clone() const { return new name (); } \
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const name *>(obj)!=NULL; } \
virtual const char* className() const { return #name; }