Commit Graph

15785 Commits

Author SHA1 Message Date
Robert Osfield
787fe46e4f Removed the GNUMakefile for the old Demos directory. 2003-03-15 20:41:05 +00:00
Robert Osfield
f811b2580e Removed osgGLUT and Demos/*.
Integrated Marco's updated examples/*/*.dsp's.
2003-03-15 20:20:46 +00:00
Robert Osfield
e791014d5c Added osgpbuffer example source. 2003-03-15 16:41:27 +00:00
Robert Osfield
0fdbf3ae67 Added VisualStudio .dsp's for the new osgProducer based examples. 2003-03-15 09:20:11 +00:00
Don BURNS
ced920030a Added -losgGA to all GNUmakefiles in examples.
Added one std:: in front of an endl in osgunittests.cpp
2003-03-15 08:01:41 +00:00
Robert Osfield
59995dde90 Moved code across to use the new ArgumentParser. 2003-03-14 21:01:35 +00:00
Robert Osfield
7083773b64 Ported osgGLUT based src/Demos across to being osgProducer based, and placed
them in the new examples/ directory.
2003-03-14 20:35:45 +00:00
Robert Osfield
2ca505b3d8 Ported all glut based demos across to using the new osg::ArgumentParser. 2003-03-14 10:49:06 +00:00
Robert Osfield
34fc7dd289 The wrong file name was being used readFontFile. 2003-03-14 09:28:34 +00:00
Don BURNS
3786683636 Removed the building of the osgTXP library so the build system builds only
the plugin.  Building both the plugin and the library causes a race condition
during parallel makes.
2003-03-14 02:29:34 +00:00
Robert Osfield
2915550887 Reverted Don's changed of sqrtf to sqrt. Don't understand why the change was
required, suggest a problem elsewhere which should be fixed, *not* by modification
of Vec2.
2003-03-13 14:29:16 +00:00
Robert Osfield
661c8dd006 From Gabor Dorka, Added d to /MDd option for debug build of osgText. 2003-03-13 09:22:30 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
693a889ece Various changes to the BUILD system:
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
       $(OS)$(ARCH).Debug for OS's that support both architectures.
          eg.  Linux32.Opt and Linux32.Debug

     o Libraries links are now placed in lib/$(OS)$(ARCH)
          eg.  lib/Linux32/

     o Binaries are now placed in bin/$(OS)$(ARCH)
          eg. bin/Linux32

     o 'make install' and 'make instlinks' now place files/links in
       /usr/local/{include,lib,share/OpenSceneGraph} by default on
       most systems (Solaris still goes in /opt/OpenSceneGraph).
       Rather than having the somwehat confusing INST_SYS_PREFIX and
       INST_SHARE_PREFX, you can override these with just
            INST_LOCATION
       For example,
             make INST_LOCATION=/usr
       will place files at /usr/include, /usr/lib,
       /usr/share/OpenSceneGraph.
2003-03-13 02:53:40 +00:00
Robert Osfield
7439d7bb58 Changed the GNUMakefile for the osgproducer demo to use INC += instead of CXXFLAGS. 2003-03-12 21:02:04 +00:00
Don BURNS
4b701ebc50 Removed osgPlugins from lib, which is now built on the fly 2003-03-12 20:10:43 +00:00
Robert Osfield
3343c3a970 Fix from Gabor for proper casting of char's to unsigned ints be setting up the
osgText::String.
2003-03-12 15:36:26 +00:00
Robert Osfield
c0b3bb1f32 Moved the platform specific directory defs out of makedefs into makediredefs,
and have standardised onto single instances where possible.
2003-03-12 14:01:49 +00:00
Robert Osfield
edaed5996a Added 'w' toggle to StateSetManipulator to toggle between filled, line and
point polygon drawing modes.
2003-03-12 13:54:59 +00:00
Robert Osfield
6021ffecac Changed std::min to osg::minimum. 2003-03-12 12:17:57 +00:00
Robert Osfield
40271ef1c8 Added -losgText 2003-03-12 11:50:02 +00:00
Robert Osfield
d998b2acfa Added missing osghud Makefile. 2003-03-12 11:36:55 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*.
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
2003-03-12 10:39:43 +00:00
Robert Osfield
88b686faca Added (unsigned int) cast to the call to osg::minimum. 2003-03-12 09:45:12 +00:00
Robert Osfield
b0dce04063 Added setBound() method to Drawable. 2003-03-11 21:53:28 +00:00
Robert Osfield
5ae998dbc2 Added missing osg:: to StateAttribute. 2003-03-11 21:42:55 +00:00
Robert Osfield
e51c7f1587 Added support for AbortRendering flag pointer in osg::State which is used
by osgUtil::RenderLeaf to test if any abort state has been set, if so it
doesn't do any further drawing.

