FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,810 Commits 1 Branch 26 Tags 73 MiB
4fd2352afa
Commit Graph

444 Commits

Author SHA1 Message Date
Robert Osfield
3cdf42e599 Fixed Win32 compile problem. 2003-01-23 10:11:11 +00:00
Robert Osfield
9aaf5a560b Changed the implementation of the texture objects and display list to delete 
caches so that they use a std::vector<> swap on the internal data structures
when ready to delete to minimize the amount of time that a race condition
condition can happen.
 2003-01-22 23:34:18 +00:00
Robert Osfield
fbeae00fa2 Fixed handling of rotations reading from .osg of osg::Shapes. 2003-01-22 16:17:56 +00:00
Robert Osfield
d2b7340fb5 Changed the decal=true setting to decal=false to make sure that textured models 
come out lit ok.  The makes the assumption that colour values on the objects
and realistic, if they arn't then decal texture can produce better results..
 2003-01-22 12:25:04 +00:00
Robert Osfield
1c56ee52a2 Changed the local header includes from <> to "" to help the OSG compile. 2003-01-21 21:02:17 +00:00
Robert Osfield
87973523ad Added gaurds around alpha function value to catch erroneous values before they 
are passed on to the OSG.
 2003-01-21 16:02:29 +00:00
Robert Osfield
2261b1cc86 From Joseph Steel, addition of texture filter modes to txp plugin. 2003-01-21 09:09:48 +00:00
Robert Osfield
2ac175484a Updates from Pavel. 
1. Storing color of geometry in ColorArray e.g. its don't work when
    lighting off.

  2.  Detecting of alpha channel and automatically enabling blending.
 2003-01-20 10:41:21 +00:00
Robert Osfield
ec30f7d8a6 Update the ReaderWriterATTR file so that it used the definitions that Joseph 
Steel obtained from MPI.

Removed the unique child check from the flt::PrimRecord and osg::Group, this
allows more flexibility when specifing nodes, and is faster..
 2003-01-20 09:56:09 +00:00
Robert Osfield
3723dcda1d From Ruben, updates to the IV/VRML1 loader to handler large datasets. 2003-01-20 09:09:46 +00:00
Robert Osfield
4dd273de70 Added support for ReferenceFrame into osg::LightSource, modified the .osg 
plugin and cull visitor to account for this change.
 2003-01-16 16:37:24 +00:00
Robert Osfield
d6480b0425 Warning fix for Win32. 2003-01-15 20:57:48 +00:00
Robert Osfield
5960307703 Patch from Joseph Steel, added missing check for the mipmap usage. 2003-01-15 11:33:33 +00:00
Robert Osfield
af6a6ff9f0 Fixes for Win32 build. 2003-01-14 16:39:41 +00:00
Robert Osfield
3365634a01 Submission from Joseph Stell, added LoadModels to TerrapageNode. 2003-01-14 14:00:09 +00:00
Robert Osfield
7ee6d4f3f4 Clean up to the cross platform support in DirectX plugin. 2003-01-13 14:11:06 +00:00
Don BURNS
0adc037d20 ReaderWriterDirectX.cpp needed some std::'s 2003-01-11 20:56:29 +00:00
Robert Osfield
9bd4145405 From Ulrich, fixes to double to float conversion warnings under Windows. 2003-01-11 20:43:47 +00:00
Robert Osfield
e8ddbdd195 Updates from Ulrich. 2003-01-10 17:06:20 +00:00
Robert Osfield
f790d1ff15 Added missing header for new matric reading and writing methods. 2003-01-10 16:56:39 +00:00
Robert Osfield
f36bc69c58 Made the more of the OSG's referenced object desctructors protected to ensure 
that they arn't created on the stack inappropriately.

Split the implemention of Matrix up so that it is a simple no referenced counted
class and can be safefly created on the stack.  To support referenced counting a
seperate subclass now exists, this is RefMatrix which inherits from both Matrix and
Object.
 2003-01-10 09:25:42 +00:00
Robert Osfield
ba2c3a187d From Ulrich Hertlein, DirectX .x model loader plugin. 2003-01-08 22:52:27 +00:00
Robert Osfield
a1f6b8730b Added Shape.cpp to cvs resposity. Shape.cpp adds support for the various 
osg::Shape in the .osg file format.
 2003-01-08 16:33:02 +00:00
