Robert Osfield
9f55408ca3
Removed the optional build for osgWidget and plugins as these are options that are appropriate for building all the time
2008-11-22 14:30:21 +00:00
Robert Osfield
56a2cc65d0
From Cedric Pinson, Pulled in osgAnimation from OpenSceneGraph-osgWidget-dev into svn/trunk.
2008-11-22 12:14:19 +00:00
Robert Osfield
d903423ded
From Jaromir Vitek, osgpackeddepthstencil example as a test case.
2008-11-21 12:38:22 +00:00
Robert Osfield
beae8ab67f
Clean up osgbrowser after moving browser implementation into gecko plugin
2008-11-20 11:28:20 +00:00
Robert Osfield
5288263528
Moved Browser.h and Browser.cpp from osgbrowser into osgWidget.
2008-11-19 17:16:29 +00:00
Robert Osfield
35330867c5
Fixed component directory path handling.
2008-11-19 17:02:45 +00:00
Robert Osfield
094733def5
Refactored browser classes so that there is now a base class and reader writer.
2008-11-19 16:58:32 +00:00
Robert Osfield
297dd32011
Changed osgbrowser example to use a local CMakeModules/FindXUL.cmake script,
...
and specialization of GTK dependencies to only non Windows/OSX platforms.
2008-11-18 23:38:18 +00:00
Robert Osfield
a36ff70df4
Removed debug output
2008-11-18 17:20:45 +00:00
Robert Osfield
96188d0240
Moved update functionality into from UBrowserImage into update.
2008-11-18 14:46:02 +00:00
Robert Osfield
3b3d932d30
Added support for running all ubrowser operataions in a background thread.
2008-11-18 13:36:47 +00:00
Robert Osfield
8abd7c3a76
Fixed key mapping
2008-11-17 19:15:12 +00:00
Robert Osfield
37bd44042a
Refactored the UBrowser functionality so a UBrowserThread singlton class takes
...
over more responsibility of integratation with llmozlib.
2008-11-17 17:58:59 +00:00
Robert Osfield
ca5c93a983
Removed dependency on GLUT.
2008-11-17 15:53:04 +00:00
Robert Osfield
5eaf95ed0f
Ported example to using OSG objects for rendering rather than GLUT
2008-11-17 15:49:24 +00:00
Robert Osfield
39646d2dff
Introduced xulrunner extensions from llmozlib2, and got things working under linux
2008-11-17 10:36:55 +00:00
Robert Osfield
2a1f7f0f7a
Added GTK and GLUT guards to osgbrowser include
2008-11-14 16:54:07 +00:00
Robert Osfield
b62cb79c7e
Further work on experiment llmozlib/geko based embedded web browser
2008-11-14 16:48:07 +00:00
Robert Osfield
d75cc7f84d
An "attempt" at using LLMozLib sources as a base for a gecko based embedded browser.
2008-11-13 15:35:08 +00:00
Robert Osfield
ab9c0898c3
Moved Poppler-glib check into root CMakeList.txt
2008-11-12 22:54:12 +00:00
Robert Osfield
69effce44e
Improved filepath handling, and increased the image resolution for better rendering quality
2008-11-12 14:57:30 +00:00
Robert Osfield
771dc7d645
Introduced new osgpdf example that use Cario + Poppler libraries to provide a means of rendering a pdf document to an osg::Image.
2008-11-12 14:21:05 +00:00
Robert Osfield
89829f8153
Added osgViewerGetVersion() into context creation code as a means of forcing windows to link in osgViewer properly.
2008-11-12 10:30:17 +00:00
Robert Osfield
c1568bb735
Improved naming
2008-11-11 17:59:35 +00:00
Robert Osfield
f1bb6592bb
Tweaked comment
2008-11-11 17:30:11 +00:00
Robert Osfield
014246bef6
Added default fallback of a window context is none is otherwise specified.
2008-11-11 17:29:48 +00:00
Robert Osfield
7468904dd6
Added command line argument docs and support for -h/--help command line options
2008-11-11 16:59:58 +00:00
Robert Osfield
ee172b840c
Added timing stats
2008-11-11 16:21:04 +00:00
Robert Osfield
3754dc4230
Added --geometry, --geometry-vbo and --geometry-va command line options and associated geometry test codes
2008-11-11 16:13:37 +00:00
Robert Osfield
4dd8ad2f16
Added --delay <microseconds> option that is run between each OpenGL object apply, defaults to 0
2008-11-11 15:00:29 +00:00
Robert Osfield
0de253ad2c
Added support for fbo testing.
2008-11-11 12:50:51 +00:00
Robert Osfield
915a645761
First cut of osgmemorytest example that is written to allocate many windows/pbuffer/GL objects as test of how many objects can be allocated on a machine.
2008-11-10 20:06:27 +00:00
Robert Osfield
5bb6fe2ee7
Added support for Camera::PACKED_DEPTH_STENCIL_BUFFER to .osg and .ive formats
2008-11-09 11:56:02 +00:00
Robert Osfield
d75cd032b9
From Jean-Sebastien Guay, replaced M_PI with osg::PI.
2008-11-08 17:53:51 +00:00
Robert Osfield
720551d549
From Michael Platings, Converted std::fstream/ifstream/ofstream to osgDB::fstream/ifstream/ofstream and
...
fopen to osgDB::fopen to facilitate support for wide character filenames using UT8 encoding.
2008-11-07 15:08:08 +00:00
Robert Osfield
c7c1913561
From Ulrich Hertleinm "cmake 2.6 is having trouble on Mac OS X because example/CMakeLists.txt addes subdirectory osgviewerGLUT twice. I took the liberty to remove the second occurrence.
...
"
2008-11-06 13:40:35 +00:00
Robert Osfield
c80c7dd5b9
From Chris Denham, added transform to cube to test picking fixes
2008-11-06 13:36:25 +00:00
Robert Osfield
239c18eddb
Removed redundent static ImageStream pointer
2008-11-05 16:06:25 +00:00
Robert Osfield
a063d1dfb0
Added --no-rescale, --rescale (default) and --shift-min-to-zero command line options for controlling how the pixel data is managed.
2008-11-05 15:59:48 +00:00
Robert Osfield
de4e08e868
Added --replace-rgb-with-luminance option
2008-11-05 15:04:38 +00:00
Robert Osfield
bc2e8034fe
Fixed --images commandline parsing
2008-11-04 12:57:30 +00:00
Robert Osfield
9bba7bbee0
Refactored osgvnc example to utilise the new vnc plugin
2008-11-03 15:58:02 +00:00
Robert Osfield
521a951b58
Wrapped up the various client streaming methods + thread into VncImage classes.
2008-10-31 16:48:19 +00:00
Robert Osfield
f1cc01c6b8
Implemented keyboard and mouse dispatch from vnc client to vnc server.
2008-10-31 13:59:32 +00:00
Robert Osfield
bad9854d71
Added very basic osgvnc example that uses the LibVNCServer client libries for implementing a vnc client
...
as an osg::Image with the vnc data stream going to it.
2008-10-31 12:03:44 +00:00
Robert Osfield
4b28e22d34
From Lukas Diduch, added a multithread compsite viewer path, accessible using:
...
osgviewerQT --MTCompositeViewer --QOSGWidget cow.osg
2008-10-29 10:25:24 +00:00
Robert Osfield
649bc16753
From James Moliere, fixed display of axis
2008-10-29 10:12:02 +00:00
Robert Osfield
0b451491b0
From Chris Denham, changed nested Camera intersection test so that it requires the command line --relative-camera-scene to enable it
2008-10-27 19:59:05 +00:00
Robert Osfield
ff74744556
From Chris Denham, default scene that tests the use of in scene graph Camera which has a RELATIVE_RF ReferenceFrame.
2008-10-27 16:16:28 +00:00
Robert Osfield
b1c858d8f8
Fixed positioning of wings
2008-10-27 10:40:13 +00:00
Robert Osfield
10186190f6
Introduced support for controlling mipmapping of osgTerrain::ImageLayer and compression of osgTerrain::HeightFieldLayer.
2008-10-20 08:43:25 +00:00
Robert Osfield
36a93d9cf3
Converted M_PI* usage across to osg::PI
2008-10-14 16:44:14 +00:00
Robert Osfield
8c6f65caca
From James Moliere,
...
" The code below is to show how a heirarchy of objects can be made within a scenegraph.
In other words, how there can be a parent/child relationship between objects such
that when a parent is rotated or translated, the children move is respect to it's
parent movement. A robotic arm is used in this example because this is what I'm
using OSG for."
2008-10-14 15:24:39 +00:00
Robert Osfield
e4057b65ee
Removed geomoflife_frag.cpp experiement from CMakeList.txt file
2008-10-14 15:10:10 +00:00
Robert Osfield
3aebed206e
From J.P Delport, game of life example that demonstrates ping pong render to texture rendering
2008-10-14 14:58:10 +00:00
Robert Osfield
907a51b198
Replaced usage of depreacted IntersectVisitor with IntersectionVisitor
2008-10-07 14:01:14 +00:00
Robert Osfield
1f4e712fd8
Improved the ImageSequence::setLength() settting.
2008-10-06 17:03:32 +00:00
Robert Osfield
3b4184295e
Various improvements to the dicom loader to be able to handle a broader range of dicom files
2008-10-02 15:45:08 +00:00
Robert Osfield
66c857b645
Updated shaders
2008-09-29 18:30:17 +00:00
Robert Osfield
d4c6af753f
Added support for using ImageSequence to animate volumes
2008-09-29 10:56:42 +00:00
Robert Osfield
38171cc1b9
Improved the isosurface shaders, and mde GLSL usage the default
2008-09-28 15:16:13 +00:00
Robert Osfield
d8cfc9b1f5
Improved GLSL isosurface support when using a transfer function
2008-09-26 15:47:31 +00:00
Robert Osfield
21865d3ec1
Added setting of various filters and setResizeNonPowerOfTwoHint(false) on normals maps etc.
2008-09-26 14:50:41 +00:00
Robert Osfield
5a9e957412
Added docs for read-threads <numthreads> command line options
2008-09-26 13:51:49 +00:00
Robert Osfield
026314bf83
Added --isosurface and --mip paths into osgvolume example, and added associted shaders
2008-09-26 11:29:00 +00:00
Robert Osfield
90ccb05fb1
From Mathias Froehlich, "for the rand functions stdlib.h is required ..."
2008-09-26 11:19:59 +00:00
Robert Osfield
a3d25add27
Added osg2cpp example into build
2008-09-25 14:41:27 +00:00
Robert Osfield
8c276a0b5e
Created new osg2cpp utility that creates .cpp files from source shaders that can be included directly in application code, see osgvolume for an example.
2008-09-25 14:39:57 +00:00
Robert Osfield
134a2e69a0
Moved shaders into .cpp, with the shaders created by the new osg2cpp utility
2008-09-25 14:39:08 +00:00
Robert Osfield
4cb79dcddf
From Jean-Sebastian Guay, fixed windows build
2008-09-24 16:03:47 +00:00
Robert Osfield
62331769ac
Added shader based transfer function, enabled via --gpu-tf
2008-09-24 10:45:15 +00:00
Robert Osfield
169d9f550e
Fixed transfer function parsing
2008-09-24 10:20:23 +00:00
Robert Osfield
edc966c4c2
Added "serialize" and plugin "preload" options in the "read-threads" code path.
2008-09-23 15:41:49 +00:00
Robert Osfield
1b02cf99dc
Added read-threads <numThreads> command line and read thread test back end
2008-09-23 13:58:49 +00:00
Robert Osfield
b1c93f05f6
From Wojciech Lweandowski, added support for noew LispSM shadow technique (use --lispsm on CmdLine) and added IslandScene database (use -4 on CmdLine).
2008-09-23 09:59:23 +00:00
Robert Osfield
55d4756d31
Added support for reading raw data and transfer function from a volume header
2008-09-22 17:24:26 +00:00
Robert Osfield
65cb2e625f
Added --page-and-discard, --page-and-retain, --preload and --length command line options
2008-09-22 16:18:02 +00:00
Robert Osfield
260334e4fe
Added stats handler
2008-09-22 15:56:22 +00:00
Robert Osfield
21686c27af
From Mathias Froehlich, "I did some performance test runs with the development gcc-4.4 version.
...
To make it compiel with future gcc's we sppear to need the attached missing
includes ..."
2008-09-18 10:52:35 +00:00
Robert Osfield
274aa49f8a
From Christophe Loustaunau,"
...
I have found some errors on the example osgGeometryShaders. It's about the varying in the geometry shader.
take a look at the varying vec4 v_color.
In the vertex shader, v_color is initialized to gl_vertex
then in the geometry shader v_color is initialized to gl_PositionIn[0]
and in the fragment shader v_color is used as the fragment color.
Try to initialized v_color to vec4(1.0, 0.0, 0.0, 1.0) in the vertex shader and comment the line :
" v_color = v;\n" in the geometry shader, and you will see the lines as black !
It's because you have to use keywords in and out.
extract from : http://www.opengl.org/registry/specs/EXT/geometry_shader4.txt :
in - for function parameters passed into a function or for input varying
variables (geometry only)
out - for function parameters passed back out of a function, but not
initialized for use when passed in. Also for output varying variables
(geometry only).
Then for a geometry shader, a varying must be an array :
extract from : http://www.opengl.org/registry/specs/EXT/geometry_shader4.txt :
Since a geometry shader operates on primitives, each input varying variable needs to be
declared as an array. Each element of such an array corresponds to a
vertex of the primitive being processed. If the varying variable is
declared as a scalar or matrix in the vertex shader, it will be a
one-dimensional array in the geometry shader. Each array can optionally
have a size declared. If a size is not specified, it inferred by the
linker and depends on the value of the input primitive type.
Here is a patch based on the svn version of osg that correct that.
"
2008-09-17 17:25:39 +00:00
Robert Osfield
22eae68e48
From Mathias Froehlich, "This is a generic optimization that does not depend on any cpu or instruction
...
set.
The optimization is based on the observation that matrix matrix multiplication
with a dense matrix 4x4 is 4^3 Operations whereas multiplication with a
transform, or scale matrix is only 4^2 operations. Which is a gain of a
*FACTOR*4* for these special cases.
The change implements these special cases, provides a unit test for these
implementation and converts uses of the expensiver dense matrix matrix
routine with the specialized versions.
Depending on the transform nodes in the scenegraph this change gives a
noticable improovement.
For example the osgforest code using the MatrixTransform is about 20% slower
than the same codepath using the PositionAttitudeTransform instead of the
MatrixTransform with this patch applied.
If I remember right, the sse type optimizations did *not* provide a factor 4
improovement. Also these changes are totally independent of any cpu or
instruction set architecture. So I would prefer to have this current kind of
change instead of some hand coded and cpu dependent assembly stuff. If we
need that hand tuned stuff, these can go on top of this changes which must
provide than hand optimized additional variants for the specialized versions
to give a even better result in the end.
An other change included here is a change to rotation matrix from quaterion
code. There is a sqrt call which couold be optimized away. Since we divide in
effect by sqrt(length)*sqrt(length) which is just length ...
"
2008-09-17 16:14:28 +00:00
Robert Osfield
0598ac3b69
Updated osgwidget examples to use the new osg::clone() methods
2008-09-17 14:23:25 +00:00
Robert Osfield
6ea2adf1f5
Introduced beginings of osgVolume NodeKit.
2008-09-16 15:32:23 +00:00
Robert Osfield
b5474780c3
Change the GLSL textureRec and texture2D parameters to use .st to make sure they only use 2D coords.
...
Add setResizeNonPowerOfTwoHint to false for Texture2D.
2008-09-16 09:31:29 +00:00
Robert Osfield
d07f3d5662
Added optional usage of DCMTK in the dicom plugin
2008-09-15 19:59:12 +00:00
Robert Osfield
b55ed0c56b
Added reading of whole directories of images
2008-09-13 13:38:06 +00:00
Robert Osfield
b000198cc4
Removed use of ints and reading from gl_FragColor in shader
2008-09-12 15:41:30 +00:00
Robert Osfield
ff299eb104
Introduced osgTerrain::WhiteListTileLoadedCallback for the management of options terrain layers
2008-09-11 13:21:58 +00:00
Robert Osfield
a214a677f8
First cut of WhiteListTileLoadedCallback
2008-09-11 10:40:48 +00:00
Robert Osfield
4f6b405edf
Added support for reading source image file names from the command line.
2008-09-11 09:05:16 +00:00
Robert Osfield
b4b5b5ea41
Introduced TerrainTile::TileLoadedCallback
2008-09-10 18:11:54 +00:00
Robert Osfield
b0cf7823a7
Added playing of the imagesequence on creation of the imagesequence
2008-09-10 11:27:00 +00:00
Robert Osfield
5484981693
Removed std:: from in front of strcmp and added a string.h
2008-09-01 10:19:06 +00:00
Robert Osfield
9499cfa420
Improved the GLSL implementation.
2008-08-26 17:40:04 +00:00
Robert Osfield
6c047f7abe
Added testing of max texture size using a realize operation
2008-08-25 11:37:53 +00:00
Robert Osfield
94c6c9d32a
Added support for event handler for non shader path, enable alpha func
2008-08-25 10:38:39 +00:00
Robert Osfield
8d8852bc23
Added command line arguments to Viewer constructor, and added meaningful error message when no 3d image is provided
2008-08-25 09:53:24 +00:00
Robert Osfield
f5105510f3
Added support for reading the image transform from UserData in the form of a Matrix.
2008-08-22 16:35:49 +00:00
Robert Osfield
3cec676d98
Added --mip command line option which enables Maximum Intensity Projection filtering
2008-08-18 15:08:04 +00:00
Robert Osfield
38f6cddc2c
Changed osg::ImageSequence::set/getDuration to set/getLength() to be in keeping with the
...
osg::ImageStream's getLength().
2008-08-15 16:21:44 +00:00
Robert Osfield
b6292f4537
Fixed the name of _playToggle
2008-08-15 13:07:04 +00:00
Robert Osfield
927942a0f8
Further work on osg::ImageSequence, improving pause functionality, and introducing new seek(double time) method
2008-08-15 12:45:20 +00:00
Robert Osfield
56001f3d82
Added event handler to toggling looping and play/pause
2008-08-14 16:28:45 +00:00
Robert Osfield
5cac386fa6
Renamed enums in osgWidget from ALLCAPITALS to normal OSG conventional of AllCapital
2008-07-25 20:50:42 +00:00
Robert Osfield
c9dc578186
Added support for pruning old images, recording the Duration in the .osg file, and -o filename output support in osgimagesequence.
2008-07-22 16:44:49 +00:00
Robert Osfield
66c2add024
Improved position when multiple videos are provided
2008-07-22 15:58:40 +00:00
Robert Osfield
669d6be0b2
Fixed handling of TextureCubeMap's with mipmapped/ImageSequence/PBO's.
2008-07-22 14:47:59 +00:00
Robert Osfield
041a06b89d
Further work on osg::ImageSequence/osgDB::ImagePager
2008-07-21 21:00:57 +00:00
Robert Osfield
acd7e65687
Added basic image sequencing
2008-07-21 17:28:22 +00:00
Robert Osfield
dc19bcc7e0
Added --login <url> <username> <password> http authentication.
2008-07-21 15:05:08 +00:00
Robert Osfield
ac61676368
Initial cut of osgimagesequence example
2008-07-21 10:57:06 +00:00
Robert Osfield
b068777c22
Refactored the MultiTextureControl node callback so that the update is now
...
done as an update callback, with the elevation aquired via a cull callback
2008-07-16 15:58:15 +00:00
Robert Osfield
a20e5791d9
From Jeremy Moles, Updated file references to reflect new data in OpenSceneGraph-Data
2008-07-15 22:30:51 +00:00
Robert Osfield
8fe0820bb8
Converted tabs to four spaces
2008-07-15 22:03:59 +00:00
Robert Osfield
b343cbfc5f
Removed now redundent example
2008-07-15 19:23:48 +00:00
Robert Osfield
f1138fa684
From Jean-Sebastian Guay, "Here are the CMakeLists.txt files for the osgWidget examples, changed to use SETUP_EXAMPLE like the other examples."
2008-07-15 18:53:16 +00:00
Robert Osfield
43cedf9eb4
Fixed typo
2008-07-15 18:12:17 +00:00
Robert Osfield
c2b77aa08e
From Jeremy Moles, import of the osgWidget NodeKit, sourced from the original http://osgwidget.googlecode.com/svn/trunk
...
Notes from Robert Osfield, I've merged osgWidget trunk, and added/changed CMakeLists.txt file to make it suitable for inclusion in the core OSG, and moved imagery/scripts/shaders out into OpenSceneGraph-Data
2008-07-15 17:21:25 +00:00
Robert Osfield
ccb50019e4
Cleaned up osgkdtree example
2008-07-12 11:19:25 +00:00
Robert Osfield
2b5708888e
From Adrain Egli, "i added a default scene with 7 different draggers attached. it's more easy to test the draggers."
2008-07-11 19:52:25 +00:00
Robert Osfield
15e5bdbcae
Added range of camera manipulators and a center of screen test intersection that
...
is insticated by pressing 'c' key
2008-07-09 19:28:00 +00:00
Robert Osfield
3965fe357b
Moved KdTree build code into osg::KdTree
2008-07-06 12:14:19 +00:00
Robert Osfield
44d144997e
Added prelimnary KdTree data structure and automatic kdtree build support
...
into osgDB::Registry/osgTerrain so that newly created subgraphs can have
KdTree built on all osg::Geometry automatically on load/creation.
2008-07-04 15:57:48 +00:00
Robert Osfield
e2ae39c8f6
Introduced bounding boxes to KDLeaf and KDNode structs
2008-07-03 17:18:14 +00:00
Robert Osfield
178d6ff423
Added new data structure + build algorithm that places triangles into leaves
...
without being shared, but with varying the boundaries of leaves so that they
may overlap.
2008-07-03 15:49:28 +00:00
Robert Osfield
7db303b16b
Added header guards
2008-07-03 11:23:44 +00:00
Robert Osfield
f0defbd824
Refactored example so that the example will be able to run different kdtree data strucutres/algorithms.
2008-07-03 11:22:23 +00:00
Robert Osfield
1729ec0819
Implement an experiemental triangle kdtree building support
2008-07-03 10:24:20 +00:00
Robert Osfield
82ed445a31
Added Vec3Array arrange pointer to avoid dynamic cast
2008-07-01 13:56:02 +00:00
Robert Osfield
12044a43d9
From Eric Sokolowski, Cmake support for osgviewerCocoa
2008-06-26 13:08:24 +00:00
Robert Osfield
275811d02a
From Eric Sokolowsky, "I have made a number of changes intended to get a few things working better on OSX. However, since I'm still pretty new at Mac development and cmake I'm not entirely certain that the changes I have made are benign on other platforms. I have tested these changes on Leopard with CMake 2.6 generating Xcode 3.0 projects, compiling on ppc and i386 for 10.5 and 10.4, and on Linux (CentOS) and everything still seems to work ok. Here are the changes I made (against OSG svn as of this afternoon):
...
- Added osgviewerCocoa example to APPLE builds
- Fixed corrupt Xcode project generation with CMake 2.6 dealing with ADD_DEFINITIONS and CMake Policy CMP0005 on Leopard
- Resolved CMP0006 warning for examples and programs by setting BUNDLE DESTINATION to same as RUNTIME DESTINATION with CMake 2.6
- Fixed freetype plugin on Leopard to avoid OpenGL linking problem
- Figured out how to use a custom Info.plist included in the project (see osgviewerCocoa application CMakeLists.txt)"
2008-06-23 09:57:45 +00:00
Robert Osfield
113a77b219
Converted tabs to four spaces
2008-06-21 11:34:01 +00:00
Robert Osfield
37d81679b7
From Paul Melis, "Here is a reworked version of the osgviewerWX example. It changes the GraphicsWindowWX to only inherit from osgViewer::GraphicsWindow and adds a standalone widget, called OSGCanvas, that derives from wxGLCanvas. This solves a problem with the GraphicsWindowWX instance being destructed twice (see "Crash in osgviewerWX" of June 12th on osg-users). At program exit, the main frame deletes all of its children widgets and therefore calls GraphicsWindowWX's destructor, bypassing OSG's reference counting. The GraphicsWindowWX instance is then later destructed a second time when the reference held by osg::Camera goes to zero. This bug isn't exposed by the example directly, but if people are going to use the example as a basis (like the poster in the mentioned thread) they very likely will run into this problem.
...
"
2008-06-19 13:49:36 +00:00
Robert Osfield
7ae28bea0d
Added --fbo-samples value and --color-samples value command line paramters for enabling fbo multisampling
2008-06-18 14:21:22 +00:00
Robert Osfield
20e6ec7b23
From Jean-Sebastien Guay, "The new osgscreencapture example was being installed to bin instead of to share/OpenSceneGraph/bin, this is because the CMakeLists.txt used SETUP_APPLICATION instead of SETUP_EXAMPLE. Corrected CMakeLists.txt attached.
...
"
2008-06-06 16:45:07 +00:00
Robert Osfield
b6a0f3d8d0
Cleaned up implementation to only use simple structure
2008-06-06 14:10:20 +00:00
Robert Osfield
ed45e32355
Introduce a lower overhead data structure for leaves.
2008-06-06 13:21:27 +00:00
Robert Osfield
aa73e1d1d4
Added update traversal to run prior to doing kdtree build to make sure that
...
costs in build osgTerrain databases isn't incurred during the build traversal.
2008-06-06 10:51:23 +00:00
Robert Osfield
ac068178aa
Added timing code
2008-06-05 18:52:29 +00:00
Robert Osfield
a9b1ea660d
Basic implementation of kdtree generation based on vertices
2008-06-05 17:28:06 +00:00
Robert Osfield
9212d4dd95
Further work on fleshing out basic classes
2008-06-04 17:59:39 +00:00
Robert Osfield
338be0b926
Fleshed out some basic kd-tree data structures.
2008-06-03 17:29:27 +00:00
Robert Osfield
8d0c7890ce
First cut of osgkdtree example, this will be used as a base of the development of
...
native kdtree support to help speed up intersection testing.
2008-06-03 16:13:49 +00:00
Robert Osfield
5711964481
Added unit test to smoke out a thread issue with using ofstream("/dev/null") inside
...
osg::notify()
2008-06-03 11:28:16 +00:00
Robert Osfield
1047f970bb
From Adrian Egli, improvements to ParallelSplitShadowMap implementation
2008-05-28 14:11:22 +00:00
Robert Osfield
aee0e8dc37
Introduced a TerrainHandler that adjust the sameple ratio and vertical scale
...
of terrain interactively using the 'r','R' and 'v','V' keys respecitvely.
2008-05-27 15:28:39 +00:00
Robert Osfield
ae303e38e9
From Paul Melis, "Here is an update to the osgviewerWX example. Keyboard events were not always received because the GraphicsWindowWX wasn't receiving focus. It now receives focus when the mouse enters the window.
...
* I split the mouse handling from a monolithic method to separate ones, slightly cleaner than a whole bunch of if()'s, especially with another case of the mouse entering the canvas.
* I changed the EVT_KEY_DOWN handler to an EVT_CHAR handler, although that now makes the up and down handler assymetric. The new down-handler returns translated key codes, so when you press the S key (without anything else), it actually returns 's' and not 'S' as the EVT_KEY_DOWN did. This means that statistics can be called up in the viewer window, while the example previously only printed a "Stats output:" line to the console. I'm not truly happy that the up handler returns _untranslated_ key codes. But solving this completely would probably mean adding some table that translated from wxWidgets' untranslated key codes to OSG's internal ones. This might be interesting to add, as anyone using OSG + wxWidgets in any serious manner would also have to add this.
* I commented out the evt.Skip()'s in the keyboard handlers as these would only be necessary if there were some key events that are not handled. But currently all key events are simply forwarded.
* I changed the handling of a mouse drag to a more general mouse move"
2008-05-26 21:09:54 +00:00
Robert Osfield
7592e50cde
Introduce --pbuffer-only width height option, and added fps reporting to stats output
2008-05-26 16:25:31 +00:00
Robert Osfield
57ce3f820e
Added basic --pbuffer width height support
2008-05-26 15:41:54 +00:00
Robert Osfield
7aac7ef381
Added better stats reporting
2008-05-26 14:30:48 +00:00
Robert Osfield
bb1f6ff7c1
Added feedback of pixel format chosen for read back
2008-05-26 12:01:24 +00:00
Robert Osfield
8ed9b303f1
Added automatic selection of the pixel type according to the window type
2008-05-26 11:59:25 +00:00
Robert Osfield
d2afe3e956
Added option for doing triple buffering, and set the default read format
...
to GL_RGBA
2008-05-26 11:53:51 +00:00
Robert Osfield
dc7db11e63
Switch to using an inital draw callback when use --start-frame
2008-05-25 22:06:41 +00:00
Robert Osfield
5664c51cf0
Added option for setting whether the front or back buffer should be read using
...
--front and --back command line options.
2008-05-25 21:52:32 +00:00
Robert Osfield
28fd4b07c9
Added option for controlling whether the front buffer is read at the start of the
...
frame or the back buffer at the end of the frame.
2008-05-25 21:35:39 +00:00
Robert Osfield
cc07d064bf
Changed default format to GL_BGR
2008-05-24 08:13:55 +00:00
Robert Osfield
90308d22aa
Added single buffered and double buffered PBO support, and --no-pbo,
...
--single-pbo and --double-pbo command line parameters
2008-05-23 16:26:03 +00:00
Robert Osfield
f9f1aab67d
Added basic glReadPixels code
2008-05-22 17:50:22 +00:00
Robert Osfield
fd76054eac
Added camera final callback attachment code.
2008-05-22 15:43:01 +00:00
Robert Osfield
0a3737eb2c
Fixed name of source file
2008-05-22 13:11:23 +00:00
Robert Osfield
29d067639c
Added new osgscreencapture example folder, implementation to follow
2008-05-22 13:10:40 +00:00
Robert Osfield
01f58ffbb2
From Jeremy Moles, fixed window resize problem
2008-05-09 10:27:59 +00:00
Robert Osfield
4345382316
From Jeremy Moles, osgviewerGTK example
2008-05-08 16:39:10 +00:00
Robert Osfield
4f881b9a09
From Jeremy Moles,"Here's a small example I us to test text rendering in osgWidget; I
...
figured it might be helpful to folks in OSG who need to do the same.
"
2008-05-07 13:46:24 +00:00
Robert Osfield
53630a2b14
From Wojchiech Lewandowski, add missing setDataVariance(DYNAMIC) and extra event handlers
2008-04-24 16:24:16 +00:00
Robert Osfield
234bfeb648
Removed hardware down sampling hack from GeoemtryTechnique and replaced with Terrain::g/setSampleRatio()
...
usage.
2008-04-22 11:39:47 +00:00
Robert Osfield
1b29fb8933
From John Shue, build fix for QT 3.x
2008-04-17 11:12:21 +00:00
Robert Osfield
db1bd13c4c
From Tim Moore, compile fix for gcc 4.3
2008-04-15 11:50:34 +00:00
Robert Osfield
f9c70f2f76
Added --unit entry for controlling which texture unit the overlay works on.
2008-04-11 14:14:28 +00:00
Robert Osfield
6fed4022a6
Added reference to osgstereomatch example to osgmultiplerendertargets.
...
Added usage example use OpenSceneGraph-Data/Images examples
2008-04-11 13:04:21 +00:00
Robert Osfield
98a2289a59
From Jose Delport, a MRT example implementing stereo matching.
2008-04-11 11:58:27 +00:00
Robert Osfield
11f9575b24
From Melchior Franz, "The GUIEventAdapter header file had KeySymbols for the super and
...
hyper keys defined already, but these modifiers were missing in
GUIEventAdapter::ModKeyMask, and the EventQueue ingored them as well.
The attached diff/archive adds the missing parts for Super/Hyper
modifier key support.
I'm aware that this might not be supported on all systems/keyboards
out of the box, but decided to submit it anyway because:
- developers are aware of differences between input devices
(Some mice have scroll wheels, others don't. Some have five or
more buttons, some have only one. Some keyboards don't have
numpads, some have AltGr, some don't etc.)
- even if someone relies on Hyper/Super in distributed software,
this is easy to fix and doesn't create lock-in conditions
- while the names Hyper/Super may only be common on X11, they are
just symbol names and not OS-specific
- even though some systems might not offer these additional modifiers
by default, it's likely that all of them have at least 8 modifier
levels internally, so it should only be a matter of OS configuration
to make them work
- having super/hyper available is useful to offer a user ways
to define local key definitions that are safe from collisions with
predefined "official" key assignments"
2008-04-11 11:10:12 +00:00
Robert Osfield
22edadcdf3
Added --mouse option to enable mouse tracking, and fixed bug in assumption
...
that nv is not null.
2008-04-11 10:10:40 +00:00
Robert Osfield
fb5c839b31
From Jose Delport, introduced osgmultiplerendertargets example
2008-04-02 13:48:41 +00:00
Robert Osfield
49accb1635
Reordered set up of scene and event handlers to prevent warning
2008-03-28 15:28:03 +00:00
Robert Osfield
6396a156a2
Renamed osgTerrain::TerrainSystem to osgTerrain::Terrain
2008-03-27 11:55:03 +00:00
Robert Osfield
35c5bd2c92
Renamed Terrain to TerrainTile
2008-03-27 10:55:39 +00:00
Robert Osfield
a9d283ca73
Introduce TerrainSystem node which decorates a complete terrain model made up of Terrain tiles.
2008-03-26 20:06:54 +00:00
Robert Osfield
434337b7c8
From Tomas Hnilica, "
...
Attached is modified source of AdapterWidget.cpp file from osgviewerQT
example. Original was token today from SVN - trunk. (2.3.6).
--mdi option needs to be set to run MDI version.
Few notes:
- tested on Windows box (Win XP)
- using QT4
- I was not able to execute the example with QOSGWidget - had same
error like described in [osg-users] "fate error using QOSGWidget in
develop release
2.3.0" thread from Shuxing Xiao, 2008-01-08.
- problems are described in source
--
And Later post:
The problem of keypress events was solved by QT community, attached is
repaired AdapterWidget.cpp file.
In the AdapterWidget class constructor following line was added:
setFocusPolicy(Qt::ClickFocus);
Scene disappearing by resizing to minimum still needs to be fixed..."
2008-03-25 15:21:14 +00:00
Robert Osfield
920554c4f7
From Wojciech Leandowski, "I removed few lines of code that were setting Threading mode and Screen mode. I believe they are now not neccessary because the same does osgViewer::Viewer argument parser. In fact argument list does not contain these args after they were parsed by osgViewer::Viewer constructor.
...
I also allowed myself to add ThreadingHandler to the example."
2008-03-25 11:50:28 +00:00
Robert Osfield
26526038ca
Added mutex to prevent multiple cull threads changing the MultiTextureControl at one time.
2008-03-24 18:03:19 +00:00
Robert Osfield
584882ad24
Added full range of cameras manipulators to osgmultitexturecontrol example
2008-03-24 10:53:14 +00:00
Robert Osfield
1d1dcf2cf3
To osg::AutoTransform added support for MinimumScale, MaximumScale and AutoScaleTransitionWidth parameters
...
and a new scheme for computing the scaling when using autoscale that introduces smooth
transitions to the scaling of the subgraph so that it looks more natural.
2008-03-18 15:37:38 +00:00
Robert Osfield
b08f438946
Added example code showing how to set the minimum and maximum scales
2008-03-18 10:45:47 +00:00
Robert Osfield
80d5d01698
Fixed moving model bug where the moving model code was looking for a transform with DataVariance set to DYNAMIC, but the scene graph set up code was leaving the setting to default to STATIC. Fix involved setting DataVariance on moving transoforms to DYNAMIC.
2008-03-17 12:23:06 +00:00
Robert Osfield
7ec5673a7e
Added fire effect, enabled by --fire command line option. The new fire effect
...
has been introduced to reproduce the scaling of paricle effects
2008-03-17 10:29:23 +00:00
Robert Osfield
cf8cbc5af4
From Paul Melis, "typo fix : NVidea -> NVidia (including option --Nvidea)"
2008-03-14 16:51:39 +00:00
Robert Osfield
a364f933e4
Added iostream include
2008-03-14 14:35:15 +00:00
Robert Osfield
daef0f64f2
From Jose Delport, "attached is a version of osgunittests that does not give false alarms
...
for the case where q1 = -q2. The output of 'osgunittests quat' is now
much cleaner.
"
2008-03-13 16:38:05 +00:00
Robert Osfield
670c7967ae
From Paul Melis, "Here is an updated osgviewerWX example to bring it more in line with the
...
other GUI toolkit examples. It now takes a model file as command-line
argument (complaining if there isn't one), and its startup window size
is now actually applied (it used to be too small). I tested this with a
unicode-build of wxWidgets, as that is the recommended build type on
Linux with GTK. I'm pretty sure this version of the example will work
for the ANSI build as well, but I have no way of testing."
2008-03-13 16:22:07 +00:00
Robert Osfield
9ce276c5d7
From Alberto Luaces, "Here I send minor corrections to the text output by the osgforest example when
...
building its graphs. The message "Creating billboard based forest" appears
four times regardless of the actual type of the graph being built.
"
2008-03-13 13:43:22 +00:00
Robert Osfield
3bdfb700aa
Added extra event handlers to make viewer more functional
2008-03-11 12:10:09 +00:00
Robert Osfield
d8f674a59d
From Jean-Sebastien Guay and Robert Osfield, added optional --CompositeViewer path into osgpick to illustrate how to do picking in both viewers and as unit test for picking.
2008-03-04 14:19:03 +00:00
Robert Osfield
02b52cb73a
From Paul Martz, a third person view CompositeViewer example
2008-03-04 13:30:41 +00:00
Robert Osfield
a145975de1
Removed single threaded setting
2008-03-04 11:50:35 +00:00
Robert Osfield
a2e8d90194
Implemented fade between layers using MultiTextureControl node
2008-03-03 18:12:21 +00:00
Robert Osfield
289ef1279d
Added beginings of new osgmultitexturecontrol example
2008-03-03 14:17:56 +00:00
Robert Osfield
36bbfa9935
Fixed naming
2008-03-01 12:29:49 +00:00
Robert Osfield
aa43b3c8a6
Added Camera::g/setIntialDrawCallback and g/setFinalDrawCallback(), and added
...
screen snapshot example code to osghud.
2008-02-29 15:25:57 +00:00
Robert Osfield
79276b3169
From He Sicong, "fixed shader calculation of ray tracing"
2008-02-28 10:56:03 +00:00
Robert Osfield
3b4af26136
From Paul Martz, fixed get/set methods API
2008-02-27 11:43:58 +00:00
Robert Osfield
c52fdc0c77
Reverted back to previous version of osgtext
2008-02-25 13:07:37 +00:00
Robert Osfield
e869200b3d
Refactored the mutex usage in osgText and freetype plugin to prevent multi-thread crash
2008-02-25 12:54:54 +00:00
Robert Osfield
67f1503c7d
Refactored osgTerrain so that the interface for setting up layer is more straight forward, and added support into GeometryTechnique for handling multiple layers
2008-02-22 11:52:23 +00:00
Robert Osfield
fb2726b0db
From Philip Lowman, workaround for gcc 3.2.3 bug
2008-02-19 09:49:12 +00:00
Robert Osfield
e0e98d3426
From Mike Weiblen, "an aesthetic enhancement for displaying important version information."
2008-01-28 20:52:31 +00:00
Robert Osfield
7761129f9b
From Andy Skinner, build fixes for Solaris.
2008-01-18 21:07:03 +00:00
Robert Osfield
578f385760
From Mike Weiblen, support for geometry shaders, and osgeometryshaders example to demonstrate them.
2008-01-08 14:29:44 +00:00
Robert Osfield
a33a0047a4
Fixed warning
2008-01-08 14:22:59 +00:00
Robert Osfield
b222d4201c
From Paul Martz, "The osgocclusionquery example contained some duplicate code that was also in the core OSG occlusion query code. This change removes the need for that."
2007-12-26 22:00:28 +00:00
Robert Osfield
dea067050c
Renamed osgText::Font::SizePair to osgText::FontSizePair in prep for use this more
...
widely within osgText/freetype plugin.
Added support for inserting loading models into --mt multithreaded implementation.
2007-12-23 13:18:40 +00:00
Robert Osfield
4889342c4a
From Paul Martz, Introduced osg::OcclusionQueryNode with support for OpenGL occlusion query extension
2007-12-21 14:45:16 +00:00
Robert Osfield
998ba32501
Added parsing of parameters to Viewer constructor.
2007-12-16 13:29:02 +00:00
Robert Osfield
fddcebd479
Added StateSetManipulator for testing purposes, and fixed typo
2007-12-16 13:25:40 +00:00
Robert Osfield
be5f709bdb
From Mike Garrity, "There was an on again/off again thread on OSG users about
...
creating subclasses of osg::Array that referenced data
stored an application's internal data structures. I took
a stab at implementing that and ran into a couple of
downcasts in Geometry.cpp. Enclosed is my take at fixing
those along with a simple example of how to do this."
2007-12-11 15:55:02 +00:00
Robert Osfield
b668a54e17
From Eric Wing, "For osgviewerCocoa, a very simple change to allow toggling between
...
fullscreen mode and back between views. (To activate, double click on
the view to toggle.) It demonstrates/uses the new one-liner fullscreen
method introduced in Leopard. Code will still compile and run in
pre-Leopard (thanks to Obj-C dynamic/late binding), but code path is
treated as a no-op in those cases."
2007-12-10 20:36:34 +00:00
Robert Osfield
f4afa427a7
From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."
2007-12-10 17:30:18 +00:00
Robert Osfield
f69a48e552
From David Callu, added support of 3D text to osgText and associated plugins.
2007-12-10 15:15:56 +00:00
Robert Osfield
65bef96a6e
From Peter Hrenka, "Due to popular demand I would like to submit this
...
enhanced version of PolytopeIntersector.
New features of PolytopeIntersector :
* Dimension mask: The user may specify the dimensions of the
primitives to be tested. Checking polytope-triangle and
polytope-quad intersections is rather slow so this can
be turned off.
* Reference plane: The resulting intersections are sorted
by the distance to this plane.
New memebers of PolytopeIntersector::Intersection :
* distance: Distance of localIntersectionPoint to the reference plane
* maxDistance: Maximum distance of all intersectionPoints to the
reference plane.
* intersectionPoints: The points intersecting the planes of the polytope
or points completely inside the polytope.
* localIntersectionPoint: arithmetic mean of all intersection points
* primitiveIndex: Index of the primitive that intersected
I added some more output to the example osgkeyboardmouse."
2007-12-08 16:37:05 +00:00
Robert Osfield
195ed8ba26
From David Cullu and Robert Osfield, David addded a new style of OSG integration with QT by sublcassing from QTWidget and using osgViewer to create the graphics context, Robert added integration of this codes
...
with the original AdapterWidget implementation still available by default. The new implementation can be accessed by running:
osgviewerQT cow.osg --QOSGWidget
2007-12-08 15:46:19 +00:00
Robert Osfield
0120bae9f7
From Jeremy Moles, "This extra call to SDL_VideoSetMode() prevents my viewport from getting
...
all wonky when I resize the SDL window. I'm not sure if this bug has
always existed or not, but according to the SDL documentation this
operation should be safe regardless, and doesn't not introduce the need
for extra memory management (that is: there is no need to "cleanup" the
old screen variable, that is all handled by SDL for us).
"
2007-12-08 15:04:47 +00:00
Robert Osfield
b112e15b13
From Bob Kuehne, added extra event handlers
2007-12-06 17:53:22 +00:00
Robert Osfield
188b196ca6
From Mathias Froehlich, "n examples/osgfadetext/CMakeLists.txt osgSim as dependency is missing."
2007-12-06 17:07:04 +00:00
Robert Osfield
5b305e37b0
From Mathias Froehlich, "Attached is a changed version of osgunittests.cpp. The __FUNCTION__
...
macro/string value is not portable. Instead the functions name is just put
into the string."
2007-12-06 17:01:22 +00:00
Robert Osfield
3d7fbeca28
Added testPolytope entry
2007-12-04 14:43:14 +00:00
Robert Osfield
ca9b2dc7db
From Colin Dunlop, add --devices support.
2007-11-17 11:50:13 +00:00
Robert Osfield
2e2ddba49e
Added support for setting volume in xine plugin, manual adjustment of volume
...
in osgmove example, and clamping to 0 to 1.0 range in quicktime plugin
2007-11-04 16:08:05 +00:00
Robert Osfield
b5f681b86f
Changed the threading model to single threaded.
2007-10-05 09:03:51 +00:00
Robert Osfield
b3ecb8f38f
From Mahai Radu, improvements to handling of spotlights
2007-10-03 12:48:23 +00:00
Robert Osfield
1dc06b4553
From Mihair Radu, "Most of the additions are small utility methods:
...
- set the resolution of the shadow map; it calls dirty() to
re-initialize at next update
- keep a list of Shader objects to use instead of the default ones, if
the list is empty, the default shaders are used
- explicitly create the Uniform variables, so that subsequent additions
that require more Uniforms can put them in a central place
- set a Light or LightSource to use explicitly for shadow casting,
allows multiple lights in the scene, with one casting shadows
There are two additions that do not ( yet ) function correctly, but in
the present usage they do not interfere with the regular usage of the
techique:
- support for using spotlights, it's using Light.spotCutoff to determine
if it's a spot-light and not point-light,
there is an error in the setup of either the shadow camera or the
texgen, most likely due to the direction of the spotlight, since the
position is being used just like in point or directional lights.
- creation of a debugHUD
the hud is created properly, ( the example included shows it ), but
it displays only white, there has been some discussion of displaying the
shadow map, but I could not find it, the addition of a simple fragment
shader with the appropriate color transform should get this going."
2007-10-02 21:45:09 +00:00
Robert Osfield
55d5a4d28a
Introduced a OSG_PLUGIN_PREFIX variable into CMake build system with it set to
...
"" for all platforms except Cygwin where its set to "cygwin_" and Mingw where
it is set to "mingw_". Updated osgDB::Registry to look for these for the plugins.
Updated the osgintrospection example to search for these names as well.
2007-10-02 21:26:22 +00:00
Robert Osfield
441b0c34bd
Updated to reflect new CompositeViewer threading models
2007-10-02 21:24:23 +00:00
Robert Osfield
48f19b72bd
Added support for CompositeViewer to WindowSizeHandler, ThreadingHandler, RecordCameraPathManipulator and HelpHandler.
2007-09-30 19:27:31 +00:00
Robert Osfield
4cf73d4c87
Changed HelpHandler so it supports use with CompositeViewer and Viewer
2007-09-30 19:15:32 +00:00
Robert Osfield
4ef1864432
From Stephan Huber, add basic support for CompositeViewer in StatsHandler
2007-09-29 11:41:57 +00:00
Robert Osfield
5b263f583f
Added record path manipulator
2007-09-28 08:52:00 +00:00
Robert Osfield
41efd25660
Changed across to using a GraphicsOperation as the base class for the RealizeOperation.
2007-09-27 13:49:56 +00:00
Robert Osfield
6df0110d0c
From Adrian Egli, "update the PSSM, i did some bug fixes and added new features to move the camera virtual against the view direction by applaying a simple distance factor (a), which is calculated camera eye - camera center distance. and we can move the "light camera" against the light direction (b).
...
(a) some objects behind the camera can cast shadow
(b) object aboive the camera can cast shadow
then i fixed the shadow map orientation, now screen x coordinate alinged which improve the quality"
2007-09-27 12:47:34 +00:00
Robert Osfield
501b3241c6
Added --flip argument docs.
2007-09-25 17:02:22 +00:00
Robert Osfield
61d0bc4eaf
Added --flip option to allow one to flip the source data about the x axis.
2007-09-25 17:01:16 +00:00
Robert Osfield
b8ddf1f786
Removed all dome distortion correction code as this is now part of the core osgViewer.
...
Added viewer mode where movies are made fullscreen. One can use the old interactive
camera mode by using --interactive parameter on the command line.
2007-09-25 15:01:11 +00:00
Robert Osfield
43eacc4cbc
Preliminary PanoramicSphericalScreen support
2007-09-25 13:51:03 +00:00
Robert Osfield
d8cbd49471
Added thread unit test to test the create, start and destruction of threads
2007-09-25 10:18:50 +00:00
Robert Osfield
d11d5b819a
From Adrian Egli, further work on PSSM implementation.
2007-09-24 15:24:23 +00:00
Robert Osfield
82b0f004e9
From Adrian Egli, update to ParallelSplitShadowMap.
2007-09-22 16:46:38 +00:00
Robert Osfield
609315caa5
From Luc Frauciel, "A few improvements to osgstereoimage:
...
- When using a large numbrer of files, the command line was too long;
Added a -files option that allow to store filenames in a file (one file
per line)
- Added some more intuitive key bindings for controls (left, right, + ,
-)
- Set the texture wrapping to CLAMP_TO_EDGE (it's cleaner now)
"
2007-09-21 09:02:03 +00:00
Robert Osfield
cf69352873
From Adrian Egli, ParallelSplitShadowMap implmentation.
...
Changes by Robert Osfield - CMakeLists.txt and name change to ParallelSplitShadowMap.
2007-09-19 11:56:44 +00:00
Robert Osfield
cb1c916e25
Ran conversion of tabs to four spaces
2007-09-14 11:00:32 +00:00
Robert Osfield
89428f743a
Added _hudText->setDataVariance(osg::Object::DYNAMIC); to prevent from the
...
text being updated at the same time as being rendered.
2007-09-14 10:00:28 +00:00