Changed a couple of const/non-const discrpancies between header and source
for TexGen. Removed external library dependencies in plugin makefiles
This commit is contained in:
@@ -137,7 +137,15 @@ Makedepend : $(CXXFILES) $(CFILES)
|
||||
ifeq ($(OS),IRIX)
|
||||
touch $@
|
||||
else
|
||||
$(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND)
|
||||
@ [ -d depend ] || mkdir depend
|
||||
@ rm -f $@;
|
||||
for f in $?; do \
|
||||
ff=`basename $$f`;\
|
||||
$(C++) $(INC) $(DEPARG) > depend/$$ff ;\
|
||||
echo "include depend/$$ff" >> $@;\
|
||||
done
|
||||
|
||||
# $(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ class SG_EXPORT NodeVisitor : public Referenced
|
||||
NodeVisitor has been attached via setTraverseVisitor()
|
||||
and the new mode is not TRAVERSE_VISITOR then the attached
|
||||
visitor is detached. Default mode is TRAVERSE_NONE.*/
|
||||
void setTraversalMode(TraversalMode mode);
|
||||
void setTraversalMode(const TraversalMode mode);
|
||||
|
||||
/** Get the traversal mode.*/
|
||||
inline TraversalMode getTraversalMode() const { return _traversalMode; }
|
||||
|
||||
@@ -18,7 +18,7 @@ TexGen::~TexGen()
|
||||
}
|
||||
|
||||
|
||||
void TexGen::setPlane(const Coord which, const Vec4& plane)
|
||||
void TexGen::setPlane(Coord which, const Vec4& plane)
|
||||
{
|
||||
switch( which )
|
||||
{
|
||||
@@ -31,7 +31,7 @@ void TexGen::setPlane(const Coord which, const Vec4& plane)
|
||||
}
|
||||
|
||||
|
||||
const Vec4& TexGen::getPlane(const Coord which) const
|
||||
const Vec4& TexGen::getPlane(Coord which) const
|
||||
{
|
||||
switch( which )
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
|
||||
CXXFILES =\
|
||||
ReaderWriterLOGO.cpp\
|
||||
|
||||
LIBS += $(OSG_LIBS) $(GL_LIBS) $(OTHER_LIBS)
|
||||
##LIBS += $(OSG_LIBS) $(GL_LIBS) $(OTHER_LIBS)
|
||||
|
||||
TARGET_BASENAME = logo
|
||||
include $(TOPDIR)/Make/cygwin_plugin_def
|
||||
|
||||
@@ -66,6 +66,7 @@ class Logos: public osg::Drawable
|
||||
sset->setAttribute( transp );
|
||||
sset->setMode( GL_BLEND, osg::StateAttribute::ON );
|
||||
sset->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF );
|
||||
sset->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF );
|
||||
sset->setRenderBinDetails( StateSet::TRANSPARENT_BIN + 1 , "RenderBin" );
|
||||
setStateSet( sset );
|
||||
viewport = new osg::Viewport;
|
||||
@@ -100,6 +101,8 @@ class Logos: public osg::Drawable
|
||||
glPushMatrix();
|
||||
glLoadIdentity();
|
||||
|
||||
glColor4f( 1, 1, 1, 1 );
|
||||
|
||||
std::vector <osg::Image *>::const_iterator p;
|
||||
float th = 0.0;
|
||||
for( p = logos[Center].begin(); p != logos[Center].end(); p++ )
|
||||
|
||||
@@ -56,7 +56,8 @@ CXXFILES =\
|
||||
Transform.cpp\
|
||||
|
||||
|
||||
LIBS += $(OSG_LIBS) $(OTHER_LIBS)
|
||||
###LIBS += $(OSG_LIBS) $(OTHER_LIBS)
|
||||
LIBS = -losg -lCstd
|
||||
|
||||
TARGET_BASENAME = osg
|
||||
include $(TOPDIR)/Make/cygwin_plugin_def
|
||||
|
||||
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
|
||||
CXXFILES =\
|
||||
ReaderWriterRGB.cpp\
|
||||
|
||||
LIBS += $(OSG_LIBS) $(OTHER_LIBS)
|
||||
##LIBS += $(OSG_LIBS) $(OTHER_LIBS)
|
||||
|
||||
TARGET_BASENAME = rgb
|
||||
include $(TOPDIR)/Make/cygwin_plugin_def
|
||||
|
||||
Reference in New Issue
Block a user