Commit Graph

441 Commits

Author SHA1 Message Date
Robert Osfield
72e3ac35a0 From Rainer Oder, new osglauncher application. 2004-10-01 15:49:57 +00:00
Robert Osfield
78f3a4a0cd Updated to use new TexGen method 2004-10-01 15:47:40 +00:00
Robert Osfield
562ceb456f Checked in support for cleaning up and then restart a new graphics windows
once the first one has been closed down.
2004-09-30 13:36:00 +00:00
Robert Osfield
d204a087c3 Added proper handling of 3d texture compression 2004-09-30 09:10:29 +00:00
Robert Osfield
e08328a449 Preliminary steps to support for compressed 3D textures. 2004-09-29 10:01:46 +00:00
Robert Osfield
be8476592e From Mike Weiblen, partial fix for OpenGL error generation under NVidia drivers. 2004-09-26 10:27:25 +00:00
Robert Osfield
54b45ce3bc Updated to DatabasePager support 2004-09-21 21:33:52 +00:00
Robert Osfield
b664c20c74 Improved the handling of building/writing generated databases, and
the fixed transition distances on the lower levels of geocentric databases.
2004-09-13 13:53:45 +00:00
Robert Osfield
39a79a9805 Fixed write of normalmap. 2004-09-09 09:03:28 +00:00
Robert Osfield
add06bab8d Added docs for max size commandline params. 2004-09-06 14:58:29 +00:00
Robert Osfield
f4839d7158 Updates to controlling maximum texture size 2004-09-04 09:22:26 +00:00
Robert Osfield
6f1716a15b Added commandline support for Size and texcoord Multipliers 2004-09-03 15:42:43 +00:00
Robert Osfield
200b23f354 Added handling of RGBA to normal map computation 2004-09-03 10:02:56 +00:00
Robert Osfield
4702a0a964 From Jeoen den Dekker, changed eroneous tcoords[ci][0] to tcoords[ci][1] 2004-09-01 10:45:11 +00:00
Robert Osfield
2003c27714 From Marco Jez, added new osgmotionblur example 2004-09-01 09:54:36 +00:00
Robert Osfield
146f4cd573 Remamed TrackerManipulator to NodeTrackerManipulator 2004-08-30 10:03:18 +00:00
Don BURNS
3e74db50e5 Changes for IRIX build and fix to build system 2004-08-28 23:04:47 +00:00
Robert Osfield
c3f6e9f7cd Changed --compress to --compressed in commandline docs 2004-08-24 07:29:28 +00:00
Robert Osfield
9486146ace Changed the write help option to just output commandline options. 2004-08-23 08:31:55 +00:00
Don BURNS
19ed70a6ce Added back in the -s (scale) argument to osgconv, which was dropped
in the last revision.
2004-08-21 17:29:19 +00:00
Robert Osfield
89a6e092cc From Don Tidrow, fixes to comments. 2004-08-20 09:46:02 +00:00
Robert Osfield
28e43fb2da Disabled the culling on the DistortionNode. 2004-08-16 08:58:07 +00:00
Robert Osfield
9e797a8408 Fix for Mingw from Norman Vine. 2004-08-06 09:38:43 +00:00
Robert Osfield
3579506fa8 Added support for osg::AutoTransform::setAutoRotateMode(AutoRotateMode) deprecating
the previous setAutoRotateToScreen().  Added support for ROTATE_TO_CAMERA mode.

