Commit Graph

1609 Commits

Author SHA1 Message Date
Robert Osfield
cf1fe8edc2 From Boris Bralo, addition of support for osgSim::LightPoint's into TXP
plugin.
2003-09-07 14:18:22 +00:00
Robert Osfield
507c9c4cf2 Fixes from Marco. 2003-09-06 11:07:05 +00:00
Robert Osfield
792bba05b9 Added new Matrixf and Matrixd implementations.
Made Matrix be a typedef to either Matrixf or Matrixd.  Defaults to Matrixf.

Converted the osgGA::MatrixManipulators and osgProducer::Viewer/OsgCameraGroup
across to using exclusively Matrixd for internal computations and passing betwen
Manipulators, Producer and SceneView. Note, SceneView still uses Matrix internally
so will depend on what is set as the default in include/osg/Matrix.

Added the ability to osgProducer::setDone/getDone(), kept done() as the
method that the viewer main loop uses for detecting the exit condition.
2003-09-05 22:35:34 +00:00
Robert Osfield
a2834d74d2 Added set and get methods for Matrixd and Matrixf. 2003-09-05 20:52:36 +00:00
Robert Osfield
5b93250eb0 Added support for Matrixd and Matrixf implementations, with the default
Matrix typedef's to either Matrixd or Matrixf.
2003-09-05 20:48:42 +00:00
Robert Osfield
604e478f52 Moved testCancel() to end of loop as per TXP pager code. 2003-09-04 19:45:55 +00:00
Robert Osfield
11d1faeeb1 Added testCancel() to DatabasePager::run() loop. 2003-09-04 19:37:49 +00:00
Robert Osfield
f8107a39b9 Build Fixes for IRIX. 2003-09-04 08:50:06 +00:00
Robert Osfield
06046639b5 Fix for IRIX build. 2003-09-03 18:17:07 +00:00
Robert Osfield
bd44cfcfd8 Added a Matrix::value_type typedef'd trait into osg::Matrix, defaulting its
value to float, and converted the internal code across to use value_type.  This
allows Matrix to be converted to use double's simply by change the definition
of value_type.  Added Matrix::glLoadlMatrix and Matrix::glMultMatrix() to
help encapsulate the changes between float and double matrix usage.

Updated code that uses Matrix so it doesn't assume float or double matrices.
2003-09-03 10:47:25 +00:00
Robert Osfield
9a5ab0ac47 Fixes for IRIX build. 2003-09-03 08:14:00 +00:00
Robert Osfield
39b9a5e550 Removed old DatabasePager.cpp from osgProducer. 2003-09-03 07:39:42 +00:00
Robert Osfield
218c6e8d13 Added Inventor plugin, submitted by Sean Spicer, Written by Vivek (c) Magic-Earth.
To compile in do a setenv/export USE_COIN or USE_INVENTOR.
2003-09-02 21:53:41 +00:00
Robert Osfield
4761442005 Merged changed to osgParticle from Marco Jez, the changes are (quoted from
email from Marco)

"Most relevant news:
1) particle systems now have the "freezeOnCull" property set to false by
default. Since it is an optimization, and using it may cause some unwanted
behaviors if not handled properly, it makes more sense to turn it off by
default.
2) new "LINE" shape mode which uses GL_LINES to draw line segments that
point to the direction of motion.
3) particles can now have a rotation angle and angular velocity.
4) new AngularAccelOperator applies angular acceleration to particles.
5) particle processors such as emitters and programs can have a "start",
"end" and "reset" time coordinate. For example, an emitter may be instructed
to start emitting particles only after a certain time, stop after another
amount of time and then start again.

Update (2) is from Gideon May.
Updates (3) to (5) are from Douglas A. Pouk."
2003-09-02 20:39:41 +00:00
Robert Osfield
763ee70f2f Commented out calc near/far debugging messages. 2003-09-02 20:06:20 +00:00
Robert Osfield
e530912744 Made Matrix a typedef to Matrixf, and converted the old Matrix to Matrixf, as
part of prep for supporting both Matrixf (float) and Matrixd (double).

Added osg::Matrixf::glLoadMatrix() and osg::Matrixf::glMultiMatrix() methods
and changed corresponding usage of glLoad/MultMatrixf() calls across to use these
methods. Again prep for support Matrixd.

