Robert Osfield
32c0bc3b39
From Lionel Lagarde, "Here is a correction on the PixelBufferObject getter methods of Image.
...
The set method modify the buffer object of the BufferData while the get method returned the buffer object of the Image.
I've also removed the _bufferObject member of Image (not used anymore)."
--This line, Lionel Lagardeand those below, will be ignored--
M include/osg/Image
2012-12-13 17:35:27 +00:00
Robert Osfield
c4b83d2b0c
Added colouring and lighting of track using shader
2012-12-13 16:23:38 +00:00
Robert Osfield
a00c5e3a20
Fixed handling of image colour space conversion when pixel format changes
2012-12-11 17:45:20 +00:00
Robert Osfield
68c1360c96
Added automatic conversion of RGB to RGBA when doing REPLACE_ALPHA_WITH_LUMINANCE colour space conversion.
2012-12-11 17:27:22 +00:00
Robert Osfield
d86849fc35
Disabled lighting and set the colour to white
2012-12-11 10:44:00 +00:00
Robert Osfield
84d8eeb7cb
First cut of generating lines from .trk data
2012-12-11 09:55:48 +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
22868bce4f
From Stephan Huber, "attached you'll find a zip containing some bug-fixes and some refactored + new code.
...
* ZeroConfDevice does now return FILE_NOT_HANDLED instead of FILE_NOT_FOUND
* present3D supports multiple devices per env-var P3D_DEVICE, separate multiple device with a space
I refactored parts the p3d-plugin, the curl-plugin and parts of Registry and ReaderWriter. Currently the p3d-plugin tries to open all remote files with the help of the curl-plugin.
I added a new method to Registry called getReaderWriterForProtocolAndExtension. which will return a ReaderWriter which is capable in handling the remote file for the given protocol and extension. If no readerwriter is found for the given extension, a list is built of all readerwriters supporting the given protocol and this list is checked for support of wildcards (extension = "*"). If anything matches it get returned.
I added this principle also to the Registry, so now it's possible to register a generic ReaderWriter which can handle all filetypes for a given protocol, similar what curl is doing. All you have to do is to load the plugin at startup. The curl-fallback is still in place.
With these changes it is now possible to reference a movie inside a presentation without a server-address, read the presentation (with curl) and stream the movie with the correct plugin (e.g. QTKit)
"
2012-12-07 19:05:47 +00:00
Robert Osfield
e64d5e5eca
Added template swapBytes method
2012-12-07 19:04:49 +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
aa3634979a
From Stephan Huber, attached is a fix for the bug of present3D not loading fonts across http. I pass SlideShowConstructor's options-object to readFontFile when constructing any text-objects so freetype can pick up the font-data from the curl-plugin. It works fine now on my end.
2012-12-07 10:19:05 +00:00
Robert Osfield
363633a81d
Intial shell of .trk plugin
2012-12-06 19:09:17 +00:00
Robert Osfield
6fa6de8593
From Stephan Huber, build fix
2012-12-06 18:12:00 +00:00
Robert Osfield
9ebf35cf05
Added default value for initialization of port number
2012-12-06 14:42:36 +00:00
Robert Osfield
d4c9ecf370
Fixed typo
2012-12-06 11:36:35 +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
4cb5d59d35
From Stephan Huber, ZerConfDevice plugin for Windows and Apple
2012-12-06 08:02:08 +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
5a88734598
Moved the expansion of the key codes into ApplicationUsage so that help is only generated for non zero keycodes.
2012-12-05 10:13:51 +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
cbf6745da5
Added missing break;
2012-12-04 09:11:17 +00:00
Robert Osfield
24c612a2bd
From Stephan Huber, "I've found a bug in SlideShowConstructor::findFileAndRecordPath which does return an empty string if the file was not found, and this empty string got added to the fileNames-vector, so the curl-plugin tried to load only an empty file-name, the directory-prefix. I fixed findFileAndRecordPath, so it returns the unmodified filename, which can then be loaded by the curl-plugin. Please review my fix, as I am not sure if it has any side effects, as I know the code not that well.
...
The file includes another small compile-fix when using float-matrices."
2012-12-03 16:49:47 +00:00
Robert Osfield
35d17d4654
Renamed souce file
2012-12-03 11:31:13 +00:00
Robert Osfield
7d947d79ff
From Wang Rui, "I've found a very covert bug in current VDSM implementation. It makes the computation of positional texgen incorrect if the shadow scene is under one or more child cameras with view/proj offsets. Using current stage instead will fix it."
2012-12-03 10:10:46 +00:00
Robert Osfield
e4a42fa65c
Fixed error in Unfiform set method
2012-12-03 09:50:41 +00:00
Robert Osfield
e6141b984d
Added include of osc plugin directory to help with Windows build
2012-12-03 09:35:12 +00:00
Robert Osfield
9a2f7c7d8e
From Wang Rui, build fix
2012-12-02 11:45:57 +00:00
Robert Osfield
3e32d9c8af
Fixed crash when no CameraManipulator is assigned to the viewer
2012-11-30 20:03:31 +00:00
Robert Osfield
d831f1b538
Added support for 0x and numeric defintion of keys to be used with <click_to_event> functionality.
2012-11-30 16:52:59 +00:00
Robert Osfield
6eb3b2f091
Added support for pausing and restart the property_animation.
2012-11-30 15:43:31 +00:00
Robert Osfield
236e75b2be
Added xml defined property/property animation to .p3d format for <volume> propeties:
...
alpha="$alphaname"
cutoff="$cutoffname"
region="$minx $miny $minz $maxx $maxy $maxz"
sampleDensity="$densityname"
sampleDensityWhenMoving="$densityname"
2012-11-30 14:21:45 +00:00
Robert Osfield
7ffde8abce
From Stephan Huber, New OscSendingDevice and OscReceivingDevice classes
2012-11-28 13:28:20 +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
694e603d15
Added support for <properties> tag for <presentation>, <slide> and <layer> scope to compliment the scope of <property_animation>
2012-11-27 16:00:43 +00:00
Robert Osfield
42529ca415
Added preliminary support for <property_animation>
2012-11-27 15:09:44 +00:00
Robert Osfield
a31d603f9a
From Stephan Huber, "Attached you'll find a new ImageSequence.cpp which will fix an issue I had when moving the mouse cursor over the left window-border, as the index becomes negative. And I added a UdpSocket.cpp-file with more debuggin-output via some sprinkled printf-calls. "
2012-11-22 15:13:46 +00:00
Robert Osfield
1f50f23f86
Simplified CMakeLists and adjusted OscHostEndianness to automatically detect the endian at compile time
2012-11-22 11:55:38 +00:00
Robert Osfield
9ef448c7b1
From Stephan Huber, updates to explictly set the HOST Endian using Cmake
2012-11-22 11:47:03 +00:00
Robert Osfield
56bc0b14bc
Added explict handling of osg::Image, osg::HeightField, osg::Shader and osg::Node when doing writes to the archive.
2012-11-22 09:49:24 +00:00
Robert Osfield
f0b3a47735
From Stephan Huber, further work on osc plugin
2012-11-21 15:19:58 +00:00
Robert Osfield
4b4327aaae
Moved static for local to global scope in Uniform.cpp and removed the local static usage in Registry.cpp
2012-11-21 14:27:54 +00:00
Robert Osfield
3a67eefd9f
Refactored osgDB::Input::readObjectOfType to use a template, and updated associated wrappers to avoid using local static's
2012-11-21 13:38:11 +00:00