Cleaned up the autotransform demo to use a sensible number of labels
2004-08-06 08:22:58 +00:00
Robert Osfield
e004dbe58e From Bruce Clay, Build fixes for Win32 VS6.0 2004-08-06 05:25:21 +00:00
Robert Osfield
7eb3f2646e From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin 2004-08-04 08:27:43 +00:00
Robert Osfield
041b664660 From Brede Johansen, fixes for Win32 build 2004-08-04 07:14:12 +00:00
Robert Osfield
c22f24f57a Added test for quat multiplication ordering. 2004-08-03 19:00:33 +00:00
Robert Osfield
cf41e73ccc Changed the static array syntax to solve VS.NET compile warnigns, changed
the binding of the normals, and changed the name of the textures used.
2004-08-03 07:31:33 +00:00
Robert Osfield
67df9af7d1 Fixed warnings 2004-08-02 15:56:18 +00:00
Robert Osfield
f1ade41cdd Fixed warnigns 2004-08-02 14:52:39 +00:00
Robert Osfield
9b33dee6ac Made the member variables in RenderStage and RenderBin protected 2004-08-02 12:19:50 +00:00
Robert Osfield
f206abcd43 From Geoff Michel, new osgtesselate example, and new features in osgUtil::Tesselator. 2004-08-01 10:36:02 +00:00
Robert Osfield
b790fa59a8 Added beginnings of new TrackballManipulator 2004-07-30 15:44:59 +00:00
Robert Osfield
9097b2f23a Added osgText to makefile 2004-07-29 14:24:50 +00:00
Robert Osfield
cb31021ab0 From Corbin Holtz, addition of GDAL_INCLUDE and GDAL_LIB env vars for setting
a non standard location of GDAL
2004-07-28 12:29:15 +00:00
Robert Osfield
0b288fc721 Added support for compressing textures to osgconv, can be accessed by
running --compressed when outputting to a .ive file.
2004-07-22 12:10:53 +00:00
Robert Osfield
33b5db8e2f Added support texture compression in osgconv 2004-07-22 11:59:58 +00:00
Robert Osfield
221c75fb6e Fixed the position of text so it is drawn ontop of the quads. 2004-07-19 18:56:42 +00:00
Robert Osfield
0fb5733f13 Added support for --tile-image-size <size>, --tile-terrain-size <size> and --comment <string>
command line options into osgTerrain::DataSet + osgdem.
2004-07-19 09:03:50 +00:00
Robert Osfield
c7647b98b8 Added ability to control the number of slices and the amount of the volume clipped. 2004-07-11 16:38:16 +00:00
Robert Osfield
a7490a2ea2 Compiles fixes for VS.6.0 2004-07-09 15:42:07 +00:00
Robert Osfield
87c954a4e1 Changed std::min definition to osg::minimum to avoid STOOOPID MS conficts. 2004-07-09 15:26:48 +00:00
Robert Osfield
c6ac4926bf Clean up of commandline options 2004-07-09 15:24:01 +00:00
Robert Osfield
3248f885ec Replaced the custom MyTexGen class with a standard TexGen, and utilised the
new RenderStage addPositionedTextureAtribute method.
2004-07-08 22:12:49 +00:00
Robert Osfield
ef93f96328 Added lighting and materials to volume subgraph 2004-07-07 15:05:00 +00:00
Robert Osfield
b6b29e2151 Fixed build after Image change 2004-07-06 06:05:32 +00:00
Robert Osfield
fc3f40c8f4 Added normal setting to slice planes 2004-07-02 14:43:27 +00:00
Robert Osfield
5fb7eab911 Clean up of osgvolume 2004-07-01 14:30:18 +00:00
Robert Osfield
a8ee967f14 Added support for using pixel size control of LOD levels. 2004-06-30 19:07:05 +00:00
Robert Osfield
342444d5bb Improved the handling of normal lighting 2004-06-29 14:58:24 +00:00
Robert Osfield
16c5b80c61 Added osgvolume example 2004-06-29 13:59:07 +00:00
Robert Osfield
9de43e833f From Bob Kuehne, add additional check in osgconv to handles modules that don't load gracefully. 2004-06-28 09:05:33 +00:00
Robert Osfield
63aa9b857d Added first stage of support for "--levels min max" in osgdem/osgTerrain where
this option controls which levels that an associated imager or DEM contributes
to the final model.
2004-06-17 14:39:16 +00:00
Robert Osfield
9acb5173c4 Added include of osg/ClusterCullingCallback 2004-06-15 12:31:25 +00:00
Robert Osfield
9a683e837d Fixed tabbing. 2004-06-14 19:31:48 +00:00
Robert Osfield
dde68108b6 Fixed typos. 2004-06-14 19:14:06 +00:00
Robert Osfield
81082648c3 Added --o_cs, --o_wkt and --o_wkt_file commandline options. 2004-06-09 10:03:01 +00:00
Robert Osfield
65d0293778 Added options for controlling mipmapping and aniso-tropic filtering. 2004-06-08 13:58:36 +00:00
Robert Osfield
727af69af5 Added sphere segment to osgsimulator. 2004-06-07 12:53:09 +00:00
Robert Osfield
67cb59dbef Added --RGB_16, --RGB_24 and --compressed options. 2004-06-06 14:28:29 +00:00
Robert Osfield
de52abcdd3 From Ulrich Hertlein & Iskander Prins, added rotation of skydown on
fixed handling of updating one image per frame.
2004-06-04 08:40:15 +00:00
Robert Osfield
ac771894ad Added handling of skirt ratio, and extra docs on commandline args 2004-06-02 14:16:45 +00:00
Robert Osfield
7f94839e94 Added setPosition and setWidth methods into ScalarBar and changed the
implementation to use these values to position and set the size of the
scalar bar.  Also made the characterSize value a float rather than
the previous int.
2004-06-02 12:37:14 +00:00
Robert Osfield
48d148601b Added HUD scalar bar. 2004-05-20 22:20:39 +00:00
Robert Osfield
f02c75f5ea Added Vec2d, Vec3d and Vec4d classes, and remapped Vec2, Vec3 and Vec4 to
Vec2f, Vec3f an Vec4f respectively, with typedef's to the from Vec* to Vec*f.
2004-05-20 10:15:48 +00:00
Don BURNS
edc9e498d7 Added an optional argument for doing model orientations in osgconv using
degrees and axis rather than two vectors.
2004-05-17 02:48:53 +00:00
Robert Osfield
ae5aefac0e Added the beginings of new osgParticle Explosion, Fire and SmokeEffects.
Added support for generation explosion, fire and smoke effects in osgsimulation
2004-05-13 22:09:23 +00:00
Robert Osfield
3d3199017e From Ken Sewel, added osgDB::fileType(filename) method and usage of this
new function in osgdem to automatcally handle directories as part of the
regular -d and -t options.
2004-05-08 06:35:32 +00:00
Robert Osfield
b7746ff56e Added support for automatically finding CoordinateSystemNode's in the
scene graph and then using them to set up the CoordinateFrame used
by the camera manipulators.
2004-05-03 12:04:25 +00:00
Robert Osfield
5836d60fbd Added osg::CullSettings class as a way of collecting all the various
settings related to the cull traversal in one place, so we can keep APIs
for settings these values more consistent.
2004-04-30 15:35:31 +00:00
Robert Osfield
97bf993e5d Updated to build against the move from osgTerrain::CoordinateSystem to
osg::CoordinateSystemNode.
2004-04-29 22:23:55 +00:00
Robert Osfield
cca7d0f685 Added support for "--bluemarble-east", "--bluemarble-west", "--whole-globe"
and "--range" commandline options to allow easier specification of coords
systems for common datasets which don't come with geospatial coords.
2004-04-22 21:51:06 +00:00
Robert Osfield
b8a68204c0 Added pathway in code for override the colour of the wireframe scribe 2004-04-22 08:04:34 +00:00
Robert Osfield
a1caa14a61 Added osgsimplifier example. 2004-04-18 16:15:49 +00:00
Robert Osfield
baa67fe180 Fixed incorrecting sizing of background tex coords 2004-04-16 22:07:30 +00:00
Robert Osfield
2a6e155d03 From Alberto Farre, changed the cache hint option in read*() calls from being
a bool to a enum osgDB::Registru::CacheHintOptions to be used a bit mask flag.

