FGFS-4.1/OpenSceneGraph
4
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make/makedefs.freebsd
View File

@ -32,6 +32,7 @@ TARGET_DIRS = \
/usr/include/osgDB \
/usr/include/osgGLUT \
/usr/include/osgUtil \
/usr/include/osgText \
/usr/share/OpenSceneGraph\
/usr/share/OpenSceneGraph/data\
/usr/share/OpenSceneGraph/data/Images\

1
Make/makedefs.irix.nonstd
View File

@ -34,6 +34,7 @@ TARGET_DIRS = \
/usr/include/osgDB \
/usr/include/osgGLUT \
/usr/include/osgUtil \
/usr/include/osgText \
/usr/share/OpenSceneGraph\
/usr/share/OpenSceneGraph/data\
/usr/share/OpenSceneGraph/data/Images\

1
Make/makedefs.irix.std
View File

@ -34,6 +34,7 @@ TARGET_DIRS = \
/usr/include/osgDB \
/usr/include/osgGLUT \
/usr/include/osgUtil \
/usr/include/osgText \
/usr/share/OpenSceneGraph\
/usr/share/OpenSceneGraph/data\
/usr/share/OpenSceneGraph/data/Images\

1
Make/makedefs.linux
View File

@ -34,6 +34,7 @@ TARGET_DIRS = \
/usr/include/osgDB \
/usr/include/osgGLUT \
/usr/include/osgUtil \
/usr/include/osgText \
/usr/share/OpenSceneGraph\
/usr/share/OpenSceneGraph/data\
/usr/share/OpenSceneGraph/data/Images\

1
Make/makedefs.macosx
View File

@ -34,6 +34,7 @@ TARGET_DIRS = \
/usr/include/osgDB \
/usr/include/osgGLUT \
/usr/include/osgUtil \
/usr/include/osgText \
/usr/share/OpenSceneGraph\
/usr/share/OpenSceneGraph/data\
/usr/share/OpenSceneGraph/data/Images\

2
Makefile
View File

@ -122,11 +122,13 @@ instcheck :
diff -q include/osg/ /usr/include/osg/
diff -q include/osgUtil/ /usr/include/osgUtil/
diff -q include/osgDB/ /usr/include/osgDB/
diff -q include/osgText/ /usr/include/osgText/
diff -q include/osgGLUT/ /usr/include/osgGLUT/
diff -q lib/libosg.so /usr/lib/libosg.so
diff -q lib/libosgUtil.so /usr/lib/libosgUtil.so
diff -q lib/libosgDB.so /usr/lib/libosgDB.so
diff -q lib/libosgGLUT.so /usr/lib/libosgGLUT.so
diff -q lib/libosgText.so /usr/lib/libosgText.so
diff -q lib/osgPlugins/ /usr/lib/osgPlugins/
stats :

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; }

35
include/osgText/Text
View File

