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

13182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
2a84719f4a From Cedric Pinson, gles and osgjs plugins that support conversion of OSG loaded models into a form that can be used with osgjs JavaScript library 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14770 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-09 11:27:26 +00:00
Robert Osfield
9e2c23c9d3 Update AUTHORS file for 3.3.6 dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14768 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-05 19:53:17 +00:00
Robert Osfield
6a860e5e82 Updated dev release number 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14767 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-05 19:33:17 +00:00
Robert Osfield
e5b533726e Updated ChangeLog for dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14765 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-05 19:26:08 +00:00
Robert Osfield
ed9502e017 Added check for newline at end of version line, and of it's not add a '\n' 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14761 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-05 10:53:28 +00:00
Robert Osfield
efb90a6a80 Updated SO_VERSION after changes to osgPresentation 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14760 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-04 18:39:04 +00:00
Robert Osfield
8c8b8f3305 Restructed the osgPresentation and present3D directories back to the structure that was present in OSG-3.2 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14759 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-04 18:36:44 +00:00
Robert Osfield
26d1679248 Removed the experiemental osgPresentation classes. These are only partially functional and not appropriate for the stable OSG-3.4 release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14758 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-04 17:42:30 +00:00
Robert Osfield
412a9154c3 Updated AUTHORS for 3.3.5 dev release 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14756 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-03 15:26:15 +00:00
Robert Osfield
66aef5dfc9 Fixed ClusterCullingCallback parser problem due to osg::Callback not being included in inheritance list 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14755 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-03 14:59:37 +00:00
Robert Osfield
5346e7772a Restructed the checks in the CollectLowestTransformsVisitor::removeTransforms() to avoid benign case being flagged as warning. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14753 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-03 12:56:09 +00:00
Robert Osfield
ec6edf535d From Miha Ravselj, "Regarding previous submission it was only partial solution. After further testing I found similar bug also in ClearNode serializer. 
//GLbitfield mask = GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT;
This line was problematic since it produced incorrect result when let's say COLOR flag is serialized
it should be null as in Camera serializer or in a proposed BitFlagsSerializer


This line of code caused that whenever only GL_COLOR_BUFFER_BIT bit was written and on value read GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT was restored instead of GL_COLOR_BUFFER_BIT only.

//GLbitfield mask = 0; //this resolves the issue same as in camera
Also same bit-wise comparison bug was also present in write method.
-------------------------------------------------------------------------------------

As you can see there are total 3 bit mask serializers in OSG and all 3 had bugs so I decided to add ADD_BITFLAGS_SERIALIZER and replace USER serializers in osg::Camera, osg::ClearNode and osgText::TextBase. I have made sure that bitflags serializer does not break backwards-compatibility since it uses same code as user serializer does in all 3 cases. (see tester.cpp on how compatibility test was performed)"



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14752 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-03 12:03:23 +00:00
Robert Osfield
4c4738eced Re-organized the #ifdef's to avoid usage of glPolyginMode under GLES 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14751 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-03 12:00:52 +00:00
Robert Osfield
925c37b783 Updated SO_VERSION to take account of API changes in osgDB 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14749 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-02 14:38:17 +00:00
Robert Osfield
58edd10d04 From Johannes Scholz, "Attached you find a patch for osgDB::OutputStream and osgDB::InputStream to include osg::Image::data() using Base64 encoding inside the ASCII OSGT, if WriteImageHint=IncludeData is set, only." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14748 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-02 12:11:43 +00:00
Robert Osfield
1d9e7f144b From Michael McDonnel, "The tessellation shader example has a small bug.The middle of the 
geometry is clipped as soon as it is tessellated. The clipping is
probably caused by rounding errors because it is only in one spot. The
clipping disappears when the camera is moved, and reappears when it is
moved back. Expanding the the bounding box fixed the clipping bug."

