Commit Graph

157 Commits

Author SHA1 Message Date
Robert Osfield
261f4a3b1c From Terrex and Andrew Sampsom and Don Tidrow and Robert Osfield,
email comments from Andew Sampson,

"I've contacted Terrex, and obtained the 2.2 version
of their trpage library.  The library included a
fork of OSG 0.9.8's txp plugin, modified to load 2.1+
txp DBs.

I've done the work of incorporating the changes made
to OSG's txp plugin since 0.9.8 into Terrex's fork.
The forked version is now up-to-date with the changes
made to OSG 0.9.9 and 1.0.

Terrex made a lot of changes (especially differences
in whitespace), so the diff between the forked version

and OSG 1.0's txp plugin is yucky.  I did my best, but

keep in mind that this is the result of a 4-way merge
(kinda... terrex-0.9.8, stock-0.9.8, stock-0.9.9,
stock-1.0).

I really want to see this forked version merged back
into the main OSG branch.  The new features offered by

this version of the plugin (2.1+ support, variable
LOD support, bug fixes) are worth the trouble."

--

Don Tidrow then took this code and added his work.

--

Robert Osfield then fixed all the warnings that abound in the trpage code base.
2006-06-27 10:07:42 +00:00
Robert Osfield
d43dbaeadd Build fixes 2006-03-14 13:18:21 +00:00
Robert Osfield
d50f2e3add From Andrew Sampson, "The terravista terrain generation tool can insert references to external model files into a terrapage tile. It unfortunately does not update the bounding sphere of that tile to include the extents of the external model. This means that if a large model (such as an airfield model) is attached to a tile, the model will disappear when the tile is off-screen (outside the view volume), even though the model is on-screen." 2006-03-13 21:20:07 +00:00
Robert Osfield
b324156ec8 From Thom DeCarlo, build fix for Cygwin. 2005-12-01 13:38:27 +00:00
Robert Osfield
a44f0cf25a From Eric Wing, warning fixes for gcc4.0/OSX. 2005-11-22 09:51:02 +00:00
Robert Osfield
8289eecb7e From Roger James, reworked the export of std::vector<> on standard types to prevent
problems with .lib being built for all targets under VS7.x
2005-11-21 13:51:24 +00:00
Robert Osfield
71e202cb38 Warning fixes. 2005-11-15 11:39:48 +00:00
Robert Osfield
030fe7d9ea From Steve Lunsford, "Attached is a copy of TXPNode.cpp with the repaired computeBounds call. I
discovered that TXPNodes were being culled out prematurely because the
loaded sub-tiles resulted in a computed bounds that was smaller than the
extents indicated in the archive.  I think this fix should be fine.  I can't
think of any reason why we would want to use anything other than the archive
extents."
2005-10-31 16:40:23 +00:00
Robert Osfield
280f50b3d9 From Don Tidrow, removed unncessary includes. 2005-10-25 09:43:37 +00:00
Robert Osfield
f7bd1fc456 From Don Tidrow, "I discovered that externally-referenced models in the TXP format didn't
get positioned correctly when the TXP database was built using the
'tile-offset' mode.  I've included a tarball with what I believe are the
needed changes - they work for the sample databases I have available,
but not all conditions have been tested.  I've set things up such that
these changes shouldn't affect 'normal' txp databases."
2005-10-24 11:34:12 +00:00
Robert Osfield
2092016c7b From Don Tidrow, Added support for locally referenced origins. 2005-09-27 14:48:09 +00:00
Robert Osfield
6fc00a2613 From Mathia Walker: bug fix to LOD ranges in TXP plugin to avoid cracks:
"I took a closer look at the conditional code in
SeamFinder::seamReplacement().

Because _info.minRange is a double and lod->getMinRange(0) is a float,
the difference will be calculated with double precision. If
_info.minRange is cast as a float it is exactly the same value as
lod->getMinRange(0) and the difference is exactly zero.

So if you change


 if((fabs(_info.minRange-lod->getMinRange(0))<0.001)&&(fabs(_info.lod0Range-lod->getMaxRange(0))<0.001))

to


 if((fabs((float)_info.minRange-lod->getMinRange(0))<0.001)&&(fabs((float)_info.lod0Range-lod->getMaxRange(0))<0.001))