Robert Osfield
6727b8d5f7 Cleaned up the code for the animation flags of the group record. 2003-01-08 16:30:48 +00:00
Robert Osfield
ba34880464 Added support for reading and writing Sphere, Box, Cone, Cylinder and Grid shapes. 2003-01-08 14:32:13 +00:00
Robert Osfield
e6b64a5550 Added support for sharing arrays in the .osg format for osg::Geometry. 
Fixed the osgUtil::Optimizater so it takes into account sharing of arrays when
deciding whether an geometry can be merged or not.
 2003-01-07 16:29:07 +00:00
Robert Osfield
53204898f3 Fixes for Irix64 build. 2003-01-06 23:19:42 +00:00
Robert Osfield
3ef3666d0f Added new ARB vertex program state attribute and demo program, 
sent in my Brede Johansen.
 2003-01-04 20:45:53 +00:00
Robert Osfield
7b6d802131 Fixed options code. 2003-01-04 20:43:27 +00:00
Robert Osfield
fe64942c54 Added a AnimationPathCallback which can update both a MatrixTransform and a 
PositionAttitudeTransform, removed the equivialnt callbacks once found in these
transform classes.

Changed the NodeCallback class so its derived from osg::Object instead of
osg::Referenced to allow it to be saved out in the .osg format.

Added support for Update and Cull callbacks into the .osg file format.

Added support for AnimationPathCallback into the .osg file format.
 2003-01-02 20:10:04 +00:00
Robert Osfield
6ee563ad55 Updates the terrapage to try and make it thread "safer" when used with the OSG. 2002-12-21 19:41:27 +00:00
Robert Osfield
e9287afd5e Turned display lists off in the osg::Geomety created by the terrapage loader, 
this is done because terrapage will dynamic page in and out geometry so we
don't want to keep creating and deleting display lists.
 2002-12-21 11:30:54 +00:00
Robert Osfield
adf5c91808 Renamed all instance of AppCallback/AppVisitor to UpdateCallback/UpdateVisitor 
inline with the decision to rename the "app phase" the "update phase".
 2002-12-19 15:55:40 +00:00
Robert Osfield
eb42926ab1 Changed the remaining #include <> to #include "" to get things compiling under VS. 2002-12-19 10:32:02 +00:00
Robert Osfield
a2e76e4ab0 Removed the reference of Sequence from Switch. 2002-12-18 11:43:39 +00:00
Robert Osfield
30a665288e Removed the osg:: from the front of the Group::computeBound() method to keep 
things compiling under Windows.
 2002-12-18 10:17:52 +00:00
Robert Osfield
677764bed9 Changed the <*.h> to "*.h> in the terrapage plugin to get it compile under Windows. 2002-12-18 09:50:36 +00:00
Robert Osfield
6d4e13ab1b From Daniel Sjölie, support for reading comment records into description fields. 2002-12-17 17:22:06 +00:00
Robert Osfield
c82927293e Moved the include/osgTXP back into src/osgPlugins/txp as a seperate include directory is no longer required. 
Removed the osgtxp demo as it is no longer required.
 2002-12-17 16:07:59 +00:00
Robert Osfield
ee3348afc9 Added txp::TerrapageNode to the txp plugin, and implemented the node so that it 
automatically assign handles the updates of eye points and database merges.
 2002-12-17 15:41:05 +00:00
Robert Osfield
00cc3a1833 Converted the instance of osgNew and osgDelete back to new and delete as part 
of depecating the include/osg/MemoryManager
 2002-12-16 13:40:58 +00:00
Robert Osfield
cb87e7b3bc Integrated further updates from Geoff on the Geo loader. 2002-12-16 10:22:37 +00:00
Robert Osfield
88424530b4 Changed the std::hex and std::dec to hex and dec to get it compile under VisualStudio, 
and added a using namespace std to keep it compiling on all other compilers!
 2002-12-16 10:05:55 +00:00
Robert Osfield
c6b6e200a4 Added supported for setting animation path on MatrixTransform's. 2002-12-16 09:55:30 +00:00
Robert Osfield
c32585a046 Added a check for extension of a filename to the gif loader, since it looks 
like the isn't reconginizing rgb files as not being gif.
 2002-12-14 06:42:56 +00:00
Don BURNS
25b333b05b Move TrPageViewer.cpp to src/Demos/osgtxp 2002-12-13 20:28:58 +00:00
Robert Osfield
a388800c95 Merged fixes to warnings in geo plugin from Geoff. 2002-12-13 19:41:59 +00:00
Robert Osfield
591ab7c52e Removed erroneous character from end of file. 2002-12-11 16:27:01 +00:00
Robert Osfield
2e3bf33ce6 Removed the duplicate file out from the GEO plugin. 
Changed the osglogo to reference a jpeg instead of a tiff one.
 2002-12-11 14:30:27 +00:00