Fixes for VisualStudio 6.0 compile.
2003-09-02 17:19:18 +00:00
Robert Osfield
f90e4ff5f8 Converted eroneous writeLong/readInt boolean entries used writeBool/readBool. 2003-09-02 17:16:17 +00:00
Robert Osfield
da6f7ebeef Fixes for IRIX build + to_unix on txp plugin files. 2003-09-02 10:27:57 +00:00
Robert Osfield
7575f45800 Support for BumpMapping added by Marco Jez. 2003-09-01 21:53:53 +00:00
Robert Osfield
bc14e4ecdc Updates from Marco:sgfxbrowser.cpp (added specular
component to scene light) and AnisotropicLighting.cpp (workaround for a
multiple-context issue).
2003-09-01 19:43:58 +00:00
Robert Osfield
73094265c3 Fixes for Win32. 2003-09-01 15:46:10 +00:00
Robert Osfield
0ebf005ac1 Added a call to disable all vertex attrib arrays when none are present
on an osg::Geometry.
2003-09-01 11:23:29 +00:00
Robert Osfield
144ac14b07 From Neil Salter, added osgSim::SphereSegment and osgSim::ScalarBar, and
osgspheresegment and osgscalarbar, and osgsimulation examples.
2003-09-01 09:36:03 +00:00
Robert Osfield
5400f8293b Converted cout's to notify's. 2003-08-31 22:17:53 +00:00
Robert Osfield
6bb951a5bb From Alberto Farre, fixes to the file path handling of internally referenced
files.
2003-08-31 22:17:15 +00:00
Robert Osfield
4c62cfe6e5 Added experiment Tempated fast path implemenation, #if 0 out right now. 2003-08-31 22:08:22 +00:00
Robert Osfield
1896b8417e Converted cout's messages to use notify. 2003-08-31 21:13:50 +00:00
Robert Osfield
0fbccf778c From Alberto Farre, added support for both / and \ slashes in path utility
functions.
2003-08-29 22:05:06 +00:00
Robert Osfield
0b75a59cfe Added an explicit check for file extension so that only .jpg and .jpeg files
are loaded with the JPEG plugin, thus avoid a crash which was occuring when
it was passed non JPEG files.
2003-08-29 22:04:35 +00:00
Robert Osfield
d559ff91c3 Added getBound() to the database pager so that once a model has been loaded
it bounding volume is computed upfront and in the database paging thread.
2003-08-28 21:40:23 +00:00
Robert Osfield
64e3c052d6 Removed double line spacing in ExternalReference code. 2003-08-28 12:49:38 +00:00
Robert Osfield
138835d817 Added a PushAndPopFilePath usage to the internal flt file references. 2003-08-28 12:47:32 +00:00
Robert Osfield
77c862d305 From Marco Jez, tangent space generator. 2003-08-27 14:13:12 +00:00
Robert Osfield
2910ec140d Added KeyboardMouseCallback::shutdown() support. 2003-08-27 10:22:12 +00:00
Robert Osfield
b5674a7dde Fixed CullVisitor::popProjectionMatrix() handling of othorgraphic near
and far values.
2003-08-27 00:39:44 +00:00
Robert Osfield
f7d7a746f3 Added missing osgFX files. 2003-08-26 22:09:15 +00:00
Robert Osfield
2c4c2ad068 Added osgFX - Marco Jez's special effects nodekit. 2003-08-26 21:17:22 +00:00
Robert Osfield
a782cbad60 Moved the keyboardmouse startThread into the Viewer::realize() method. 2003-08-26 15:49:49 +00:00
Robert Osfield
229a0f2920 Added check for :: in wrapper name when writing out to .osg, so that
if a namaspace:: exists in the wrapper name then one isn't created for
it by default.
2003-08-25 22:50:01 +00:00
Robert Osfield
4924cd9ceb Added osgProducer:: in front of KeyboardMouseCallback. 2003-08-25 14:03:49 +00:00
Robert Osfield
bd798a6c4e Added getInitialInverseViewMatrix() to osg::State. 2003-08-25 13:06:15 +00:00
Robert Osfield
ed465a9f53 Added support for loading nodekits/plugins to resolve associates when
reading .osg files.
2003-08-25 11:37:22 +00:00
Robert Osfield
db9b6d10c6 Add osg_ref<Producer::KeyboardMouse> to osgProducer::Viewer to ensuer that
the keyboard mousr desctructor is being called correctly.
2003-08-23 20:48:36 +00:00
Robert Osfield
02561a96c7 Compile/Warnings fixes. 2003-08-21 14:26:40 +00:00
Robert Osfield
e46d1cf941 Moved OpenThreads::Threads::Yield() calls across to new
OpenThreads::Threads::YieldCurrentThread() naming.
2003-08-21 09:52:12 +00:00
Robert Osfield
7b9de3ad91 From Marco Jez, improvement to the handling of coordinates frame in CubeMapGenerator. 2003-08-21 09:51:25 +00:00
Robert Osfield
1a68dd80d7 Added explicit calls cancel and wait until thread and no longer running to the
DatabasePager and TXP pager.
2003-08-20 12:52:33 +00:00
Robert Osfield
18abc3aff7 Renamed instances of Click to Tick for consistency. 2003-08-20 12:51:40 +00:00
Robert Osfield
1c3b2b2554 Standardised the culling flags between CullingSet and CullStack, and
made ENABLE_ALL_CULLING enable all culling including the near and far plane.
DEFAULT_CULLING is now used for the default as uses the same original
values as ENABLE_ALL_CULLING once did - view frustum culling with near and
far culling. SceneView now uses DEFAULT_CULLING.
2003-08-20 12:50:54 +00:00
Robert Osfield
bca7e4e73b Added osg::setGLExtensionDisableString && osg::getGLExtensionDisableString()
functions the GLExtensions file, and made the isGLExtensionSupported() function
use the extension disable string when extension are querried.
2003-08-20 10:38:54 +00:00
Robert Osfield
56044e6cf7 Moved the delete of expired subgraphs to the database thread to improve
the stability of the frame rate.
2003-08-20 07:36:47 +00:00
Robert Osfield
5b7d480c0a Fixes to the database paging. 2003-08-19 19:46:18 +00:00
Robert Osfield
e2a72f7e72 Fixed typo of getNumMatrixManipulators(). 2003-08-19 14:05:53 +00:00
Robert Osfield
75e4d43026 Removed inappropriate static_cast<>. 2003-08-19 13:01:01 +00:00
Robert Osfield
169eb0fd07 Changed applyTextParamaters() to set the wrap modes :
GL_TEXTURE_WRAP_S for all texture targets.
	GL_TEXTURE_WRAP_T for all texture targets except GL_TEXRTURE_1D
	GL_TEXTURE_WRAP_R for only GL_TEXTURE_3D

