From 397edcd579d21fdea2da0272fdf7194d5e97801c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 8 Mar 2003 21:39:40 +0000 Subject: [PATCH] Fixed examples/osghud and osgtext Makefile's to include osgText. --- examples/osghud/Makefile | 2 +- examples/osghud/Makefile.inst | 2 +- examples/osgtext/Makefile | 2 +- examples/osgtext/Makefile.inst | 2 +- src/osg/ShapeDrawable.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/osghud/Makefile b/examples/osghud/Makefile index 01e369df2..41ca2a458 100644 --- a/examples/osghud/Makefile +++ b/examples/osghud/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osghud.cpp\ -LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osghud/Makefile.inst b/examples/osghud/Makefile.inst index 1556a13cf..289f158a3 100644 --- a/examples/osghud/Makefile.inst +++ b/examples/osghud/Makefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osghud.cpp\ -LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osghud diff --git a/examples/osgtext/Makefile b/examples/osgtext/Makefile index d5940fcf1..83e757bac 100644 --- a/examples/osgtext/Makefile +++ b/examples/osgtext/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgtext.cpp\ -LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgtext/Makefile.inst b/examples/osgtext/Makefile.inst index 0335015ff..0ebfeffed 100644 --- a/examples/osgtext/Makefile.inst +++ b/examples/osgtext/Makefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgtext.cpp\ -LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgText $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgtext diff --git a/src/osg/ShapeDrawable.cpp b/src/osg/ShapeDrawable.cpp index 23b671150..c91779801 100644 --- a/src/osg/ShapeDrawable.cpp +++ b/src/osg/ShapeDrawable.cpp @@ -494,7 +494,7 @@ void DrawShapeVisitor::apply(const TriangleMesh& mesh) { glBegin(GL_TRIANGLES); - for(unsigned int i=0;igetNumElements();i+=3) + for(unsigned int i=0;i+2getNumElements();i+=3) { const osg::Vec3& v1=(*vertices)[indices->index(i)]; const osg::Vec3& v2=(*vertices)[indices->index(i+1)];