Robert Osfield
0e6d702906 Fixes for Win32. 2002-12-11 10:07:14 +00:00
Robert Osfield
442fa34aaa From Ulrich Hertlien, fix for new changes in osg::Switch interface. 
Small clean to changes by Robert.
 2002-12-10 20:26:56 +00:00
Robert Osfield
530b85c807 Updates from Geoff Michel to geo loader and demo. 2002-12-10 20:00:56 +00:00
Robert Osfield
6efe79c33c Changed cout to notify. 2002-12-09 09:26:49 +00:00
Don BURNS
5622e704cf fixed small typo (forgot std::) 2002-12-09 06:00:57 +00:00
Robert Osfield
55d04ef381 Modifed the .attr loaders handling if TX_BILINEAR minification filter so that 
it remaps it to LINEAR_MIPMAP_LINEAR to get round image quality issue of some
OpenFlight databases.
 2002-12-08 17:22:20 +00:00
Robert Osfield
109f6f22fe Updated the Switch, Sequence and Group classes so that they all used a 
similar style removeChild() mechansim.

Made the old style osg::Switch::setValue() method deprecated.
 2002-12-07 21:18:12 +00:00
Don BURNS
97ec694e21 Fixes to txp loader 2002-11-29 16:14:03 +00:00
Robert Osfield
aa3d887e94 Added check of translucency of an image via osg::Image::isImageTranslucent(). 2002-11-25 16:40:30 +00:00
Robert Osfield
b113dfeb73 Added extra check to the freeing of memory. 2002-11-25 16:30:34 +00:00
Don BURNS
12e922bc3c Added Paging TerraPage loader and osgTXP library. 2002-11-24 21:36:05 +00:00
Don BURNS
4acee51414 Merged in Joseph Steel's updates to rgb plugin 2002-11-22 17:36:46 +00:00
Robert Osfield
22c313cf3e Warning fixes. 2002-11-22 09:46:25 +00:00
Don BURNS
65fec63389 Fixes for IRIX build 2002-11-22 05:00:43 +00:00
Robert Osfield
de85272032 Moved the code to create StateSet around textures into flt::Pool::getTexture so that 
the code associated with loading textures is done is just one place.
 2002-11-20 14:40:33 +00:00
Robert Osfield
e02ae73edc Added osgSim library which encapulsulates light points. 
Added osglightpoint demo.
 2002-11-19 10:57:40 +00:00
Robert Osfield
b89e7282ed From Jason Daly, fix for long file names on sequence nodes. 2002-11-14 15:30:28 +00:00
Robert Osfield
0980eeda1e Updated the plugins so they do the extension checking with a non 
case sensitive comparison.
 2002-11-14 09:03:31 +00:00
Robert Osfield
4617294722 Fixes to build in VS7.0 2002-11-08 15:56:49 +00:00
Robert Osfield
a059191c1c Updates to GEO loader from Geoff Michel. 2002-11-08 12:56:45 +00:00
Robert Osfield
0cd0c575f0 Fixes for VisualStudio6.0 build. 2002-11-08 08:51:30 +00:00
Robert Osfield
ccd208422f Converted usage of GLuint to usigned int, in hope that it will get round the 
warnings generated under OSX.
 2002-11-08 08:34:06 +00:00
Robert Osfield
e852ee6dd8 Commented back in LIBS into Makefile for OSX build. 2002-11-08 08:12:18 +00:00
Robert Osfield
23064c9c64 Fixes for VisualStudio build and OSX build. 2002-11-08 08:11:12 +00:00
Robert Osfield
16d53271cc Compile fix from Duvan Cope. 2002-11-07 16:08:37 +00:00
Robert Osfield
2a35dab922 Renamed Primitive:: to PrimitiveSet. 2002-11-07 14:44:01 +00:00
Robert Osfield
c84cdf159c Updates to GEO loader from Geoff Michel. 2002-11-07 13:47:39 +00:00
Robert Osfield
15773d920a Fix for build under Linux. 2002-11-07 08:48:30 +00:00
Don BURNS
7669b96c28 Changed a couple of const/non-const discrpancies between header and source 
for TexGen.  Removed external library dependencies in plugin makefiles
 2002-11-06 18:39:32 +00:00
Robert Osfield
3bd400130c Name change and const change of Drawable::drawImmediateMode(State&) to 
Drawable::drawImplementation(State&) const.   Various updates to the
rest of the OSG to accomodate this.
 2002-11-06 15:43:11 +00:00
