FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged 2.6 branch changes back into trunk using : svn merge -r 8699:8706 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6 .

Browse Source
This commit is contained in:
Robert Osfield
2008-08-03 16:57:09 +00:00
parent ced418ccb5
commit f81ff952a2
7 changed files with 116 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/osgUtil/Optimizer
View File

@@ -67,23 +67,23 @@ class OSGUTIL_EXPORT Optimizer
enum OptimizationOptions
{
FLATTEN_STATIC_TRANSFORMS = 0x001,
REMOVE_REDUNDANT_NODES = 0x002,
REMOVE_LOADED_PROXY_NODES = 0x004,
COMBINE_ADJACENT_LODS = 0x008,
SHARE_DUPLICATE_STATE = 0x010,
MERGE_GEOMETRY = 0x020,
CHECK_GEOMETRY = 0x040,
SPATIALIZE_GROUPS = 0x080,
COPY_SHARED_NODES = 0x100,
TRISTRIP_GEOMETRY = 0x200,
TESSELLATE_GEOMETRY = 0x400,
OPTIMIZE_TEXTURE_SETTINGS = 0x800,
MERGE_GEODES = 0x1000,
FLATTEN_BILLBOARDS = 0x2000,
TEXTURE_ATLAS_BUILDER = 0x4000,
STATIC_OBJECT_DETECTION = 0x8000,
FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = 0x100,
FLATTEN_STATIC_TRANSFORMS = (1 << 0),
REMOVE_REDUNDANT_NODES = (1 << 1),
REMOVE_LOADED_PROXY_NODES = (1 << 2),
COMBINE_ADJACENT_LODS = (1 << 3),
SHARE_DUPLICATE_STATE = (1 << 4),
MERGE_GEOMETRY = (1 << 5),
CHECK_GEOMETRY = (1 << 6),
SPATIALIZE_GROUPS = (1 << 7),
COPY_SHARED_NODES = (1 << 8),
TRISTRIP_GEOMETRY = (1 << 9),
TESSELLATE_GEOMETRY = (1 << 10),
OPTIMIZE_TEXTURE_SETTINGS = (1 << 11),
MERGE_GEODES = (1 << 12),
FLATTEN_BILLBOARDS = (1 << 13),
TEXTURE_ATLAS_BUILDER = (1 << 14),
STATIC_OBJECT_DETECTION = (1 << 15),
FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = (1 << 16),
DEFAULT_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS |
REMOVE_REDUNDANT_NODES |
REMOVE_LOADED_PROXY_NODES |

6
include/osgViewer/api/Win32/GraphicsWindowWin32
View File

@@ -174,8 +174,14 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow
bool _destroying;
MouseCursor _mouseCursor;
/// Persist which mouse cursor was used before switching to the resize cursors.
MouseCursor _appMouseCursor;
std::map<MouseCursor,HCURSOR> _mouseCursorMap;
std::map<int, bool> _keyMap;
};
}

8
include/osgWidget/Window
View File

@@ -29,13 +29,13 @@ namespace osgWidget {
// These are helper callbacks you can attach to Windows that will make them moveable,
// rotatable, and scalable respectively.
bool callbackWindowMove (Event&);
bool callbackWindowRotate (Event&);
bool callbackWindowScale (Event&);
bool OSGWIDGET_EXPORT callbackWindowMove (Event&);
bool OSGWIDGET_EXPORT callbackWindowRotate (Event&);
bool OSGWIDGET_EXPORT callbackWindowScale (Event&);
// These are helper callbacks you can attach to Windows to that will make various
// keyboard events behave as you might imagine.
bool callbackWindowTabFocus(Event&);
bool OSGWIDGET_EXPORT callbackWindowTabFocus(Event&);
class OSGWIDGET_EXPORT Window:
public osg::MatrixTransform,