Tweaked by Robert Osfield to expand it to a -1 to 1 unit box.
Actual clipping bug is not due to rounding errors but the shaders creating vertices outside the bounding box of the original input vertices


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14747 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-02 12:09:25 +00:00
Robert Osfield
0a83632f0a Fixed StateSet::Define names to match OpenSceneGraph-Data/shaders. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14745 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-01 15:20:37 +00:00
Robert Osfield
321750d72d From Jannik Heller, "I noticed the rotation in the OrbitManipulator depends on the framerate. To reproduce this issue, start the osganimate example, rotate the model with the left mouse button, then let go of the mouse button while still moving. You will notice that with V-Sync enabled, the model rotates slower. 
The OrbitManipulator calculates a scale to counteract the framerate dependency, but it turns out this scale wasn't used for the rotation yet."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14744 16af8721-9629-0410-8352-f15c8da7e697
 2015-03-01 11:08:58 +00:00
Robert Osfield
e3e1a55702 Updated version number after dev release. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14740 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-27 10:01:56 +00:00
Robert Osfield
e9f497aa1f Updated ChangeLog and Contributors to fix trailing spaces 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14738 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-27 09:47:58 +00:00
Robert Osfield
b59b0e0253 Fixed Windows warnings 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14737 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-27 09:05:04 +00:00
Robert Osfield
d03b38dea8 Fixes for warnings 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14736 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-27 04:29:30 +00:00
Robert Osfield
23b76599bd Fixed build with auto ptr conversion switched off 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14735 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 20:15:36 +00:00
Robert Osfield
f93a4f330a Updated AUTHORS 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14733 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 19:51:56 +00:00
Robert Osfield
6a30705870 From Bradley Baker Searles, "We had someone replace a DDS texture with a GL_RGB/GL_UNSIGNED_SHORT_5_6_6 image, which would trigger a crash in Image.cpp while flipping the mipmap chain. The code was trying to flip the mipmaps using the rowStep for the full-size image (we have "dds_flip" set in the osgDB::ReaderWriter::Options in the osgDB::Registry)." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14732 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 19:14:28 +00:00
Robert Osfield
9dffd49241 From Bradley Baker Searles, "Small patch attached to handle DDS flip when s=4. Currently it will omit flipping and generate a warning: "Vertical flip was skipped. Image dimensions have to be multiple of 4." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14729 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 18:06:06 +00:00
Robert Osfield
77f662f9f7 From Julien Valentin and Alberto Luaces, added support for transform feedback extensions 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14728 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 17:49:36 +00:00
Robert Osfield
63acee9ee3 Update AUTHORS file 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14727 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 17:18:31 +00:00
Robert Osfield
d1c93f6bad Fixed typo 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14725 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 14:16:22 +00:00
Robert Osfield
11ff450231 Regenerated AUTHORS.txt to fix missing special characters 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14724 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-26 13:52:12 +00:00
Robert Osfield
9362339242 Updated AUTHORS file 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14723 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:59:01 +00:00
Robert Osfield
32831b1ef8 Updated ChangeLog 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14722 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:52:00 +00:00
Robert Osfield
5f1b41a84f From Aitor Moreno, "Attached you will find the modified file without the lines which raises the exception. " 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14721 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:38:43 +00:00
Robert Osfield
1db6def2c4 From Jamie Robertson, "I've been using osgSim::ScalarBar to display fixed range color values (e.g. red from 1-2, green from 3-4 etc), by setting the _numColors the same as the number of actual colors in the ColorRange. 
Currently if you do this you get strange looking results as the colors are calculated for values in the centre of each color step, so if your steps are large, the colors are interpolated sigificantly (see screen grab of red, green and blue colors for illustration).

I've attached a fix which just uses the original color values whenever _numColors equals the number of actual defined colors in the ColorRange. I doubt anyone would want interpolated colors in these circumstances."



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14720 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:31:20 +00:00
Robert Osfield
47202acc24 From Dmitry Marakasov, "While packaging osg-3.3.3 I've discovered that gstreamer detection is 
broken:

-- Could NOT find GStreamer (missing:  GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS GSTREAMER_GSTREAMER-APP_LIBRARIES GSTREAMER_GSTREAMER-PBUTILS_INCLUDE_DIRS GSTREAMER_GSTREAMER-PBUTILS_LIBRARIES) (found version "1.4.5")

though all required modules are installed.

There are two problems: first, module names are spelled incorrectly in root
CMakeLists.txt (e.g. gstreamer-app instead of app), so variables expected
for them are e.g. GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS instead of
GSTREAMER_APP_INCLUDE_DIRS.