From Robert Osfied, added osgDB::Registry::ReadFileCallback and
osgDB::Registry::WriteFileCallback to allow customizition of read and write
calls.
2004-04-10 16:11:56 +00:00
Robert Osfield
6ac92bfb07 Added --wtk_file option 2004-04-05 21:27:57 +00:00
Robert Osfield
4d2d47e656 Added support for --geocentric option to allow users to specify that the
output database should by in geocentric coordinates.
2004-04-01 11:03:39 +00:00
Robert Osfield
b67858f388 Added osgTerrain::EllipsodeTransform helper class for converting to and from
lat, long, height to geocentric X,Y,Z and back.
2004-03-31 15:50:30 +00:00
Robert Osfield
a1b46de936 Added normal generation in polygonal tile generation, and add --wtk option
for setting coord systems in osgdem
2004-03-29 22:26:51 +00:00
Robert Osfield
cad1e2a075 Groundwork for adding support for polygonal tiles 2004-03-29 10:45:58 +00:00
Robert Osfield
ec1fd733b8 Added TextureType and GeometryType parameters to DataSet. These will be used
to control what type of database is generated.
2004-03-21 12:17:44 +00:00
Robert Osfield
88bbdb325d Implemented support for overriding the coordinate system and geo transform
using in generate of databases.
2004-03-20 18:32:49 +00:00
Robert Osfield
b21b585ee8 Added support for setting the geoTransform to use in source data. 2004-03-19 22:20:35 +00:00
Robert Osfield
b2479283a8 Improved the argument handling. 2004-03-19 22:03:32 +00:00
Robert Osfield
84562208d0 Added support for controlling the type of destiation database to create into
osgTerrain::DataSet.
2004-03-15 15:47:22 +00:00
Robert Osfield
a7799bf2d9 Added some basic event handler. 2004-03-12 21:04:20 +00:00
Robert Osfield
de9af5d6bd Cleaned up osgmovie example so it no longer depends upon LibMpeg3, just
using readImageFile instead.
2004-03-12 20:23:55 +00:00
Robert Osfield
84caecae0e Changed the coordinate system option to --o_cs <string> 2004-03-11 22:04:41 +00:00
Robert Osfield
e082008d8a Moved osgTerrain::DataSet from the osgdem example into osgTerrain. Added
various improvements.
2004-03-11 16:14:25 +00:00
Robert Osfield
89379f31aa Fixed normal orientation 2004-03-11 09:04:02 +00:00
Robert Osfield
6bd23304f9 Removed redundent ImageStream.h 2004-03-09 14:00:01 +00:00
Robert Osfield
8b47c9c85d Preliminary work on general support of video textures. 2004-03-09 09:42:07 +00:00
Robert Osfield
bd37f999c4 From Bob Kuehne, change on __DARWIN_OSX__ define to __APPLE__ 2004-03-08 11:02:05 +00:00
Robert Osfield
4aa7afedf3 Removed include <iostream> where possible, replacing with istream or ostream and changing
std::cout/cerr to osg::notify().
2004-03-03 13:27:21 +00:00
Robert Osfield
f3bee81e7a From Ruben, Added osgpointsprite examples. 2004-03-03 11:17:21 +00:00
Robert Osfield
e2469aece9 From David Jung, added support for osg::Capsule shape 2004-03-02 20:33:00 +00:00
Robert Osfield
1970606dd2 Changed _X & _Y varaibles to _tileX & _tileY 2004-02-12 12:53:51 +00:00
Robert Osfield
eca2fc2837 Improved osgSim::SphereSegmenet's handling of transparancy. 2004-02-12 01:15:37 +00:00
Robert Osfield
22b2e7343e From Tom Jolly, Fixes to osgSim::BlinkSequence to enable proper saving and
loading.
2004-02-05 10:50:29 +00:00
Robert Osfield
9ca8d6a88e Removed slideshow3D example source code, since it being moved to a seperate
distribution.
2004-02-04 13:19:32 +00:00
Robert Osfield
217a8519be Added rounding to nearest power of two in tile image size 2004-02-03 21:08:35 +00:00
Robert Osfield
de83752acd Added support for better merging of height fields which ignores NoData
values.  Fixed various problems with handing of coordinates systems. Added
support for halving levels in x and y respectively, in addition to the
previous divide in both x and y at the same time, which allows long
line/short tall regions to be handled better.
2004-02-03 16:51:44 +00:00
Robert Osfield
fad11f64f5 From Eric Sokolosky, change to use X_INC in GNUmakefile to allow compiling
on systems with X installed in a non standard place.
2004-02-02 17:16:40 +00:00
Robert Osfield
db02810270 Changed the osgviewer example to use the osg::Timer::instance instead a loca
instance.
2004-02-01 17:19:33 +00:00
Robert Osfield
cec8dd54ed Improvements to the merging of source image datasets into the destination
tiles which ensure that gaps don't appear.

