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

341 Commits

Author SHA1 Message Date
Robert Osfield
dd6d04e088 From Andrew Bettison, "Problem: the LineStipple pattern when read from an OSG node file is always 0xFFFF, even though specified otherwise in the OSG file. 
Cause: possibly a copy/paste typo in src/osgPlugins/osg/LineStipple.cc, line 61:
  if (fr[0].matchWord("functionMask") && fr[1].getUInt(mask))

Solution: change to:
  if (fr[0].matchWord("pattern") && fr[1].getUInt(mask))"
 2008-05-27 11:07:52 +00:00
Robert Osfield
7b003b24ea Refactored DatabasePager and related classes to introduce support for 
multi-threaded paging, where the Pager manages threads of reading local
and http files via seperate threads.  This makes it possible to smoothly
browse large databases where parts of the data are locally cached while
others are on a remote server.  Previously with this type of dataset 
the pager would stall all paging while http requests were being served,
even when parts of the models are still loadable virtue of being in the 
local cache.

Also as part of the refactoring the DatabaseRequest are now stored in the
ProxyNode/PagedLOD nodes to facilitate quite updating in the cull traversal,
with the new code avoiding mutex locks and searches.  Previous on big 
databases the overhead involved in make database requests could accumulate
to a point where it'd cause the cull traversal to break frame.  The overhead
now is negligable.

Finally OSG_FILE_CACHE support has been moved from the curl plugin into
the DatabasePager.  Eventually this functionality will be moved out into
osgDB for more general usage.
 2008-05-21 21:09:45 +00:00
Robert Osfield
c4ba16f017 Added support for COLOR_BUFFER entries up to 15 2008-04-18 14:57:43 +00:00
Robert Osfield
3e94d93a66 Changed the Camera::BufferComponent::COLOR_BUFFER0 from being equal to COLOR_BUFFER 
to being COLOR_BUFFER+1 to enable differentation between non MRT and MRT paths.
 2008-04-02 13:47:45 +00:00
Robert Osfield
1d1dcf2cf3 To osg::AutoTransform added support for MinimumScale, MaximumScale and AutoScaleTransitionWidth parameters 
and a new scheme for computing the scaling when using autoscale that introduces smooth
transitions to the scaling of the subgraph so that it looks more natural.
 2008-03-18 15:37:38 +00:00
Robert Osfield
7a7c197af3 Added minimum and maximum scale support to osg::AutoTransform 2008-03-17 15:22:03 +00:00
Robert Osfield
c4d07194a2 From Art Trevs, add support for saving external shader files. 
From Robert Osfield, adding missing member variable initializes and Output::getShaderFileNameForOutput() implementation
 2008-03-04 14:04:48 +00:00
Robert Osfield
69d58d6f7c From Paul Martz, "This change adds "GL_NORMALIZE" and "GL_RESCALE_NORMAL" to .osg IO in place of the hex equivalents." 2008-02-25 15:09:56 +00:00
Robert Osfield
75b9a9c809 From Robert Osfield and Carlo Camporesi, took submission from Carlo for adding LoadingExternalReferenceMode to ProxyNode and extended it 
to include a wider range of options, also completed implementation
 2008-02-25 15:07:35 +00:00
Robert Osfield
6231c3a5a4 From Paul Martz, completion of .ive and .osg support for OcclusionQueryNode 2008-01-04 11:14:11 +00:00
Robert Osfield
b052e18f6e From Paul Martz, .osg support for OcclusionQueryNode 2007-12-21 14:49:49 +00:00
Robert Osfield
4889342c4a From Paul Martz, Introduced osg::OcclusionQueryNode with support for OpenGL occlusion query extension 2007-12-21 14:45:16 +00:00
Robert Osfield
2e821b77a2 Added support for double Vec*Array objects 2007-12-04 14:44:49 +00:00
Robert Osfield
ece7b57df2 Further steps towards reading coniguration files. 2007-09-21 13:30:33 +00:00
Robert Osfield
66cc306f18 Removed the output num_children from Group .osg output and 
removed the output of "DataVaraince UNSPECIFIED" as this is redundent
considering the default value is UNSPECIFIED.
 2007-09-11 13:47:06 +00:00
Robert Osfield
09f63eebbb Added support for reading a .osg style data from a file string when trailed by a .osgs extension i.e. 
osgviewer "osgTerrain::Terrain { ElevationLayer { CartesianLocator 0 0 1000000 1000000 Image ps_height_512.tif } ColorLayer { CartesianLocator 0 0 1000000 1000000 Image ps_texture_1k.tif } }".osgs
 2007-08-24 19:16:02 +00:00