And changed the defaults to OpenGL defaults of GL_REPEAT.
2003-08-18 19:51:27 +00:00
Robert Osfield
0685c2a852 Added applyTexImage_subload() implemention into TextureRectangle class
to provide automatic support for texture subloading.
2003-08-18 19:36:50 +00:00
Robert Osfield
8d5aa5644d Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it. 2003-08-18 10:58:30 +00:00
Robert Osfield
8c65920c1f Fixes for Java build. 2003-08-18 09:24:17 +00:00
Robert Osfield
07f120fb1c Fixes to Cygwin/Mingw makedefs.
Converted unix line endinges to dos line endings in various VS project files.
2003-08-16 20:42:54 +00:00
Don BURNS
52819c3f25 Added check for byte swapping when writing RGB files so rgb files can be
created on big endian machines
2003-08-16 18:52:37 +00:00
Robert Osfield
282eb39ec5 Changed cout's to notufy(INFO). 2003-08-15 09:38:36 +00:00
Robert Osfield
4b7bde1440 Removed the deprecated NodeVisitor::getLocalToWorld/WorldToLocal methods as
this are replaced by the osg::computeLocalToWorld/WorldToLocal() functions
found in osg/Transform.

Made the ReleaseTextureAndDisplayListsVisitor a public nested class of
osgDB::DatabasePager to allow it to be used in the TXP plugin, and added
usage of this visitor to the TXP plugin to make sure that textures and
display lists are released during the update thread.
2003-08-14 00:05:34 +00:00
Robert Osfield
7ed516e443 Fixed capitalization of QTtexture.h 2003-08-12 23:06:25 +00:00
Robert Osfield
1de167cd37 Fixed DrawVertex/DrawColors access of null arrays errors. 2003-08-12 10:15:59 +00:00
Robert Osfield
ef4535a2a4 Added s/getFastPathHint(). 2003-08-09 00:46:48 +00:00
Robert Osfield
8a737dd2ca Added support for clampping the near and far values in othrographic projection.
Fixed the handling of anaglyphic/stereo state in SceneView::draw().
2003-08-08 00:36:51 +00:00
Robert Osfield
a11395feec Added missing copy ops in the copy constructor.
Added computeInternalOptimziedGeometry() and associated methods to Geometry
to support alternate versions of a geometry to be used to optimize rendering,
such as flattening indexed attributes to straight attribute arrays.
2003-08-08 00:21:30 +00:00
Robert Osfield
f4d093df36 Fixed computeFastPathsUsed() so that it includes a check for the presence
of _vertexIndices and disables fast paths in this case.
2003-08-04 22:03:55 +00:00
Robert Osfield
dd90d924d2 From Romano Magacho. add osg:: to Referenced() calls for IRIX build. 2003-08-04 21:09:40 +00:00
Robert Osfield
372c5b636a Fixed VC6 for scoping problem in ive plugin. 2003-08-03 02:59:48 +00:00
Robert Osfield
5ec1458975 From Romano Magacho, fix for compile problem under IRIX. 2003-08-03 00:24:59 +00:00
Robert Osfield
79855cf669 Fixed warning in jpeg loader by replacing longjmp with throw/catch. 2003-07-26 18:57:12 +00:00
Robert Osfield
525cd9292d Fixed long jump warning.
CV: ----------------------------------------------------------------------
2003-07-26 14:15:24 +00:00
Robert Osfield
edeb32778c Fixed warnings. 2003-07-26 04:25:27 +00:00
Don BURNS
e96c0b735b Fixes to makedefs/makedirdefs ordering in some makefiles, and conditional
build for osgslideshow on Sun
2003-07-26 01:02:39 +00:00
Don BURNS
49a93076c1 Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the
local makefiles.