Made the elevation properly scaled relative to the having the x & y in
degrees.
2004-02-01 10:27:19 +00:00
Robert Osfield
26303b989a Added new osgspacewarp example which demonstrates how to create a star
field which becomes lines as one accelerates, similar to the effect seen
in star trek's warp drive.
2004-01-30 21:09:21 +00:00
Robert Osfield
9772b21e35 Added osgmovie example, derived from Ulrich Hertlien's original videotex
example, and brought up to date.
2004-01-30 14:06:29 +00:00
Robert Osfield
dea75f5510 Attempts to fix compile problems under IRIX due to namespace problems. 2004-01-29 15:47:51 +00:00
Robert Osfield
965ed49427 Improved support for handling externally set projections 2004-01-29 15:47:06 +00:00
Robert Osfield
ef13d749ae Adding scaling of skirt. 2004-01-28 14:44:35 +00:00
Robert Osfield
0300607dbb Fixed the handling of the Producer Fovy so that it accounts for Producer
now using degrees in set and get methods
2004-01-23 13:38:28 +00:00
Robert Osfield
b9f032bbb5 Updates for improvements to osgdem, such as adding support for skirt
and border into osg::HeightField, handling of computation of neigherbouring
tiles in osgdem's DestinationGraph.
2004-01-18 21:59:20 +00:00
Robert Osfield
c06c73993e Improvements to generation of terrain and texture'd LOD'd destination datasets 2004-01-16 16:39:04 +00:00
Robert Osfield
6a76810c11 Added automatic generation of LOD levels with destination graph 2004-01-15 21:07:34 +00:00
Robert Osfield
87299f4fc0 Added support for automatic subdivision of the destination graph 2004-01-12 22:03:29 +00:00
Robert Osfield
c51c2893ce Improvements from Pavel. 2004-01-11 21:33:43 +00:00
Robert Osfield
10a3accf0b Fixed consolodateRequireResolutions() methods 2004-01-10 20:58:09 +00:00
Robert Osfield
dd40692eb6 Moved the default light to be from the sky. 2004-01-07 20:58:07 +00:00
Robert Osfield
9c15baf92f Added osgsimplepager example program 2004-01-07 12:38:55 +00:00
Robert Osfield
042644df13 From Pavel Moloshtan, osgdepthshadow example 2004-01-05 09:34:28 +00:00
Don BURNS
ad97db86a2 Oops. Fixed glaring memory leak in main loop of osgsimple 2004-01-03 22:52:51 +00:00
Robert Osfield
249eddb3d8 Updates to osgGL2 from Mike Weiblen 2004-01-03 09:06:52 +00:00
Robert Osfield
2870d093f2 Added osgdistortion demo. 2003-12-27 22:17:41 +00:00
Robert Osfield
0683c1b5a8 Added support for a photo archive. 2003-12-23 23:55:06 +00:00
Robert Osfield
ca7a80685d Added beginings of PhotoArchive for storing and loading a set of
photos from an archive.
2003-12-22 21:05:10 +00:00
Robert Osfield
b890c8b97c Added support for placing pictures of backs and fronts of pages. 2003-12-20 14:25:18 +00:00
Robert Osfield
e19f87ddce Added support for tagging the required resolutions from the source data. 2003-12-19 22:55:35 +00:00
Robert Osfield
01f171f133 Added support for tracing the resolutions that are required by the destination data. 2003-12-17 17:02:23 +00:00
Robert Osfield
90642007e1 Added -losgGL2 to link line. 2003-12-17 00:58:36 +00:00
Robert Osfield
6bdbe942b1 From Marco Jez, fixes to osgFX so that effects are compiled correctly.
Fixed title name of osgkeyboardmouse example.
2003-12-16 23:43:37 +00:00
Robert Osfield
b1226cc4a9 Added two news examples, osgsimple just loads a model and then renders it in
a single window.  osgkeyboardmouse adds to osgsimple support for keyboard mouse
and picking interactions.
2003-12-15 16:46:06 +00:00
Robert Osfield
ff6b9099cf Added gemetry of photo album and page turning animation. 2003-12-15 16:40:26 +00:00
Robert Osfield
cfb14b7490 Added proper handling of unhandled file return type. 2003-12-10 15:22:05 +00:00
Robert Osfield
9780a7cbd6 Removed osg::Transform::ComputeTransformCallback from osg::Transform.
Updated various dependant files to reimplemt callbacks as Transform subclasses.
2003-12-09 14:07:44 +00:00
Robert Osfield
f46cbe60dc Added new example osgphotoalbum. 2003-12-09 12:11:21 +00:00
Robert Osfield
83bf813e58 Moved the responsibility for finding file to load on to the ReaderWriter plugins,
instead of osgDB::Registry where it original lay.  This has been done to allow
fileName strings to be encode data rather than just file names, such as one
requires when using PagedLOD along with plugins for doing dynamic tesselation.
2003-12-08 11:24:43 +00:00
Robert Osfield
db66abd6d6 Implemented duplicate removal code into TriStripVisitor and added an
extra pass to doing tri stripping in the osgUtil::Optimzer.