Second, gstreamer base component is detected as GSTREAMER while checked
later as GSTREAMER_BASE. I've uncommented the detection as
GSTREAMER_BASE, but obviously that should be revisited and only one
detection left. With this patch, gstreamer is detected properly and
the plugins is successfully built and installed."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14719 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:25:34 +00:00
Robert Osfield
30a62bc4ad From Jonathan Greig, "I was testing out the example and it works fine as a standalone example, but I found that it didn't work as expected when adding the class to some existing code I have to test it out. The osg widget was appearing but it didn't appear to be updating. After tweaking it to pass on the parent QWidget pointer from my code, it worked as expected. I added the WindowFlags to the attached file for good measure. If you look at the Qt Documentation for QWidget ( http://doc.qt.io/qt-5/qwidget.html#QWidget ), you'll see that is exactly where I got this from. When subclassing a widget as such, you should allow the user to pass in the parent at least, considering that has a major effect on how or if Qt may clean up the memory." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14718 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 19:19:37 +00:00
Robert Osfield
47db2da8b4 From Andreas Henne, Support for GL3 core profile in osgText 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14717 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 18:56:29 +00:00
Robert Osfield
7d50c8e634 From Michael McDonnell, "I have changed the code so that the plus key increases both the inner 
and outer tessellation. The minus key decrease both the inner and
outer tessellation. You can still use the arrow keys to control inner
and outer tessellation separately."

From Robert Osfield, clean up the code to fix warnings and make the coding style more consistent with the rest of the OSG.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14716 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 16:59:43 +00:00
Robert Osfield
e7d41377be Fixed handling of NULL entries in osg::Geometry TexCoordArrayList and VertexAttribArrayList. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14715 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-25 14:55:59 +00:00
Robert Osfield
213efd20ad Fixed matrix setup. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14714 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-24 11:06:05 +00:00
Robert Osfield
bd3f390b2f Fixed image allocation operations. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14712 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-23 20:28:28 +00:00
Robert Osfield
594b3064c0 From Miha Ravšelj and Robert Osfield, fix for serializer bug in osgText::TextBase and osg::Camera 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14711 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-23 11:43:21 +00:00
Robert Osfield
685a270c18 From Arjun Ramamurthy, fix for use of StatsHandler in multipleviews/windows 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14709 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-23 11:07:03 +00:00
Robert Osfield
1320c923ca Changed the toggle of defines so that it works with assumed defaults now set up by the GeometryPool so that when toggling it doesn't have a delay in what the user would expect 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14708 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-20 15:12:57 +00:00
Robert Osfield
72c4f3a8ba Removed redudent shaders, and updated remaining shaders to match OpenSceneGraph-Data/shaders 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14705 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-20 15:04:56 +00:00
Robert Osfield
afbf20eba9 First step of refactoring the osg::Program management in osgTerrain::GeometryPool for better performance by placing default osg::Program and shader defines on a single StateSet below the osgTerrain::Terrain 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14704 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-20 15:02:43 +00:00
Robert Osfield
5c023d1f76 Moved osgTerrain::GeometryPool from osgTerrain::DisplacementMappingTechnique to the osgTerrain::Terrain 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14703 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-18 10:52:52 +00:00
Robert Osfield
e5d51da1b3 From Sebastian Messerschmidt, "Attached you find a version of the ReaderWriterDDS with info outputs set to OSG_INFO instead of OSG_NOTICE. The old version spams the console for each loaded DDS file." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14701 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-18 10:23:14 +00:00
Robert Osfield
4cb5bce66a Added support for DefineList to StateSet::merge(..) 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14700 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-17 20:42:12 +00:00
Robert Osfield
3e2305d815 From Stephan Wenglorz, "the attached fix corrects a small bug in OperationThread::setDone(bool), calling it had the opposite effect of what was intended, i.e. setting done to false actually finished the thread. The effect was that VPB threads would exit before starting osgdem when a task had been enqueued, because they initially set done to false." 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14699 16af8721-9629-0410-8352-f15c8da7e697
 2015-02-17 19:40:58 +00:00