Small change in txp loader for sun build
2003-07-25 23:49:03 +00:00
Robert Osfield
acc200a6a2 Fixed warning, which was actually a bug, sometimes you've just gotta love
pedantic warnings.
2003-07-24 06:07:12 +00:00
Robert Osfield
1049ead980 Fix warnings. 2003-07-24 06:05:54 +00:00
Robert Osfield
c404bd09ed Removed all references to sleep/usleep. 2003-07-23 21:32:11 +00:00
Robert Osfield
70db0608a9 Moved t->testCancel() to end of loop.
Changed a sleep() to a Yield.

Removed debugging messages.
2003-07-23 21:18:04 +00:00
Robert Osfield
bf5add799d Added makefile. 2003-07-23 20:57:57 +00:00
Robert Osfield
2f47ab559a Made the fine grained checking of GL errors off by default. 2003-07-23 20:55:26 +00:00
Robert Osfield
8bd3e9f1b2 From Romano José Magacho da Silva, extension checking for NV_occlusion_query extension. 2003-07-23 20:53:53 +00:00
Robert Osfield
52aa73b18a Fixes for Win32 build. 2003-07-23 18:32:52 +00:00
Robert Osfield
a7b7d6cefc Added support for PagedLOD node into .ive format and added support for
Enabled texture object reuse by setting an expiry delay in the TextureObjectManager
of 10 seconds - done for both osgDB::DatabasePager and TXP plugin.
2003-07-23 15:52:05 +00:00
Robert Osfield
ace3684d6a Fixed blending mode on stats output. 2003-07-23 14:59:27 +00:00
Robert Osfield
e95768417c From Gideon May, added support for osgSim into .osg file format. 2003-07-23 14:06:32 +00:00
Robert Osfield
0c662e596c Merged changes from Nicklov Trajce and Boris Bralo. 2003-07-23 13:34:48 +00:00
Robert Osfield
2ce08d8088 Warning fixes from Gideon May. 2003-07-23 11:45:37 +00:00
Robert Osfield
cc529aebe0 Bumped up version numbers in preperation for the 0.9.5 release. 2003-07-23 08:54:29 +00:00
Robert Osfield
a36d45e68b Added check to allocateImage() so that if the pixel size wouldn't be computed
unless valid _data already existed on the object.
2003-07-23 08:18:19 +00:00
Robert Osfield
ee30f2e30c Added support for osg::State::s/getInitialViewMatrix();
Added slideshow3D examples to the runexamples.bat.

Fixed DatabasePager to work with the latest OpenThreads.
2003-07-22 21:03:59 +00:00
Robert Osfield
2bce4dda75 Made BlinkSequence subclass from osg::Object. 2003-07-22 12:48:31 +00:00
Robert Osfield
aa8b552ca6 From Marco, updates to osgDB and .osg plugin to better handle reading of
objects of specified types.
2003-07-21 18:36:47 +00:00
Robert Osfield
40e38a1645 Added yield call to database paging main loop. 2003-07-21 15:51:43 +00:00
Robert Osfield
7e1fab5bc1 Removed old link. 2003-07-21 11:54:51 +00:00
Robert Osfield
2436d45bfc Added missing DatabasePager. 2003-07-21 10:39:07 +00:00
Robert Osfield
325dc0f6b7 Moved DatabasePager into from osgProducer into osgDB. This means that osgDB
is now dependant on OpenThreads.
2003-07-21 08:19:36 +00:00
Don BURNS
56a13abc05 Updated OSG to use OpenThreads. Moved any references to OpenThread to
OpenThreads and removed any dependency on Producer threads, Mutexes, etc.
2003-07-19 00:18:07 +00:00
Robert Osfield
23fc1900ce From Romano Jose Magacho da Silva, added osg:FragmentProgram.
From Robert, add .osg support for FragmentProgram.
2003-07-17 06:43:15 +00:00