it works a lot better."
2005-06-06 10:18:33 +00:00
Robert Osfield
bf4d63f6ea Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.
2005-05-12 14:03:22 +00:00
Robert Osfield
bdc7e8b4a9 From Don Tidrow, "I added some code to assign the archive pointer in TXPnode
with the archive that ReaderWriterTXP actually loads.  I also added a
function in TXPArchive to help in manipulating the lightpoints."
2005-05-11 19:34:03 +00:00
Robert Osfield
2bb2d9bb37 From Bob Kuehne, fixes for OSX 10.4 build. 2005-05-03 14:31:01 +00:00
Robert Osfield
7de1265059 From Don Tidrow, spelling fixes 2005-05-01 10:34:48 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
Robert Osfield
a0ba625cb0 Property API clean to smooth the task of generating wrappers. 2004-12-17 01:06:33 +00:00
Robert Osfield
d9b9a6f1f8 Made read/write methods in ReaderWriter all const to facilate multi-threading 2004-11-23 15:29:52 +00:00
Robert Osfield
ce07879e2e Moved plugins across to using ReaderWriter::Options* for search paths in addition
to standard osgDB::DataFilePaths
2004-11-22 23:54:45 +00:00
Robert Osfield
1f5b044c71 Made ReaderWriter::className const 2004-10-26 10:26:43 +00:00
Robert Osfield
6d7a046160 Added usage of std::vector<> and ref_ptr<>'s to avoid memory leaks 2004-09-15 15:09:46 +00:00
Robert Osfield
568bd8f945 Fixed keyword used for setting the database name. 2004-09-08 18:14:04 +00:00
Robert Osfield
a9c731eff2 Quick fix to crash in TXPNode. 2004-09-08 15:14:18 +00:00
Robert Osfield
e0a3e687ec Changed the wrap mode from CLAMP to CLAMP_TO_EDGE 2004-09-07 10:09:52 +00:00
Robert Osfield
b57a4ec323 From Marco Jez, VS.NET warning fixes. 2004-08-05 13:41:52 +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
7a7358553f Fixed warning 2004-08-02 15:52:50 +00:00
Robert Osfield
2d901bf7ee Fixed warnings 2004-08-02 14:52:24 +00:00
Robert Osfield
2d35b3cc27 Changed Billboard::g/setPos(..) to g/setPosition(..). 2004-06-14 19:34:43 +00:00
Robert Osfield
77f9a4d083 Added searching of the filepath. 2004-04-21 13:20:48 +00:00
Robert Osfield
eb21da4d29 From Boris Bralo, Added std:: in front of getline. 2004-03-05 20:07:01 +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
bf6f27f6d3 Changed fonts to lower case. 2004-02-05 11:53:09 +00:00
Robert Osfield
37ec69a397 From Nick, Improved support for 3D labels. 2004-02-05 11:39:12 +00:00
Robert Osfield
4723b8a059 Commented out the PagedLOD priority offset to leave it at its default
values, so not to force the loading of distance children before near ones,
letting PagedLOD set priorities simply on the depth into a child range.
2004-02-01 17:21:12 +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
28ce0c232b Re-enabled the unref image of texture apply, since the bug of disappearing
textures was due to a bug in DatabasePager.
2004-01-26 14:52:11 +00:00
Robert Osfield
a32759eafb Removed Texture unref on apply. 2004-01-26 13:55:17 +00:00
Robert Osfield
fbd7a45b8e Fix to computation of size of texture in presense of compressed textures + mipaplevels<=1 2004-01-26 09:01:08 +00:00
Robert Osfield
b10393d001 From Nick, added Text support. 2004-01-25 13:52:55 +00:00
Robert Osfield
d594982dd2 Added support for copying tex coord data directly from prpgGeometry. 2004-01-22 14:24:51 +00:00
Robert Osfield
c49be54142 Added setLODScale into TileMapper traversal 2004-01-22 12:21:59 +00:00
Robert Osfield
a5dd1951fc Added back in handling of non seam children in seam subgraphs, now uses
a seperate group to enclose both the seam and the non seam children.
2004-01-22 11:33:40 +00:00
Robert Osfield
9801bb5cfc From Nick, addition of pruning to remove redundent local materials. 2004-01-22 10:55:56 +00:00
Robert Osfield
2fe34c0b6d Added setName("TileContent") on the subgraphs that represent the contents
of the tiles, this name is then searched for during the TileMapper pre
cull traversal to help cut short traversals, and thereby improve its performance.
2004-01-22 10:43:59 +00:00
Robert Osfield
57a8e5a916 Commented back in osg::Material settings 2004-01-21 19:13:09 +00:00
Robert Osfield
9d1ace20d9 Added new mechanism for handling Seams. 2004-01-21 17:26:23 +00:00
Robert Osfield
2f194ad5a0 Build fix. 2004-01-20 10:02:45 +00:00
Robert Osfield
8dd9d163fc Upates from Nick. 2004-01-19 15:55:51 +00:00