The osgProducer::Viewer has been set up to set the osg::State's it manages
with their AbortRendering flag pointers set to the osgProducer::Viewer::_done
memeber varaible.  Now when escape is pressed the rendering is aborted early.
2003-03-11 15:25:49 +00:00
Robert Osfield
78de76f17f Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene
graph containing text.

Fixed warning in MD2 plugin.
2003-03-11 13:30:03 +00:00
Robert Osfield
4cdbbf1b4a Added missing osgDB:: to writeArray() usage. 2003-03-11 13:24:28 +00:00
Robert Osfield
06fb808ad3 Improvements to the Text .osg support. 2003-03-10 16:40:26 +00:00
Robert Osfield
bc35d8d33b Addded new osgProducer based osgreflect demo. 2003-03-10 12:06:17 +00:00
Robert Osfield
5c4bcd4aac Moved the RenderLeaf implementatation across to always applying matrices
before state, which fixes problem that can occur with state that needs
the current model view or projection matrices.

Changes osgreflect so that it uses ClipNode rather than clip plane, thereby
fixing the problems which occur when the above is applied.

Create a new osgProducer version of the original GLUT based version.
2003-03-10 11:59:41 +00:00
Robert Osfield
ebbd03c114 Marged new getLibaryMethod added by Daniel. 2003-03-10 11:57:17 +00:00
Robert Osfield
efea365412 Moved the remain inline osg::Font methods into Font.cpp to avoid problems with the
impossibly stupid visual studio compilers.
2003-03-10 09:15:59 +00:00
Robert Osfield
397edcd579 Fixed examples/osghud and osgtext Makefile's to include osgText. 2003-03-08 21:39:40 +00:00
Robert Osfield
a78600af67 Removed the OSGTEXT_EXPORT symbol from FontImplementation to avoid problems under
VisualStudio.
2003-03-08 09:51:41 +00:00
Robert Osfield
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +00:00
Robert Osfield
ef3b957cb9 From Daniel Sjolie, support for light source. 2003-03-07 09:04:04 +00:00
Robert Osfield
08cdf05b3e Fix to comment record and longID length using both inbedded null's and
rec length to determine the length of a string.
2003-03-07 08:52:51 +00:00
Robert Osfield
47087585c0 Added maximum width and maximum height limits to the osgText::Text which
automatically wraps text which goes beyond these limits.
2003-03-06 21:35:33 +00:00
Robert Osfield
152e60c61b Reverted the changes to ref_ptr<> for implicit cast to pointer. 2003-03-06 19:41:59 +00:00
Robert Osfield
fab6f24f4e Changed the osgText::Font implementation so it used a facade us abstract away
the actual implemention. This has been done so that when a freetype font is
created the implementation can unloaded when the freetype plugin is unloaded
without breaking the main font.

Also add image margin around founds to prevent any image boundaries appearing.
2003-03-06 17:11:24 +00:00
Robert Osfield
0d9aaa5ca6 Reverted the ref_ptr<> implementation to prior implicit cast operator via
commenting out// #define AUTOMATIC_CAST_TO_POINTER.
2003-03-06 13:45:20 +00:00
Robert Osfield
352204f358 Renamed Text::TextString String. 2003-03-06 11:18:38 +00:00
Robert Osfield
d3e9fea28b Fixed the setInterleavedArray call. 2003-03-06 10:38:56 +00:00
Robert Osfield
b70c80ba39 Add #ifndef's around the comparison operator's against const T* now that the
implicit cast operator has been added.
2003-03-06 10:38:31 +00:00
Robert Osfield
63df52d408 Added osgText::String implementation to better handle decoding of encoded text. 2003-03-05 21:05:37 +00:00
Robert Osfield
f9d8f3fa9d Added implicit cast to T* to ref_ptr<>. 2003-03-05 21:04:11 +00:00
Robert Osfield
5e396d40e1 Made the State::setInterleavedArrays method use a const GLvoid*. 2003-03-05 21:02:37 +00:00
Robert Osfield
d1c0d74bb7 Fix for non standard compiliant Forte compilers. 2003-03-05 20:18:12 +00:00