Robert Osfield
9e2fe92ef1 From Rudolf Wiedemann, "I need to link OpenSceneGraph statically to my application, so I 
completed the new registration of the plugin-readerwriters
("REGISTER_OSGPLUGIN") according to your osgstaticviewer-example (see
attachment, based on today's svn)."
 2007-07-06 13:54:26 +00:00
Robert Osfield
eac3dc1963 From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one 
of these are public APIs and therefore will break linkage to existing
shared libraries."

Note from Robert Osfield, updated wrappers.
 2007-06-27 20:36:16 +00:00
Robert Osfield
d2ed03f931 Added istream:imbue(std::locale::classic()) setting to prevent non classic locals 
from being used when the .osg plugin reads and writes.
 2007-05-21 06:57:30 +00:00
Robert Osfield
c7fc2e018e From Andre Garneau, warnings fixes fo VC++ 2007-05-17 10:59:05 +00:00
Robert Osfield
6468905e42 From John Kelso, Added support for new Sequence options. 
From Robert Osfield, updated the above changes to the .ive loader so that the new addition were tested against the IVE version number
 2007-05-15 14:55:02 +00:00
Robert Osfield
4968eb7136 Further work on the new VBO support 2007-04-27 14:52:30 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
282f4ce0b9 Moved the TARGET_NAME setting into the OsgMacroUtils.cmake. 2007-03-19 17:24:19 +00:00
Robert Osfield
da64127539 Ran dos2unix on CMakeLists.txt files. 2007-03-19 13:26:34 +00:00
Robert Osfield
be3f61c49f From Luigi Calori, move to using local CMakeLists.txt files and explicit file lists. 
From Robert Osfield, small ammendments of the above to seperate example and application installs, and fix the osgPlugins install directory.
 2007-03-19 12:30:26 +00:00
Robert Osfield
664522fb02 Removed GL_TEXTURE_RECTANGLE_NV entries 2007-02-21 11:46:49 +00:00
Robert Osfield
291d687cc9 From Paul Martz, "Add GL_TEXTURE_RECTANGLE to list of acceptable texture modes" 2007-02-17 14:37:55 +00:00
Robert Osfield
07411f3246 Introduced new osg::Object::DataVariance type of UNSPECIFIED, and changed the deafult 
values of DataVariance to UNSPECIFIED to all types.
 2007-02-14 13:18:58 +00:00
Robert Osfield
5fddbfe85c Added support for osg::BlendColor to .osg plugin 2007-02-13 12:11:32 +00:00
Robert Osfield
c52207b637 Added new Transform::ReferenceType enum ABSOLUTE_RF_INHERIT_VIEWPOINT to support 
internal RTT cameras that wish to use the main cameras view/eye point for LOD and other
distance based tests.
 2007-02-07 16:32:14 +00:00
Robert Osfield
f5d425cd11 Fixed the output of texture files 2007-01-20 09:44:05 +00:00
Robert Osfield
ba9e355550 Added support for stencil GL_INCR_WRAP and GL_DECR_WRAP operations 2007-01-18 17:00:42 +00:00
Robert Osfield
7155f7d1b0 Various work on osgViewer library, including warp point and graphics window resize support 2007-01-01 18:20:10 +00:00
Robert Osfield
345810ef22 Added support for float or double osg::Plane, and the default osg::Plane to double. 
Performance tests on big models did not indicate any performance penalty in using doubles over floats,
so the move to doubles should mainly impact precision improvements for whole earth databases.

Also made improvements to osgUtil::PlaneIntersector and osgSim::ElevationSlice classes
 2006-11-28 16:00:52 +00:00
Robert Osfield
fd2ffeb310 Renamed osg::CameraNode to osg::Camera, cleaned up osg::View. 
Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
 2006-11-27 14:52:07 +00:00
Robert Osfield
e45245b7d6 From Farshid Lashkari, "Attached is a patch that adds the new coordOriginMode to the .osg 
reader/writer for PointSprites."
 2006-11-16 17:35:12 +00:00
Robert Osfield
dc57810d99 Removed use osg OSG_LIBS, changing to just -losg and -losgDB. 2006-09-21 08:56:19 +00:00
Robert Osfield
f0277df858 Added osg::TexMat::s/getScaleByTextureRectangleSize feature that allows 
one to use the osg::TexMat to automatically scale non dimensional tex coordinats to
the size of the last texture rectangle applied.
 2006-09-04 12:46:49 +00:00
Robert Osfield
dd6a33da49 Removed StateSet::ENCLOSE_RENDERBIN_DETAILS since it is rendendent, and 
implemented the OVERRIDE_RENDERBIN_DETAILS.
 2006-07-11 21:53:57 +00:00
Robert Osfield
e7d04408d3 From Michael Platings, added support for blend seperates to .ive and .osg 2006-07-03 09:22:11 +00:00
Robert Osfield
bf065ed3a4 From Mike Weiblen, support GLSL uniform arrays. A couple of tweaks and fixes from Robert Osfield. 2006-05-15 15:46:08 +00:00
Robert Osfield
964110f315 Completed .osg support for ClusterCullingCallback. 2006-02-23 20:37:19 +00:00
Robert Osfield
ae9e0e6838 Added initial cut of ClusterCullingCallback .osg support. 2006-02-21 21:28:57 +00:00
Robert Osfield
7d5c81bf5e From Ulrich Hertlein, spelling corrections and a few Doxgen comments. 2006-02-20 21:05:23 +00:00
Robert Osfield
b5f86d9984 Added support for an externally referenced shader file, via the keyword combinations 
file "shader.vert"

OR

   file shader.vert.
 2005-12-21 10:32:48 +00:00
Robert Osfield
d3541b96ed Replaced tabs with spaces. 2005-11-17 15:03:51 +00:00
Robert Osfield
da7f5e7e60 Added support for SourceType and SourceFormat to .osg. 2005-11-08 16:22:33 +00:00
Robert Osfield
a3f42b480c From David Spilling, fix for typo of OVERRIDE. 2005-11-07 12:41:32 +00:00
Robert Osfield
efd96108fb From Gideon May, compile fixes for OSX. 2005-11-07 11:14:23 +00:00
Robert Osfield
89b0ef09a8 Improvements to CameraNode IO support, now handles render to texture. 2005-11-03 21:35:45 +00:00
Robert Osfield
e7ac09153a Removed debugging message 2005-11-03 17:12:49 +00:00
Robert Osfield
40ef0bbdff Further work on osg::CameraNode support. 2005-11-03 17:08:40 +00:00
Robert Osfield
fb2d3ae108 Further work on added IO support from CameraNode. 2005-11-03 15:59:17 +00:00
Robert Osfield
9d9d6c5a12 Completed osg::CameraView support in .osg and .ive formats. 2005-11-03 12:25:25 +00:00
Robert Osfield
4c13328d98 Added CameraNode.cpp and CameraView.cpp 2005-11-03 09:03:46 +00:00
Robert Osfield
5dee96c14f Inital work on adding .osg support for CameraNode and CameraView. 2005-11-02 19:52:58 +00:00
Robert Osfield
d1108ea862 Added support for "-O OutputTextureFiles" options string in .osg plugin to 
allow texture files to be written out when writing out a .osg file.
 2005-09-19 14:07:44 +00:00
Robert Osfield
47651d3c8d Added glSissor suppor via new osg::Scissor class. 
Added .osg support for osg::Scissor.
Added .ive support for osg::Viewport and osg::Scissor.
 2005-07-22 09:31:19 +00:00
Robert Osfield
d35ea68f3e Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form 2005-07-15 14:41:19 +00:00
Robert Osfield
facb0e2638 From Pavel Moloshtan, Byte2,3,4 and Short2,3,4 classes and their Array counterparts. 
With a few build tweaks and bug fixes by Robert Osfield.
 2005-07-05 15:57:53 +00:00
Robert Osfield
27c4c6a956 Moved the set/getName() support from osg::Node etc into the osg::Obejct 
base class
 2005-06-08 13:16:19 +00:00
Robert Osfield
e0cf176590 From Mike Weiblen, added GLSL datatypes mat2 and mat3 to osg::Uniform, with .osg and .ive support 2005-06-08 10:36:56 +00:00
Robert Osfield
955cc1ec2a Added s/getClearMask() support to osg::ClearNode, osgUtil::SceneView and the 
.osg plugin.
 2005-05-18 19:55:14 +00:00
Robert Osfield
83d3f7639f Changed the default behavior to not writing out proxynode children. 2005-05-17 13:50:07 +00:00
Robert Osfield
f9bc0454f8 Improved the handling of writing out of proxy node files. 2005-05-17 13:47:13 +00:00
Robert Osfield
54abc6f471 Added IO support for new intialBound and callbacks to .osg, and initialBound to .ive 2005-05-12 14:48:56 +00:00
Robert Osfield
4c613896ff Fixed compile warning. 2005-05-11 13:40:07 +00:00
Robert Osfield
fb34b22e34 Cleaned up API of BindAttributeLocation, added deletion of shader objects. 2005-05-11 11:41:44 +00:00
Robert Osfield
4811adda0a From Farshid Lashkari, and non power of two resize hint support to .osg ascii 2005-05-10 08:07:37 +00:00
Robert Osfield
538ced579e Removed deprecated API in preparation for 0.9.9 release. 2005-05-09 13:09:07 +00:00
Robert Osfield
a0ccaf5f95 Removed Impostor.cpp 2005-05-03 06:23:02 +00:00
Robert Osfield
03232ec667 Moved osg::Impostor to osgSim::Impostor, as Impostor isn't a core feature. 2005-05-01 19:48:49 +00:00
Robert Osfield
483242c9db Cleaned up the xine plugin to better handle unsupported video files. 2005-04-22 13:32:46 +00:00
Robert Osfield
8b4f9dce60 From Mike Weiblen, added support for samplers and mat4 to .osg 2005-04-22 07:13:50 +00:00
Robert Osfield
b699c8e9ab Further work on uniforms support in .osg 2005-04-18 13:36:10 +00:00
Robert Osfield
59ec503fc9 Added more complete support for writing out data of Uniforms 2005-04-18 13:29:59 +00:00
Robert Osfield
648677ce44 Added next stage of support for osg::Uniform in .osg plugin 2005-04-18 12:34:28 +00:00
Robert Osfield
20f26ee011 Fixed wrapping of text string to allow internal "" strings 2005-04-16 10:18:56 +00:00
Robert Osfield
f4be038d46 Moved Plane and Quat << operators into the io_utils headers 2005-04-15 20:59:24 +00:00
Robert Osfield
47a2b3aa23 From Paul de Repentinguy, DXF loader plugin. Ported to Linux by Robert Osfield. 2005-04-15 20:39:06 +00:00
Robert Osfield
d31cd3dce6 From Mike Weiblen, updates to GL Shadler Language support 2005-04-08 13:10:44 +00:00
Robert Osfield
a8d4da8163 Added #include <osg/io_utils> 2005-04-08 09:36:42 +00:00
Robert Osfield
84e8338be1 From Mike Weiblen, "adds sourcefiles for beginnings of .osg fileformat i/o support 
> - enhancemens to core GLSL classes to support file i/o"
 2005-04-07 20:23:58 +00:00
Robert Osfield
816df3a1d0 Fixes for VS6.0 build 2005-04-04 12:24:18 +00:00
Robert Osfield
667ecd91f1 From Alberto Farre, fixes to ProxyNode. 2005-03-18 10:00:16 +00:00
Robert Osfield
c59b28ac3f Added support for event callbacks 2005-03-07 14:16:15 +00:00
Robert Osfield
238341b0da From Sebastien Grignard, added support for reading and writing callbacks 2005-03-07 14:14:35 +00:00
Robert Osfield
5684a130b7 From Alberto Farre, addition of ProxyNode, with support in .osg, .ive and .flt loaders 2005-03-07 14:06:09 +00:00
Robert Osfield
9b7678138f Changed the LightSource::setReferenceFrame() read code so that it doesn't 
enable the culling active flag if its was already set to false.
 2005-02-06 10:14:26 +00:00
Don BURNS
7573cc6036 Added Viewport State Attribute to .osg reader/writer 2005-02-02 22:13:07 +00:00
Robert Osfield
f7166c4541 Fixed the input/output handling of ReferenceFrame values to be RELATIVE and ABSOLUTE 
rather than long original names.
 2005-01-21 19:21:01 +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
66396e9452 Teaks to API to make it easier to generate wrappers automatically 2004-12-13 01:07:24 +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
5c5ceef90d Added support for local relative paths 2004-11-23 10:46:37 +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
a6369da4f4 Moved Registry::CacheHintOptions into ReaderWriter::Options 2004-11-22 14:10:12 +00:00
Robert Osfield
3b092690ff From Johan Nouvel, added support for range mode 2004-11-20 11:45:14 +00:00
Robert Osfield
7b543a5009 Added check for extension. 2004-11-18 11:53:51 +00:00