Robert Osfield
afa27a13ec From Jason Daly, fix for 14.2 color records in versions of OpenFlight files. 2002-11-05 07:50:40 +00:00
Robert Osfield
a6eafa79e2 From Ulrich Hertlien, added ReaderWriter::Options to the osgconv and pfb plugin 
so that all the pfi files can be converted to rgb be the plugin.
 2002-11-04 09:08:50 +00:00
Robert Osfield
6bb8002116 Added in guard to png loader so that it only accepts png files. This has been 
added since the png loader itself doesn't not seem robust enough at detecting
non png files.

Added a tab in to the flt code to make it more obvious what is happening in
the flow of the code.
 2002-11-04 08:40:51 +00:00
Robert Osfield
92895370f7 Futher fixes for VisualStudio.NET compilation. 2002-11-01 15:11:05 +00:00
Robert Osfield
f74b4ec847 Fixed VisualStudio7.0 compile error related to an std::vector<>::iterator 
no longer being a pointer, fixed by using a &(*itr).
 2002-11-01 12:48:15 +00:00
Robert Osfield
24746728e4 From Geoff Michel, added AC3D .ac and GEO .geo loaders. 2002-10-31 12:51:09 +00:00
Robert Osfield
85af8cc4ba Yefei He's updates to Pool and flt2osg to use lazy loading of textures from a 
texture pallette.
 2002-10-31 10:35:15 +00:00
Robert Osfield
aa5d172f99 Updated osgText .osg support so that it handles text via the osgDB::Outpur::wrapString() method. 2002-10-30 12:56:55 +00:00
Robert Osfield
32c6a7809a Updated the handling of string in the .osg reading and writing so that it 
handles the use of " quotes inside the string.
 2002-10-28 12:55:19 +00:00
Robert Osfield
18d99c06e4 Updated the min and mag filter modes to be more appropriate, still some 
of the FLT modes havn't been mapped across as its is not obvious how to map
them to OpenGL/OSG.
 2002-10-25 09:34:51 +00:00
Robert Osfield
761fc0574f Merged Pavel's updates to LWO2 for handle multiple texture layers. 2002-10-18 12:47:36 +00:00
Robert Osfield
00fd58283c Added extension checking to the rgb and bmp write of images. 2002-10-18 12:23:42 +00:00
Robert Osfield
ab59703e54 Fixed compile error under Windows. 2002-10-17 11:39:04 +00:00
Robert Osfield
6c0861ef80 Maded the "flt::Registry::getPrototype: Unkown opcode:" message a INFO level 
notify message rather than a NOTICE.
 2002-10-10 09:42:41 +00:00
Robert Osfield
2e92e7d242 Made the warning about a mis-matching in the number of children in a switch 
a INFO level notify message rather than a WARN.
 2002-10-10 09:39:09 +00:00
Robert Osfield
88ecacfd7a Changed the default value of StandardOrientation to true, to fix orientation 
problems which commonly occur with png files.   Leaves the quesition of how to set
this value automatically.
 2002-10-09 15:41:22 +00:00
Robert Osfield
c59fc9a2b7 Fixed a bug in the Optimizer where BIND_PER_PRIMITIVE_SET primitives where being eroneously merged. 
Added missing support for reading geometry indices from the .osg format.

Added handling of geometry indices into the primitive functor in osg::Geometry.

Moved the method implementions of AnimationPathManipulator into src/osgGA and added extra convinience
methods for setting the manipulator with an hand built AnimationPath.

FCVS: 	VisualStudio/osgPlugins/iv/iv.dsp
 2002-10-08 14:10:55 +00:00
Robert Osfield
70861ef70e Converted osg::LOD from used n+1 successive ranges to n min/max ranges, 
one min/max pair per child. Converted the rest of the OSG to use the new
osg::LOD node.
 2002-10-06 20:33:13 +00:00
Robert Osfield
84332f5b77 Fixes for Win32 build. 2002-10-04 16:40:45 +00:00
Robert Osfield
4a3cc5c182 Implemented OpenFlight style switches so that each child of a switch can now 
be individually turned on or off.  Moved the OpenFlight code across to use the
new scheme, removing the old hack of using node masks to achieve the same end
result.
 2002-10-04 14:50:33 +00:00
Robert Osfield
0a5ed26940 Moved the new osg::IndexedGeometry class over the top of the the existing 
osg::Geometry class, and removed the temporary IndexedGeometry.  Port the rest
of the OSG across to account for the change in method calls -
osg::Geometry::addPrimitive(..) becomes osg::addPrimitiveSet(..)
 2002-10-02 13:12:16 +00:00