62192cb236Added dependancies to Demos.
Robert Osfield
2002-04-13 10:29:44 +00:00
3f67300c82Saved workspace from VisualStudio to follow up on missing demo dependancies
Robert Osfield
2002-04-13 10:18:58 +00:00
7150ab090bAdded Core infront of the names of the project dependancies.
Robert Osfield
2002-04-13 09:28:53 +00:00
341ffb2361Further work on cleaning up SceneView and Camera, in particular moving strereo support out of Camera and into SceneView. Also enabled the option to set the projection and modelview matrices directly on SceneView thereby removing the dependance on osg::Camrea to control the view of the scene.
Robert Osfield
2002-04-12 18:06:13 +00:00
468580a12cFixes for Win32 build.
Robert Osfield
2002-04-12 14:05:55 +00:00
91e9d71963Futher updates to VisualStudio files, adding osgstereoimage and osgversion in particular.
Robert Osfield
2002-04-12 13:06:48 +00:00
d3fa1df64fAdded "Core " infront of the osg, osgDB, osgUtil, osgText, and osgGLUT libraries in the Visual Studio workspace/project files.
Robert Osfield
2002-04-12 12:51:32 +00:00
4d90729c33Renamed the osgtext demo project to reflect the name.
Robert Osfield
2002-04-12 12:15:07 +00:00
4da5d65ecaAdded "Demo " and "osgPlugin " infront of all demo and plugin project names to help differentiate them within VisualStudio.
Robert Osfield
2002-04-12 11:57:20 +00:00
2ea2296f8dAttempt to add osgPlugin infront of the 3ds name to force VisualStudio to present it as plugin in the browser.
Robert Osfield
2002-04-12 10:24:45 +00:00
795c2ded43Reorganised the names of libraries and Demos to make it clear what is what.
Robert Osfield
2002-04-12 10:12:35 +00:00
a44efe01bbFixes for Win32 build
Robert Osfield
2002-04-12 09:53:39 +00:00
c6cdfc6794Removed double reference of osgtexture
Robert Osfield
2002-04-12 09:25:41 +00:00
315acb2f25Removed Metroweks files since they wern't being used, and were not up to date. An attempt at using Metrowerks for MacOSX build failed, and we have Cywgin/Mingwin VisualStudio for windows so there is little need for it.
Robert Osfield
2002-04-12 09:25:15 +00:00
3a18750760Removed dangling references to NewCullVisitor from osgUtil.dsp.
Robert Osfield
2002-04-12 08:01:22 +00:00
14b4b7f98cSolaris PKG distribution now makes a shar (self-extracting shell archived) changed makepgk to do this.
Don BURNS
2002-04-12 06:18:41 +00:00
e4d52cd1e6added 'make cleandepend' to build system.
Don BURNS
2002-04-12 05:09:45 +00:00
dfc9e9587bAdded the 'make cleandepend' target to the build system.
Don BURNS
2002-04-12 05:06:41 +00:00
6ed233d0d2Added DataVariance enum and set/get fields to osg::Object to help identify which objects have values that vary over the lifetime of the object (DYNAMIC) and ones that do not vary (STATIC). Removed the equivalent code in osg::Transform, StateSet and StateAttribute, as these are now encompassed by the new DataVariance field.
Robert Osfield
2002-04-11 23:20:23 +00:00
e85e5a6ce6Added several new methods to osg::Image to help keep track of memory and added osg::Image::readPixels to encapsulate glReadPixels.
Robert Osfield
2002-04-11 17:15:07 +00:00
421e381f17Patch to ReadWriter3DS from Mike Connel.
Robert Osfield
2002-04-11 17:13:16 +00:00
08522bd7dbBacked out bad addition of NewCUllVisitor
Don BURNS
2002-04-11 16:05:38 +00:00
ad95c4b9f6Somehow, cvs forgot to check in a modified Makefile with NewCullVisitor added to it... Hm.. anyway this fixes it.
Don BURNS
2002-04-11 15:54:49 +00:00
d0ebd93441Fix for Win32 build.
Robert Osfield
2002-04-11 13:53:46 +00:00
130f64cf28Changed the comments for Clay Fowlwer about the GLU patch for RedHat7.2 to reflect the new position of the tarball and its new name.
Robert Osfield
2002-04-11 09:16:01 +00:00
e037c79917Fixed refrences to NewCullVisitor which has now been mapped onto CullVisitor.
Robert Osfield
2002-04-11 08:24:55 +00:00
f2ffbdd469Copied NewCullVisitor over top of CullVisitor and then removed NewCullVisitor.
Robert Osfield
2002-04-10 22:10:07 +00:00
360247225eAdded new osg::DrawPixels class with encapsulates glDrawPixels as and osg::Drawable. Added osg::Image::readPixels to osg::Image.
Robert Osfield
2002-04-10 21:51:34 +00:00
80d2c718cdAdded placeholder .README file to the PKG directory to keep CVS from removing the directory on an update.
Don BURNS
2002-04-10 14:34:16 +00:00
ba85d687edRemoved big honkin' SUN PKG files from cvs distribution.
Don BURNS
2002-04-10 14:32:16 +00:00
ef15655ea3Added (previously omitted) libpng, libjpeg, libtiff, libgif to makedefs in the Linux section
Don BURNS
2002-04-10 01:29:45 +00:00
3a94fc4c91Fixed makedepend to do the right thing.
Don BURNS
2002-04-09 22:54:43 +00:00
1369987cddAdded setProjectionMatrix and setModelViewMatrix() methods to osg::SceneView, and associated member variables. I have not linked them up to the cull traversal yet, but this will be the next task.
Robert Osfield
2002-04-09 21:46:34 +00:00
6f65e86057Further work on removing Camera references from NewCullVisitor and releted classes, this work paves the way for making osg::Camera an optional extra rather than a requirement for rendering.
Robert Osfield
2002-04-09 16:09:19 +00:00
57248a4bf9Checking in all Makefile.inst in src/Demos/*. These are the Makefiles that get installed rather than the build Makefiles.
Don BURNS
2002-04-09 15:51:20 +00:00
30eab4b79aAdded pkgadd distribution for Solaris.
Don BURNS
2002-04-09 14:55:38 +00:00
055e056645Added -lstdc++ to begining of LIBS on link line.. ??
Don BURNS
2002-04-08 16:50:13 +00:00
161adea396Put quotes around "DBGF" for multi argument
Don BURNS
2002-04-08 16:25:45 +00:00
25fbc557b1Changed a char* into const char* to fix Solaris build.
Robert Osfield
2002-04-08 08:23:00 +00:00
42a98c780bFix for VisualStudio's lack of auto_ptr::reset.
Robert Osfield
2002-04-08 08:22:27 +00:00
1a51045ea4Added a stop gap fix for cygwin build. Previous experiements were creating library and plugin files that looked like system library and system files which would have deleted original files on a 'make install'. Cygwin is not tested yet, but this needed to get fixed before a cygwin user wiped out his system library files.
Don BURNS
2002-04-07 17:47:03 +00:00
1b73f9579eUpdates to Makefile to reflect recent .cpp additions such as TextureCubeMap, MemoryManager etc.
Robert Osfield
2002-04-06 09:24:51 +00:00
aa0e398cf7Fixed a small oversight in the previous bug fix. in GeoSet::computeBound() _numcoords is NOT necesarily _cindex._size.
Don BURNS
2002-04-05 02:49:58 +00:00
87b7f48453Edited INSTALL for new make and installation procedures. Checking in a fix for Norman Vine Added helprules and help.sh for a long-winded help message if you 'make help'.
Don BURNS
2002-04-05 01:52:15 +00:00
893dc6d65cAdded Norman Vine's changes for CYGWIN builds
Don BURNS
2002-04-04 18:01:44 +00:00
1de448df4aFixed a small bug in compute bound that caused it to come up with the wrong number if the coord array was indexed, and containing bogus (unindexed, yet in-line) numbers.
Don BURNS
2002-04-04 00:30:10 +00:00
765d2f2183Cleaned up in stallation directives
Don BURNS
2002-04-03 17:53:46 +00:00
e0adca775bReinstated Norman Vine's TARGET_BASENAME variable in the makefiles and added prefixes and suffixes to libs and plugins. ALl this to accomodate cygwin...
Don BURNS
2002-04-03 17:42:12 +00:00
12043abd40Oops forgot to add makedefs and makerules
Don BURNS
2002-04-02 06:58:18 +00:00
3e6638320aThe new order for building OSG. All Makefiles are replaced and the Make directory is left with four files only : makedefs makerules makedirrules instrules
Don BURNS
2002-04-02 06:44:57 +00:00
9f4f491851Folded in Bob Kuehne's changes for Mac OSX to makedefs and makerules
Don BURNS
2002-04-02 06:27:07 +00:00
8e0c273c65Added cleanlite rules to makerules.new
Don BURNS
2002-04-01 15:37:21 +00:00
fc8ca0a351*** empty log message ***
Don BURNS
2002-04-01 04:54:11 +00:00
35f752bf89Completed and tested instrules.new
Don BURNS
2002-04-01 03:39:29 +00:00
8b6872d0c5Added more to instrules and makedefs.new Folded in Randall Hopper's changes for FreeBSD
Don BURNS
2002-03-31 16:43:54 +00:00
3351306d80Added new osg::Projection node, and osgUtil::NewCullVisitor which are work in progress for the new support for controlling the projection matrix from within the scene graph.
Robert Osfield
2002-03-31 16:40:44 +00:00
2786e4c083Removed reference to malloc.h, replacing by stdlib.h instead.
Robert Osfield
2002-03-31 09:54:14 +00:00
6ff34d0bcbWarnings fixes, submitted by Randall Hopper.
Robert Osfield
2002-03-30 21:20:41 +00:00
434d7b98e5Fix for Cygwin build.
Robert Osfield
2002-03-30 15:13:33 +00:00
56cee8c711Move the applying of Projection and ModelView matrices into osg::State so that it now maintains references to the last applied matrices, automatically doing lazy state updating. This simplifies the various places in the OSG which were previously doing the applying, add paves the way for managing the projection matrix within the scene graph.
Robert Osfield
2002-03-29 17:26:40 +00:00
07f9421f39Converted from dos file endings to unix.
Robert Osfield
2002-03-29 12:23:54 +00:00
ec4ee5281dFixes for dos endings in MemoryManager.cpp, and compile fix for osgText for Cygwin.
Robert Osfield
2002-03-29 12:23:20 +00:00
114c18532aAdded new install rules for makefiles and updated makedefs and makerules... more to come
Don BURNS
2002-03-29 06:54:23 +00:00
34c05db393Fixes for IRIX build.
Robert Osfield
2002-03-28 23:06:20 +00:00
88de33c29dCouple a fixes in makedefs and makerules
Don BURNS
2002-03-28 07:29:07 +00:00
b66205f653Added Norman Vines fixeds for cygwin
Don BURNS
2002-03-28 06:35:57 +00:00
d421e35c8dA compile fix to the new Texture subload changes.
Robert Osfield
2002-03-27 23:04:52 +00:00
33c89c3be0Added support for setting the texture subload width and height within osg::Texture. The values default to 0, and in this state they are sizes of the glTexSubImage2D are taken from the source image size. This allows the previous setup with no settings for subload size to work as before.
Robert Osfield
2002-03-27 22:51:58 +00:00
7e2c82f141Futher updates to MemoryManager, fixed memory leak in osgconv.
Robert Osfield
2002-03-27 16:31:25 +00:00
77ae5ddcb6Updates to various files, replacing delete calls with osgDelete so that greater debugging info can be gleaned.
Robert Osfield
2002-03-27 14:56:47 +00:00
7927335edfAdded support for VERTICAL_SPILT and HORIZONTAL_SPLIT stereo modes.
Robert Osfield
2002-03-27 10:52:40 +00:00
6b7cbdaf1aUpdate to makeefs/makerules
Don BURNS
2002-03-27 06:09:17 +00:00
219f225b9fupdate to makedefs.new makerules.new
Don BURNS
2002-03-27 00:55:52 +00:00
84d2d01163Added support for osg::MemoryManager which is based upon Paul Nettle's memory manager published at flipcode.com. This can be turned on with the OSG_USE_MEMORY_MANGER option which then uses custom global new and delete operators as well as provide osgNew and osgDelete macro's which add ability to log line and file from which calls are made.
Robert Osfield
2002-03-26 23:52:52 +00:00
72ff3186dfAdding makedirrrules to Make directory
Don BURNS
2002-03-26 21:26:27 +00:00
fc036a28ceTemporarily adding makedefs.new and makerules.new to keep them separate from current makedefs/makerules files. Will eventually remove all makedefs.* and makerules.* and replace only makedefs and makerules with makedefs.new and makedefs.new
Don BURNS
2002-03-26 21:24:04 +00:00
651a22453aAdded osg::MemoryManger which is currently based on Paul Nettle's memory manager published at flipcode. I havn't adopted Paul's macro's for new/delete etc, but use osg prefixed versions instead to allow greater flexiblity in handling include ordering.
Robert Osfield
2002-03-25 23:18:02 +00:00
51b1b1eb38Added missing osgstereoimage.dsp
Robert Osfield
2002-03-25 23:13:30 +00:00
06fcd12598Fixes for MacOSX build.
Robert Osfield
2002-03-25 19:04:30 +00:00
b7022b7e23Fixed warning in DisplaySettings.cpp
Robert Osfield
2002-03-23 21:30:32 +00:00
f50c5f7a5eMoved the exit on escape into Window, and added a virtual free method on both Window an Viewer to clean up the windows, this is now called before exit is finally called, ensure that more more memroy is clean up prior to exit.
Robert Osfield
2002-03-23 21:28:25 +00:00
33b0ceac0dAdded GL_TEXTURE_3D definition for those with gl.h headers which don't contain it.
Robert Osfield
2002-03-23 10:55:29 +00:00
1ba7e67e2cAdded missing TextureCubeMap.cpp to cvs.
Robert Osfield
2002-03-21 15:46:34 +00:00
03cda7d3f8Renamed have_applied_mode, have_applied_attribute, apply_mode, apply_attribute to haveAppliedMode, haveAppliedAttribute, applyMode, applyAttribute to make it more consistent with the general OSG name convetion.
Robert Osfield
2002-03-21 12:36:05 +00:00
a364875afbAdded osg:State:have_applied_mode(mode) and have_applied_attribute(type) to make it easier to specify which modes and attributes have been modified without the user requiring to know to what value, or to have an equivilant attribute to pass to the have_applied_attribute method. The original have_applied(mode) and have_applied(attribute) methods have been renamed have_applied_mode(), have_applied_attribute() as this was required to prevent the mode and type values colliding during compile (it was causing a compile error when the method names were the same.)
Robert Osfield
2002-03-21 12:00:10 +00:00
b53b3038eb_cullMaskRight was not being initialized in the constructor which was resulting in some sporadic problems when running stereo - occoasionally the right eye view wouldn't appear!
Robert Osfield
2002-03-21 11:57:16 +00:00
3816a4fcfcModified files reflect small changes to work with Sun OS port....
Don BURNS
2002-03-21 07:50:14 +00:00
9836af1055Added osg::TextureCubeMap which encapsulates OpenGL's cube texture mapping.
Robert Osfield
2002-03-20 22:39:51 +00:00
8656adb463Added a Referenced::unref_nodelete() method which unreferences but does not delete the object even if its count goes to 0 or below. This should only be called in special circumstances, the ReaderWriter::ReadResult being one of them. This new method has allowed the problem of objects being multiple referenced on return from readNodeFile() & readImageFile().
Robert Osfield
2002-03-20 14:03:30 +00:00
0b27e5c381Updates to Texture and TextureCubeMap to clean up the code so they share much more of the core texture setup code. This largely invloved paramterizing the applyImmediateMode, which has also been rename applyTexImage to reflect its functionality better.
Robert Osfield
2002-03-20 11:24:47 +00:00
8c9609b331Added the fallback of intersecting with the a drawables bounding box, if the drawable isn't a GeoSet and hence supported by the IntersectVisitor's GeoSet primitive intersections code.
Robert Osfield
2002-03-20 11:22:06 +00:00
8f02db61e5Added osg::TextureCubeMap. submission from Brede Johansen.
Robert Osfield
2002-03-18 23:10:33 +00:00
49e7be88a7Fixed the MS version number check in Optiizer.cpp. Fixes to memory handling in ReaderWriterDW.cpp. Submissions from Geoff Michel.
Robert Osfield
2002-03-18 22:03:28 +00:00
eb0587b5fbChanges required for SUN Solaris port...
Don BURNS
2002-03-18 21:56:00 +00:00
45de7a5815Added new osgstereoimage demo which loads two stero paired images to create a 3D via of photographed scene.
Robert Osfield
2002-03-17 18:44:47 +00:00
0610d76c6aFix of a delete char array so it used delete [].
Robert Osfield
2002-03-14 23:19:58 +00:00
8b15a1f835Fixed a problem for finding MIPS 64 bit libraries. Was seaching for LD_LIBRARYN32_PATH instead of LD_LIBRARY64_PATH
Don BURNS
2002-03-14 20:29:05 +00:00
c49c62ee15Integrated various changes worked on at the Glasgow Science Center. Changes include change the CameraManipulators so they work with double for time instead of float. Also added support for DataType to osg::StateAttribute and StateSet so that they can be set to either STATIC or DYNAMIC, this allows the optimizer to know whether that an attribute can be optimized or not.
Robert Osfield
2002-03-14 17:34:08 +00:00
9e92b9b899Added a TextureCallback which cycles through various filter modes, used in testing new glTextParamters update functionality. I have commented out the call to attaching of the callback so osgtexture outwardly behaves as before. The code lies dormant just incase we need to use it for testing in the future.
Robert Osfield
2002-03-14 16:42:43 +00:00
e80496d5dbChanged Texture so that is use lazy updating on texture paramters (Filter/Wrap) mode by using a _texParamtersDirty flag in combination with an applyTexParamters(State&) method which does the paramters setting in one tidy bundle. This new implementations replaces the CompileFlags submitted yesterday.
Robert Osfield
2002-03-14 16:01:21 +00:00