@ -36,11 +36,9 @@ class FTFont;
namespace osgText {
using namespace osg;
///////////////////////////////////////////////////////////////////////////////
// Font - FontBaseClass
class OSGTEXT_EXPORT Font:public Object
class OSGTEXT_EXPORT Font : public osg::Object
{
public:
@ -232,7 +230,7 @@ protected:
///////////////////////////////////////////////////////////////////////////////
// Text
class OSGTEXT_EXPORT Text:public Drawable
class OSGTEXT_EXPORT Text:public osg::Drawable
{
public:
@ -270,31 +268,32 @@ public:
META_Object(Text);
void setPosition(const Vec3& pos);
void setPosition(const Vec2& pos);
void setPosition(const osg::Vec2& pos);
void setPosition(const osg::Vec3& pos);
const osg::Vec3& getPosition() const { return _pos; }
void setDrawMode(int mode) { _drawMode=mode; }
int getDrawMode(void) { return _drawMode; }
int getDrawMode() const { return _drawMode; }
void setBoundingBox(int mode);
int getBoundingBox(void) { return _boundingBoxType; }
int getBoundingBox() const { return _boundingBoxType; }
void setAlignement(int alignement);
int getAlignement(void) { return _alignement; }
int getAlignement() const { return _alignement; }
void setFont(Font* font);
Font* getFont(void);
Font* getFont() { return _font.get(); }
const Font* getFont() const { return _font.get(); }
void setText(const char* text) { _text=text; }
void setText(const std::string& text) { _text=text; }
const std::string& getText() const { return _text; }
virtual void drawImmediateMode(State& state);
virtual void drawImmediateMode(osg::State& state);
virtual void drawBoundingBox(void);
virtual void drawAlignement(void);
const Vec3& getPosition() { return _pos; }
const Vec3& getAlignementPos() { return _alignementPos; };
const osg::Vec3& getAlignementPos() const { return _alignementPos; };
protected:
@ -313,11 +312,11 @@ protected:
virtual void setDefaults(void);
virtual const bool computeBound(void) const;
virtual void calcBounds(Vec3* min,Vec3* max) const;
void initAlignement(Vec3* min,Vec3* max);
virtual void calcBounds(osg::Vec3* min,osg::Vec3* max) const;
void initAlignement(osg::Vec3* min,osg::Vec3* max);
bool initAlignement(void);
ref_ptr<Font> _font;
osg::ref_ptr<Font> _font;
bool _init;
bool _initAlignement;
@ -327,8 +326,8 @@ protected:
int _drawMode;
int _boundingBoxType;
Vec3 _pos;
Vec3 _alignementPos;
osg::Vec3 _pos;
osg::Vec3 _alignementPos;
};
// Text
///////////////////////////////////////////////////////////////////////////////

2
src/Demos/Makefile
View File

@ -1,7 +1,7 @@
#!smake
SHELL=/bin/sh
DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide osgcluster
DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews osgtext hangglide osgcluster
all :
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

3
src/Makefile
View File

@ -2,7 +2,7 @@
SHELL=/bin/sh
DIRS = osg osgDB osgUtil osgGLUT Demos osgPlugins
DIRS = osg osgDB osgUtil osgText osgGLUT Demos osgPlugins
all :
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
@ -21,6 +21,7 @@ docs :
(cd osgUtil; $(MAKE) docs; )
(cd osgDB; $(MAKE) docs; )
(cd osgGLUT; $(MAKE) docs; )
(cd osgText; $(MAKE) docs; )
to_unix :
for f in $(DIRS) ; do cd $$f; to_unix Makefile Makefile; cd ..; done

1
src/osg/Makefile
View File

@ -77,6 +77,7 @@ TARGET_INCLUDE_FILES = \
osg/FrontFace\
osg/GL\
osg/GLExtensions\
osg/GLU\
osg/GeoSet\
osg/Geode\
osg/Group\

2
src/osgGLUT/Makefile
View File

@ -22,6 +22,8 @@ TARGET_INCLUDE_FILES = \
osgGLUT/Version\
osgGLUT/Window\
osgGLUT/Viewer\
osgGLUT/glut\
C++FLAGS += -I ../../include

30
src/osgText/Text.cpp
View File

@ -25,6 +25,7 @@
#include "FTGLTextureFont.h"
using namespace osg;
using namespace osgText;
// define the default paths to look for fonts.
@ -356,6 +357,32 @@ Text::
{
}
void Text::setFont(Font* font)
{
if (_font==font) return;
if(font && font->isOk())
{
_init=true;
_font=font;
if(dynamic_cast<PolygonFont*>(_font.get()))
_fontType=POLYGON;
else if(dynamic_cast<BitmapFont*>(_font.get()))
_fontType=BITMAP;
else if(dynamic_cast<PixmapFont*>(_font.get()))
_fontType=PIXMAP;
else if(dynamic_cast<TextureFont*>(_font.get()))
_fontType=TEXTURE;
else if(dynamic_cast<OutlineFont*>(_font.get()))
_fontType=OUTLINE;
_initAlignement = false;
dirtyBound();
}
}
void Text::
setDefaults()
{
@ -415,8 +442,7 @@ computeBound() const
return true;
}
void Text::
drawImmediateMode(State& state)
void Text::drawImmediateMode(State& state)
{
if(!_init)
return;