Commit Graph

9811 Commits

Author SHA1 Message Date
Robert Osfield
f99408f254 Fixed possible memory leak 2016-07-06 20:34:41 +01:00
Robert Osfield
e5e89a3ac9 Added handling of null 2016-07-06 20:23:34 +01:00
Robert Osfield
8b3944f51c Changed dynamic_cast<> to static_cast<> as type is known based on getType() query.
Added missing break statement.
2016-07-06 20:21:53 +01:00
Robert Osfield
0ef196b84c Added null pointer check 2016-07-06 20:15:49 +01:00
Robert Osfield
b907a6e1a6 Fixed null pointer check 2016-07-06 20:13:36 +01:00
Robert Osfield
84eca67498 Added null pointer check 2016-07-06 20:08:03 +01:00
Robert Osfield
666a5def96 Fixed use of invalidated iterator 2016-07-06 20:04:13 +01:00
Robert Osfield
5c5cdbabf7 Added null pointer check 2016-07-06 19:58:23 +01:00
Robert Osfield
a898f2a7e1 Fixed TabPlaneDragger's handling of pressing the right mouse button whilst holding the left mouse button down, then releasing hte left mouse button. 2016-07-06 19:45:02 +01:00
Robert Osfield
c753a99a38 Added ability to assign callbacks from lua scripts 2016-07-06 11:36:25 +01:00
Robert Osfield
d8bac1d363 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-07-05 18:11:31 +01:00
Robert Osfield
8066a1da04 Added readObject() implementation. 2016-07-05 18:10:51 +01:00
OpenSceneGraph git repository
bb509879ca Merge pull request #103 from marchelbling/update_stl
Update stl.

    fixes magics color parsing
    adds support for incomplete binary stl files
2016-07-05 18:04:50 +01:00
Robert Osfield
ca4355974f Fixed warnings 2016-07-05 17:57:28 +01:00
Marc Helbling
e4c31cdcbf Adds support for incomplete stl binary files
The logic is
* if a file is not ascii
* if its sizeis less than the expected binary size
then we can assume that the data is incomplete but still try to load it.
2016-07-05 17:09:45 +02:00
Marc Helbling
f4d0131967 Fixes magics color parsing
`fread` returns the number of objects read, not a byte-size.
2016-07-05 17:09:41 +02:00
Marc Helbling
67c301c236 Adds specific flag for compressed animation buffers 2016-07-05 16:52:17 +02:00
Marc Helbling
67b17fa801 Updates osgjs plugin for animation serialization 2016-07-05 16:48:53 +02:00
Marc Helbling
6fd972fa42 Fixes gles coverity defects 2016-07-05 16:32:00 +02:00
Robert Osfield
ab69edb506 Fixed typo 2016-07-05 12:57:41 +01:00
Robert Osfield
dce1473a53 Seperated out the scene->requiresRedraw() method into a osgViewer::Viewer::requiresRedraw() method to make the functionality clearer and easier to override. 2016-07-05 11:54:31 +01:00
Robert Osfield
16d497ef80 Simplified DatabasePager::requires*() methods 2016-07-05 11:42:03 +01:00
OpenSceneGraph git repository
076503f247 Merge pull request #100 from filnet/checkneedtodoframe
streamline DatabasePager::requiresUpdateSceneGraph()
2016-07-05 11:27:44 +01:00
Robert Osfield
7635f1774f Added missing Plane and Quat handling 2016-07-05 07:41:23 +01:00
Philippe Renon
22d53357d3 split requiresUpdateSceneGraph() into requires update and requires redraw (wip) 2016-07-04 23:19:20 +02:00
Philippe Renon
e23a30652d streamline DatabasePager::requiresUpdateSceneGraph()
would trigger unnecessary redraws when there were pending file requests or active database threads

tested ok with and without IncrementalCompileOperation
2016-07-04 21:42:19 +02:00
Robert Osfield
935a5c4e22 Added version guard around new parameter serializer 2016-07-04 20:26:28 +01:00
Julien Valentin
36930dcd18 Added serializer support for RigTransforms 2016-07-04 20:19:58 +01:00
Robert Osfield
1fe2d6d31f Added templte methods and implementations for Vec2,3,4 for b,ub,s,us,i and ui. 2016-07-04 13:37:29 +01:00
Robert Osfield
2ebe4813d6 Replaced seperate implementations with template implementations 2016-07-04 11:02:58 +01:00
Robert Osfield
6870c195d0 Replaced seperate getValue(Vec*) implementations with template based implementation 2016-07-04 10:53:06 +01:00
Robert Osfield
55e4d567c4 Added ValueObject pushValue handling for Vec2*, Vec3*, Vec4 for b,ub,s,us,i and ui. 2016-07-04 10:34:03 +01:00
Robert Osfield
9e0c46d55f Added Vec*b, Vec*s, Vec*i getValue(..) implementations 2016-07-04 10:14:47 +01:00
Robert Osfield
bc7bd7da9d Replaced pushVec(Vec2f etc.) implementations with template implementations. 2016-07-04 10:11:34 +01:00
Robert Osfield
0f95ad5f9f Added initializers 2016-07-02 12:54:48 +01:00
Robert Osfield
e698ddb719 Introduced ref_ptr<> usage to avoid potential memory leaks 2016-07-02 12:52:20 +01:00
Robert Osfield
143d423d1f Added handling of return type 2016-07-02 12:39:06 +01:00
Robert Osfield
5beb15fa77 Added handling of return type 2016-07-02 12:37:22 +01:00
Robert Osfield
922c860814 Fixed types 2016-07-02 12:33:31 +01:00
Robert Osfield
39d439cea4 Added handling of return type 2016-07-02 12:31:08 +01:00
Robert Osfield
5128461c67 Added initializer 2016-07-02 12:29:07 +01:00
Robert Osfield
8250bdce15 Added initializer 2016-07-02 12:27:48 +01:00
Robert Osfield
5bfc7b9908 Fixed warning and quitened ones caused by 3rd party headers. 2016-07-02 12:13:08 +01:00
Robert Osfield
40d5d1712d Changed to an int comparison 2016-07-02 11:09:12 +01:00
Robert Osfield
2122980d0a Fixed number of processors setting 2016-07-02 10:14:06 +01:00
OpenSceneGraph git repository
9ae4a4fc27 Merge pull request #95 from marchelbling/tristripvisitor_index_option
Adds an indexMesh option to disable mesh reindexation
2016-07-01 18:07:16 +01:00
OpenSceneGraph git repository
d0b755e6cc Merge pull request #94 from marchelbling/gles_plugin_update
Updates gles plugin.

This PR updates the GLES plugin with latest Sketchfab changes:

    improves geometry splitting
    processes/cleans animation (for subsequent osgjs serialization)
    adds (yet another) normal smoother
2016-07-01 18:03:29 +01:00
Marc Helbling
da47f8a156 Adds an indexMesh option to disable mesh reindexation
This mainly breaks gles/osgjs when stripifying a MorphGeometry. It also
usually doesn't make sense to reindex an already indexed mesh.
2016-07-01 18:12:36 +02:00
Marc Helbling
9fbdaaae65 Updates gles plugin 2016-07-01 17:28:01 +02:00
Marc Helbling
43443928d0 Updates osgAnimation
This updates is mainly for the gles plugint to work correctly.

* adds Quaternion array
* reintroduces `KeyframeContainer::linearInterpolationDeduplicate`
* fixes MorphGeometry OSG serialization (target names)
2016-07-01 17:04:15 +02:00