Robert Osfield
d22f62396c
From Alexander Sinditskiy, "My changes added support for gltexstorrage2d for texture2d.
...
Initially I described issue in message:
http://forum.openscenegraph.org/viewtopic.php?t=13820
It solves issue with compiling texture using ico from image with mipmaps
I added enviroment variable OSG_GL_TEXTURE_STORAGE_ENABLE to control usage of glTexStorage2d. Initially it is disabled.
It used only if image have mipmaps.
Another issue is converting from internalFormat + type to sized internal format. I created sizedInternalFormats[] struct where sized internal formats are ordered from worse->best.
also this struct have commented lines. Commented formats are listed in
http://www.opengl.org/wiki/GLAPI/glTexStorage2D
but looks like not using in osg."
Note from Robert Osfield. Changed the env var control to OSG_GL_TEXTURE_STORAGE and made it's value true by default when the feature is supported by the OpenGL driver. To disable to
use of glTexStorage2D use OSG_GL_TEXTURE_STORAGE="OFF" or "DISABLE"
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14275 16af8721-9629-0410-8352-f15c8da7e697
2014-06-25 09:57:36 +00:00
Robert Osfield
81c23564b5
From Björn Blissing, "Fix to support correct shininess and transparency in FBX plugin"
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14272 16af8721-9629-0410-8352-f15c8da7e697
2014-06-25 08:18:05 +00:00
Robert Osfield
82a34a2546
From Pjotr Svetachov, "There were some modes missing when exporting to .ogst so I added them."
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14269 16af8721-9629-0410-8352-f15c8da7e697
2014-06-24 19:57:19 +00:00
Robert Osfield
bd82d2a52d
From Farshid Lashkari, "I've attached a small for the osg ReaderWriter. It was performing a case sensitive comparison to the file extension to determine whether to write the file in ascii or binary. This meant that if the filename was "model.OSGT" it would be treated as binary, instead of ascii. I've updated the plugin to ignore case."
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14267 16af8721-9629-0410-8352-f15c8da7e697
2014-06-24 14:58:13 +00:00
Robert Osfield
7295258d71
Merged fix to merge geometries.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14265 16af8721-9629-0410-8352-f15c8da7e697
2014-06-24 11:24:13 +00:00
Robert Osfield
4ec4e88f85
Fixed nested callback calling.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14264 16af8721-9629-0410-8352-f15c8da7e697
2014-06-23 12:02:41 +00:00
Robert Osfield
c6ab14018a
Fixed check against totaly number of vertices
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14262 16af8721-9629-0410-8352-f15c8da7e697
2014-06-16 16:16:10 +00:00
Robert Osfield
8d06b9b019
From Aurelien Albert, "I've got some issues using osgb files within an big osga archive (file size > 2Go).
...
Issue is described here : http://forum.openscenegraph.org/viewtopic.php?t=13914
Here is a fix, using "std::streampos" standard type for stream positions up to 64bits.
"
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14261 16af8721-9629-0410-8352-f15c8da7e697
2014-06-16 08:54:54 +00:00
Robert Osfield
9195a0000b
Added osgUI::ColorPalette class
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14259 16af8721-9629-0410-8352-f15c8da7e697
2014-06-13 17:17:09 +00:00
Robert Osfield
d9a6491a43
Removed generation of scroll event on the X11 button release event as X11 was generating both a pair of press/release events for a single scroll when movement.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14257 16af8721-9629-0410-8352-f15c8da7e697
2014-06-12 16:00:21 +00:00
Robert Osfield
be13c2202d
Added if () blocks to State::convertVertexShaderSourceToOsgBuiltIns() to ensure that only parts of the shader than need replacing are replaced.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14255 16af8721-9629-0410-8352-f15c8da7e697
2014-06-12 15:24:34 +00:00
Robert Osfield
410f7d27ed
Improved positioning of combo box popup items
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14253 16af8721-9629-0410-8352-f15c8da7e697
2014-06-12 14:12:30 +00:00
Robert Osfield
63d101b653
Added frame support to ComboBox.
...
Improved the alingment support for text
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14252 16af8721-9629-0410-8352-f15c8da7e697
2014-06-12 14:05:28 +00:00
Robert Osfield
584035b663
Added handling of AligmentSettings of Text layout
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14251 16af8721-9629-0410-8352-f15c8da7e697
2014-06-11 16:31:17 +00:00
Robert Osfield
86a9a45525
Implemented more robust intersection handling for mouse interactions. Wired up even handling of ComboBox popup.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14250 16af8721-9629-0410-8352-f15c8da7e697
2014-06-11 10:55:33 +00:00
Robert Osfield
977ec20751
Refactored Callback system in osg::Node, osg::Drawable, osg::StateSet and osg::StateAttribute to use a new osg::Callback base class.
...
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14244 16af8721-9629-0410-8352-f15c8da7e697
2014-06-05 16:26:13 +00:00
Robert Osfield
35d6cb812f
Updated shaders from OpenSceneGraph-Data sources
2014-06-04 08:59:31 +00:00
Robert Osfield
333a16a88d
Reverted change of Node::ParentList from being a vector<Node*> back to a vector<Group*>
2014-06-03 09:52:55 +00:00
Robert Osfield
3dde165f14
Refactor osg::Geode to subclass from osg::Group and reuse the NodeList children container
2014-06-03 09:23:24 +00:00
Robert Osfield
2d41cbd0cf
Removed OSG_USE_BOUND and associated osg::Bound adapter class to avoid problems with BoundingBox::expandBy/expandByRadius() implementation choosing a null BoundingBox from
...
the osg::Bound class causing crashes.
2014-06-02 16:20:39 +00:00
Robert Osfield
199506296a
Implemented basic frame graphic
2014-05-30 16:44:36 +00:00
Robert Osfield
189c0b3477
Futher work on ComboBox/Popup
2014-05-29 15:21:42 +00:00
Robert Osfield
a45ba05bdd
Added beginnings of ComboBox popup functionality.
2014-05-29 10:51:26 +00:00
Robert Osfield
26a7c30229
Added cached Depth and ColorMask to reduce the amount of duplicate state in the osgUI subgraph
2014-05-28 10:18:57 +00:00
Robert Osfield
1fcb91900a
Replaced Widget::GraphicsSubgraph with GraphicsSubgraphMap to allow finer control of when the rendering subgraphs are done.
2014-05-28 10:06:14 +00:00
Robert Osfield
6af9edf33b
Improved handling of text
2014-05-27 14:14:51 +00:00
Robert Osfield
faced0a896
Removed Dialog/Popup::open/close() methods as they are replaced by the setVisible() method
2014-05-26 16:32:20 +00:00
Robert Osfield
5d635287c0
Implemented Widger::Visible and Enabled usage
2014-05-26 16:27:33 +00:00
Robert Osfield
b04a4813ba
Added Visible and Enalbed properties to Widget
2014-05-26 16:15:33 +00:00
Robert Osfield
5d234ba021
Fixed missing initilaizer
2014-05-26 16:15:12 +00:00
Robert Osfield
71352ea56d
Added item serializer
2014-05-26 15:58:18 +00:00
Robert Osfield
f50ec0fe8e
Implemented clipping of widget to the widgets extents.
2014-05-23 18:59:16 +00:00
Robert Osfield
cca18e82e8
Implemented scheme for making sure nested widgest overdraw parent widgets graphics
2014-05-23 15:00:49 +00:00
Robert Osfield
55c2041d4d
Added wrappers for open and close methods
2014-05-23 15:00:09 +00:00
Robert Osfield
bda5ec4875
Added osgUI::Widget::set/getGraphicsSubgraph() to hold the subgraph that does the rendering portion of widgets
2014-05-22 10:02:35 +00:00
Robert Osfield
0b5b3213fe
Addd method implementation in serializers
2014-05-21 16:15:02 +00:00
Robert Osfield
d8adc80c2c
Fixed handling of traverse
2014-05-21 10:17:31 +00:00
Robert Osfield
20fd80de3a
Improved handling of callback object to open the door to use of general osg::CallbackObject as mechnisms for something simialr to Qt's signal/slot mechanism.
2014-05-21 09:45:11 +00:00
Robert Osfield
9859f3110b
Renamed callbacks to avoid overlap with Node callbacks
2014-05-21 09:06:17 +00:00
Robert Osfield
8346f0ebe1
Improved the handling of updating of text
2014-05-20 08:35:39 +00:00
Robert Osfield
d917987938
Added shell of Popup class
2014-05-20 08:35:19 +00:00
Robert Osfield
e4004118db
Added check against whether an event has been handled or not before actioning escape/quit.
2014-05-20 08:34:32 +00:00
Robert Osfield
4ce2e075c4
Add shell of Dialog class
2014-05-19 10:11:50 +00:00
Robert Osfield
1b34fed500
Added handling of up/down key to ComboBox
2014-05-19 09:30:36 +00:00
Robert Osfield
87fd1d38fb
Added initial cut of ComboBox
2014-05-16 19:24:58 +00:00
Robert Osfield
3e00764649
Added initial shell of PushButton implementation
2014-05-16 10:38:40 +00:00
Robert Osfield
03fc0c3662
Added support for intesecting Drawable that are attached directly to the scene graph without an osg::Geode
2014-05-15 16:30:17 +00:00
Robert Osfield
5b60708e80
From Sebastian Messerschmidt, "There was some small error due to MS non-conformity handling comments correctly."
2014-05-15 14:57:28 +00:00
Robert Osfield
d8a06f827e
From Pjotr Svetachov, build fixes for VisualStudio
2014-05-15 14:45:28 +00:00
Robert Osfield
85386daa25
Added osgGA dependency
2014-05-15 13:34:50 +00:00