Added validity checks into osg::TexEnvCombine to catch eronous enumarant values.

Improved the efficient of CullingSet's handling of new transforms.

Added a copy shared subgraphs and subdivision code into osgUtil::Optimizer.
2003-12-03 21:45:32 +00:00
Robert Osfield
bd4a1cd601 From Pavel Moloshton, addition of AlphaFunc support to .ive. 2003-12-01 14:31:56 +00:00
Robert Osfield
1c2ef7d508 Updates to osgdem. 2003-11-28 14:26:51 +00:00
Robert Osfield
e7f9a51f0f Updates to osgdem + BoundingBox to support graph iterators 2003-11-27 15:13:55 +00:00
Robert Osfield
a0375f58da Added a f after 2.0 definitions in atan2 to get round stupid MS errors. 2003-11-26 13:21:40 +00:00
Robert Osfield
032909f8c7 Work in progress on osgdem example and osgTerrain::DataSet class 2003-11-25 11:40:10 +00:00
Robert Osfield
871d9c9237 Moved the unrecognized options check to after loaded 2003-11-25 11:05:22 +00:00
Robert Osfield
8fd4bbe510 Changed the shadow colour so that it is now controlled via the emissive
light material rather than ambient, this allows it to bypass any of the
osg::Light values and control the resulting shadow colour more directly.
2003-11-24 10:01:02 +00:00
Robert Osfield
9bb18750c7 Removed the ScalarBar:: from the from of the ScalarPrinter::printScalar() calls. 2003-11-21 20:21:41 +00:00
Robert Osfield
9d883176f9 Changed the main to create a Group and then add the loaded scene and HUD scene
into this.  This has been done to rework code nearer to what Stephan Huber
used to get round a crash under OSX when a model was passed in.  This crash
suggest a problem in dynamic_cast<> perhaps?
2003-11-21 14:17:26 +00:00
Robert Osfield
c41221f2ac Added usage of object cache + fixed handling of projection matrix. 2003-11-12 19:05:54 +00:00
Robert Osfield
e043f6c89d Added code to load the bluemarble.ive database instead of the texture mapped
sphere for the earth model in the logo.
2003-11-05 10:24:51 +00:00