Robert Osfield
2923c8014a
From Jordi Torres, "We must use JNI_FALSE instead of false in JNI code. Otherwise the examples will not compile. This patch should be applied to osgAndroidExampleGLES1/jni and osgAndroidExampleGLES2/jni. the osgNativeLib.cpp is the same. "
2013-05-24 17:06:08 +00:00
Robert Osfield
5de095cb1d
From Pawel Ksiezopolski, Added example of using osg::TextureBuffer + GLSL to render forest.
2013-05-23 15:55:22 +00:00
Robert Osfield
455ebbc5f1
Refactored the support for stereo and keystone RTT setup so that it can be applied to an existing Camera.
2013-05-20 19:24:34 +00:00
Robert Osfield
6cb26321a9
Reverted back to changes before experiements with ViewConfig
2013-05-16 14:07:35 +00:00
Robert Osfield
3b6c2b636a
Renamed osgViewer::Config osgViewer::ViewConfig and moved it's declaration into include/osgViewer.
2013-05-16 10:11:06 +00:00
Robert Osfield
e3ed763c15
Added WoWVxDisplay view config
2013-05-16 09:08:27 +00:00
Robert Osfield
625821a91a
Created a dedicated include/osgViewer/config and src/osgViewer/config directories to place all the Config classes.
2013-05-15 16:15:38 +00:00
Robert Osfield
4e34cadee2
Added to Viewer::realize() automatic setup using Keystone when available and enabled, and when no other window setup has been selected.
2013-05-13 09:18:37 +00:00
Robert Osfield
9402efe38e
Added DisplaySettings::KeystoneHint flag that can be set via --keystone-on and --keystone-off command line parameters, and the OSG_KEYSTONE env var
2013-05-10 17:59:07 +00:00
Robert Osfield
5dd07e4d1c
Added keystone file handling
2013-05-10 16:06:10 +00:00
Robert Osfield
9eb5465ff5
Added --keystone <filename> command line support into DisplaySettings, and added OSG_KEYSTONE_FILES env var support into osg::DisplaySettings.
2013-05-10 11:56:09 +00:00
Robert Osfield
9c1c34d765
Moved Keystone support from osgkeystone example into osgViewer::View
2013-05-10 10:00:38 +00:00
Robert Osfield
e545627571
Moved Keystone class into osgViewer library.
2013-05-09 15:18:14 +00:00
Robert Osfield
046c3fca7a
Cleaned up event handler and namespaces in prep for integrating keystone functionality into osgViewer
2013-05-07 14:43:36 +00:00
Robert Osfield
8810d27f7c
Added keystone support for left eye, right eye and quad buffer stereo
2013-05-07 13:34:47 +00:00
Robert Osfield
9bb4ed08e1
Added keystone setup to vertical split stereo suport and cleaned up the horizontal split stereo code
2013-05-07 11:13:50 +00:00
Robert Osfield
668d351765
Introduced new scheme for handling mouse events with osgViewer. The new scheme enables robust event handling even when using distortion correction render to texture Cameras.
2013-05-03 19:26:27 +00:00
Robert Osfield
a2615388db
Refactored Keystone setup as a step toward integrating Keystone correction with stereo
2013-04-18 17:02:57 +00:00
Robert Osfield
adea6c9329
Implemented stereo support into osgkeystone as a testbed for moving stereo support from SceneView into osgViewer
2013-04-18 09:47:28 +00:00
Robert Osfield
65f23ba9af
Implemented initial cut of anaglyphic stereo
2013-04-17 11:04:12 +00:00
Robert Osfield
bc288d23dc
Added support for enable/disabling the keystone editing using the Ctrl-g key to toggle the UI and grid on/off.
2013-04-12 13:01:51 +00:00
Robert Osfield
efbf05cd59
Moved keystone event handler onto the keystone distortion Camera.
2013-04-12 09:05:11 +00:00
Robert Osfield
835a80ae90
Refactoed the grid rendering so that it's now implemented as part of the distortion mesh pass, leaving the main scene graph alone.
2013-04-12 08:52:21 +00:00
Robert Osfield
f79d89e0ce
Add support for a finer grained mesh on the distortion mesh for higher quality results.
2013-04-11 17:12:32 +00:00
Robert Osfield
7ff4be954b
Moved the keystone geometry computation into a Keystone::compute3DPositions(..) method
2013-04-11 16:07:49 +00:00
Robert Osfield
830d21471b
Removed old experimental keystone code to clean up the example
2013-04-10 16:36:49 +00:00
Robert Osfield
18d14065a5
Changed the way that the keystone geometry is calculated.
2013-03-28 10:46:24 +00:00
Robert Osfield
3cccecb79d
Added keypad control of corner points
2013-03-27 16:29:01 +00:00
Robert Osfield
b1c342c027
Introduced shearing of the image
2013-03-26 16:47:52 +00:00
Robert Osfield
a5cea75d47
Improved the setup of the keystone distortion correction mesh.
2013-03-26 11:00:05 +00:00
Robert Osfield
6c723df2d6
Added keystone grid to aid editing
2013-03-21 11:35:21 +00:00
Robert Osfield
bc3cff2406
Added arrow key support. Added support for using ctrl and shift keys to modulate how senstive the mouse and key movement is when modifying the keystone parameters.
2013-03-20 14:03:28 +00:00
Robert Osfield
7aad7dfd78
Improve corner point tracking/keystone computation
2013-03-19 16:43:27 +00:00
Robert Osfield
1dba64ac6c
Added event handle for interactive setting of keystone variables
2013-03-19 12:44:03 +00:00
Robert Osfield
890ecb6abb
Experiments with modifying the projection matrix to provide keystoning.
2013-03-15 17:35:43 +00:00
Robert Osfield
ab55668ff3
Initial skeleton of new osgkeystone example
2013-03-14 16:24:22 +00:00
Robert Osfield
0b3da415ef
Fixed warning
2013-02-06 11:16:29 +00:00
Robert Osfield
8ed0780967
Added .get()'s to fix compilation when ref_ptr<> type conversion is disabled
2013-02-05 18:22:46 +00:00
Robert Osfield
9bc3b3316a
From Stephan Huber, introduction of message id scheme were osc messages are sent with an unique id, and can be dispatched multiple times to workaround network packet losses.
2013-01-31 11:09:03 +00:00
Robert Osfield
26a8f63212
From Wang Rui, "In the attached files I've added the Compute Shader support for OSG, as well as serializer updates and a new osgcomputeshaders example. My submission also include a setComputeGroups() function in Program for setting compute-shader work groups, and a bindToImageUnit() function in Texture for binding textures as image variables in shaders.
...
All code are tested on Windows 7 + NVIDIA GFX 570 with the latest GeForce 310.70 Driver (BETA), which could support OpenGL 4.3.
Compute shader information can be found at "http://www.opengl.org/registry/specs/ARB/compute_shader.txt "
"
2013-01-25 11:54:03 +00:00
Robert Osfield
a9fff529c7
Fixed compile warning
2013-01-25 10:36:42 +00:00
Robert Osfield
c15d07caa1
Added support for RGBA colour buffer in osgframerenderer using the --rgba command line option (--rgb selects the standard non colour frame buffer which is the default).
2012-12-17 15:58:57 +00:00
Robert Osfield
f7bee82e99
Added handling of aspect ratio for vertical/horizontal split stereo.
2012-12-16 17:10:37 +00:00
Robert Osfield
e57e6c5409
Added setting of the fusion distance.
2012-12-10 11:11:19 +00:00
Robert Osfield
8d999a07cf
Added --flip and --no-flip command line options to enable/disable a vertical flip of the captured image before writing out to disk.
2012-12-08 16:11:00 +00:00
Robert Osfield
8df5440a26
Added naming of root of presentation and used this in the setup of the position of the camera.
2012-12-07 13:59:57 +00:00
Robert Osfield
ccdca3d9bf
Fixed handling of window size/projection matrix
2012-12-07 12:47:42 +00:00
Robert Osfield
66a11037ae
Added creation of directory path for ouput if one is required
2012-12-06 11:36:13 +00:00
Robert Osfield
eed71f647d
From Stephan Huber, "* imageio: removed ReaderWriterImageIO_IOS.cpp, refactored ReaderWriterImageIO to work on OS X and IOS
...
* avfoundation: added support for IOS (CoreVideo-support is still in development, works only for SDK >= 6.0, set IPHONE_SDKVER in cMake accordingly)
* zeroconf: added ZeroConf-device-plugin (Mac/Win only, linux implementation missing) to advertise and discover services via ZeroConf/Bonjour, on windows you'll need the Bonjour SDK from Apple
* osgosc: modified the example to demonstrate the usage of the ZeroConf-plugin (start the example with the command-line-argument --zeroconf)
* SlideShowConstructor: enable/disable CoreVideo via a environment variable (P3D_ENABLE_CORE_VIDEO)
* RestHttp: mouse-motion-events get interpolated
* RestHttp: unhandled http-requests get sent as an user-event to the event-queue, all arguments get attached as user-values to the event
* modified some CMakeModules to work correctly when compiling for IOS
* fixed a compile-error for IOS in GraphicsWindowIOS
* some minor bugfixes"
2012-12-05 17:15:53 +00:00
Robert Osfield
ce0f928f6f
Added --screen-distance <distance>, --screen-height <height> and --screen-width <width> command line support and associated settings to the configuration file.
2012-12-05 11:41:27 +00:00
Robert Osfield
ea00708026
Fixed default camera position
2012-12-04 19:02:45 +00:00
Robert Osfield
761229f8f4
Changed the -w and -h options to --width and --height respectively.
2012-12-04 18:51:21 +00:00
Robert Osfield
32cffe2094
Cleaned up command line usage
2012-12-04 18:30:33 +00:00
Robert Osfield
b4af638af9
Tidied up command line docs.
2012-12-04 18:28:28 +00:00
Robert Osfield
9363aa5a89
Tidied up CaptureSettings and added command line docs
2012-12-04 18:21:53 +00:00
Robert Osfield
b6d19d1052
Added CameraProperty and associated command line parameters for controlling camera position and animation.
...
--center x y z
--eye x y z
--up x y z
--rotation-center x y z
--rotation-axis x y z
--rotation-speed degreesPerSecond
2012-12-04 12:47:46 +00:00
Robert Osfield
35d17d4654
Renamed souce file
2012-12-03 11:31:13 +00:00
Robert Osfield
8b231ba8e3
From Stephan Huber, added event sending support into osgGA::Device along with implementation on this into the osc plugin. Added osgoscdevice example to demonstate this in action.
2012-11-28 10:43:58 +00:00
Robert Osfield
8b30807ef1
From Paul Martz, build fixes
2012-11-19 11:25:52 +00:00
Robert Osfield
933baf5db4
Changed COLOUR to COLOR to be consistent with OpenGL spelling
2012-11-13 13:32:01 +00:00
Robert Osfield
92975a01fd
Moved colour space conversion of volumes from the osgvolume example into osg/ImageUtils and added support for colorSpaceConversion="MODULATE_ALPHA_BY_LUMINANCE","MODULATE_ALPHA_BY_COLOUR","REPLACE_ALPHA_WITH_LUMINANCE" and "REPLACE_RGB_WITH_LUMINANCE" to .p3d <volume> tag
2012-11-13 13:16:10 +00:00
Robert Osfield
79ae9cd8a3
Added osgframerenderer example
2012-11-12 15:26:30 +00:00
Robert Osfield
014f13f774
Refactored ImageSequence to better handle random access usage.
2012-11-08 11:19:31 +00:00
Robert Osfield
17b372ec38
Tweaked casts/types to fix build under Linux
2012-11-06 17:49:32 +00:00
Robert Osfield
679956e79a
Added f qualifer to 1.0 to fix build problem under MSVS
2012-11-06 14:25:28 +00:00
Robert Osfield
18d66619b0
Added static cast to float to avoid compile error under MSV
2012-11-05 09:36:00 +00:00
Robert Osfield
94e8c42569
Added a static_cast to avoid build issues under Windows
2012-10-08 16:12:59 +00:00
Robert Osfield
03a9786b11
Fixed warning
2012-10-08 16:03:16 +00:00
Robert Osfield
77bd6cbfe9
From Stephan Huber and Robert Osfield, addded interactive setting of the ImageSequence::seek() based on the mouse x position.
2012-10-05 10:35:06 +00:00
Robert Osfield
1796d55bea
From Stephan Huber, OSX and iOS Video support via a QTKit plugin from OSX 10.7 and before, and an AVFoundation plugin for iOS and OSX10.8 and later.
2012-10-02 14:07:12 +00:00
Robert Osfield
67abc66d8a
Added handling of directory names in osgimagesequence commandline.
...
From Stephan Huber, added support for controlling the ImageSequence seek position via mouse x position, toggled on/off via 'i' key.
2012-09-12 16:35:12 +00:00
Robert Osfield
5a99e4672e
From Fredric Bouvier, fix to CMake build selection of FLTK
2012-09-06 10:32:07 +00:00
Robert Osfield
39dcea9ebb
From Colin McDonald and Robert Osfield, converted Traits::sharedContext from GraphicsContext* to osg:observer_ptr<GraphicsContext> to prevent dangling pointer issues.
2012-09-05 21:03:41 +00:00
Robert Osfield
284f410436
Added ShadowSettings::s/getMaximumShadowMapDistance(double) property, usage of these property in ViewDependentShadowMap,
...
and setting of it with --max-shadow-distance <double> in the osgshadow example.
2012-08-15 12:40:48 +00:00
Robert Osfield
fb83c2b061
Introduced --near-far-mode into osgshadow and ShadowSettings::setComputeNearFarModeOverride(..) to allow user control of how the cull traversal is optimized for computing the depth range of the shadow map.
2012-08-03 16:14:14 +00:00
Robert Osfield
35816e6b25
Removed the erronous creation of a local ShadowSettings object
2012-08-03 15:23:44 +00:00
Robert Osfield
ec3ad89041
Changed settings of masks to use ShadowSettings.
2012-07-10 16:11:15 +00:00
Robert Osfield
4d86f8dc79
Added --fps support
2012-06-07 10:08:42 +00:00
Robert Osfield
aea3d6855b
Removed trailing spaces
2012-05-02 14:13:29 +00:00
Robert Osfield
b86c87d1a8
From Christophe Herreman, Added viewer.setCameraManipulator( keyswitchManipulator.get() ) to fix problem with master Camera not being updated
2012-04-26 10:07:36 +00:00
Robert Osfield
d37eff5c2b
Ran dos2unx on file
2012-04-20 09:40:29 +00:00
Robert Osfield
b0c510ab08
From John Kaniarz, "Here is an example of using tessellation shaders in osg. With permission from the author, I adapted it from this tutorial:
...
http://prideout.net/blog/?p=48 "
2012-04-20 09:38:51 +00:00
Robert Osfield
25989e73f5
From Martin Naylor, "I have been experiencing a crash in the example osgtexture2D.
...
Not sure why my system seems to be so sensitive to these problems.
But attached is a fix which seems to stabilise the example.
Note: it only seems to crash intermittently when spinning the object with
your mouse.
So I assume this is a threading issue because of the data variance missing
in some of the text node setups in the example.
"
2012-04-18 09:51:39 +00:00
Robert Osfield
aab27e106c
From David Callu, "Here an update of osg::Uniform :
...
- add non square matrix
- add double
- add all uniform type available in OpenGL 4.2
- backward compatibility for Matrixd to set/get an float uniform matrix
- update of IVE / Wrapper ReadWriter
implementation of AtomicCounterBuffer based on BufferIndexBinding
add example that use AtomicCounterBuffer and show rendering order of fragments,
original idea from geeks3d.com."
2012-03-29 09:43:12 +00:00
Robert Osfield
055e1258ea
Removed trailing spaces
2012-03-23 16:09:30 +00:00
Robert Osfield
7c278ce5d6
From Christian Buchner, "The attached openscenegraph example is much simpler than
...
osgshaders.cpp and demonstrates the use of GLSL vertex and fragment
shaders with a simple animation callback. I found the osgshaders.cpp
too complex to serve as a starting point for GLSL programming"
2012-03-06 10:29:47 +00:00
Robert Osfield
8d3790d594
Added RotateCylinderDragger and RotateSphereDragger to list of manipulators for testing purposes
2012-03-06 10:06:00 +00:00
Robert Osfield
f59f4d2929
From Paul Martz, "Just a minor update and typo fix.
...
"
2012-03-05 14:17:01 +00:00
Robert Osfield
f86efdcd31
Cleaned up CMake warning
2012-02-24 10:56:48 +00:00
Robert Osfield
981182fb01
From Kim Bale, "The application description for osg2cpp was cut and pasted from osgconv and not changed.
...
I've added a more relevant description."
2012-02-17 16:51:10 +00:00
Robert Osfield
9244ea7603
From Paul Martz, a simple GL3 example
2012-02-09 15:51:20 +00:00
Robert Osfield
3b4333ec9a
Fixed silly compiler warning that was being produced in error.
2012-02-06 12:05:36 +00:00
Robert Osfield
85bce8b8ad
From Stephan Huber, "attached you'll find a first version of multi-touch-support for OS X (>=
...
10.6), which will forward all multi-touch events from a trackpad to the
corresponding osgGA-event-structures.
The support is switched off per default, but you can enable multi-touch
support via a new flag for GraphicsWindowCocoa::WindowData or directly
via the GraphicsWindowCocoa-class.
After switching multi-touch-support on, all mouse-events from the
trackpad get ignored, otherwise you'll have multiple events for the same
pointer which is very confusing (as the trackpad reports absolute
movement, and as a mouse relative movement).
I think this is not a problem, as multi-touch-input is a completely
different beast as a mouse, so you'll have to code your own
event-handlers anyway.
While coding this stuff, I asked myself if we should refactor
GUIEventAdapter/EventQueue and assign a specific event-type for
touch-input instead of using PUSH/DRAG/RELEASE. This will make it
clearer how to use the code, but will break the mouse-emulation for the
first touch-point and with that all existing manipulators. What do you
think? I am happy to code the proposed changes.
Additionally I created a small (and ugly) example osgmultitouch which
makes use of the osgGA::MultiTouchTrackballManipulator, shows all
touch-points on a HUD and demonstrates how to get the touchpoints from
an osgGA::GUIEventAdapter.
There's even a small example video here: http://vimeo.com/31611842 "
2012-02-03 14:25:08 +00:00
Robert Osfield
95f93e3bf5
Renamed selection to transform to make it clear to understand what is being done.
2012-02-01 17:16:44 +00:00
Robert Osfield
c3b7f6debe
Added example usage of teh new DraggerTransforCallback's HandleCommandMask which is tied to the TabPlaneDragger example.
2012-02-01 17:10:48 +00:00
Robert Osfield
7664d90504
Improved the handling of osgManipulator::Constraint, DraggerCallbacks and Command so that they now use a Visitor Pattern
...
to ensure the correct methods on constraints and callbaks are called for each Command. Also fixed the handling of
Constraints when applied to composite Draggers.
2012-01-31 10:56:52 +00:00
Robert Osfield
0381914b42
Added support for Scale1DDragger, Scale2DDragger and TranslatePlaneDragger to --dragger command line option
2012-01-30 12:26:28 +00:00
Robert Osfield
6d66e1abaa
Added support for using GL_UNPACK_ROW_LENGTH in conjunction with texture's + osg::Image via new RowLength
...
parameter in osg::Image. To support this Image::setData(..) now has a new optional rowLength parameter which
defaults to 0, which provides the original behaviour, Image::setRowLength(int) and int Image::getRowLength() are also provided.
With the introduction of RowLength support in osg::Image it is now possible to create a sub image where
the t size of the image are smaller than the row length, useful for when you have a large image on the CPU
and which to use a small portion of it on the GPU. However, when these sub images are created the data
within the image is no longer contiguous so data access can no longer assume that all the data is in
one block. The new method Image::isDataContiguous() enables the user to check whether the data is contiguous,
and if not one can either access the data row by row using Image::data(column,row,image) accessor, or use the
new Image::DataIterator for stepping through each block on memory assocatied with the image.
To support the possibility of non contiguous osg::Image usage of image objects has had to be updated to
check DataContiguous and handle the case or use access via the DataIerator or by row by row. To achieve
this a relatively large number of files has had to be modified, in particular the texture classes and
image plugins that doing writing.
2012-01-24 14:34:02 +00:00
Robert Osfield
c225f2758c
Added --num-sm and --parallel-split and --cascaded command line options to set the appriopriate ViewDependentShadowMap settings.
2011-12-19 09:09:30 +00:00
Robert Osfield
74fb1f42d9
Moved osgshaders example across to use the new osgUtil::PerlinNoise example
2011-12-13 21:14:33 +00:00
