FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,341 Commits 1 Branch 26 Tags 73 MiB
16da432be3
Commit Graph

9910 Commits

Author SHA1 Message Date
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
Robert Osfield
7c0c98b504 Addd loop guard to prevent negative bit shift 2016-07-01 11:08:29 +01:00
Robert Osfield
ff50edfc57 Fixed types 2016-07-01 10:57:31 +01:00
Robert Osfield
9007ab7e1d Fixed types 2016-07-01 10:38:58 +01:00
Robert Osfield
96a442f3bc Fixed type 2016-07-01 10:35:18 +01:00
Robert Osfield
3b5dc50e30 Added intializers 2016-07-01 10:21:55 +01:00
Robert Osfield
243420c5d9 Added initializers 2016-07-01 10:13:14 +01:00
Robert Osfield
562619f794 Moved initializers 2016-07-01 09:59:21 +01:00
Robert Osfield
466337c148 Added initializers 2016-07-01 09:56:01 +01:00
Robert Osfield
d9dc8ca3b2 Added initializers 2016-07-01 09:54:58 +01:00
Robert Osfield
ca77f5223e Moved unused member variables to #if 0 blocks. 
Added initiliazer
 2016-07-01 09:52:35 +01:00
Robert Osfield
2842adeb98 Fixed indentation 2016-07-01 09:15:36 +01:00
Robert Osfield
ddb4a02098 Added initializer 2016-07-01 09:14:59 +01:00
Robert Osfield
7584fe0ba2 Added initializer 2016-07-01 09:13:21 +01:00
Robert Osfield
0f05a4ceaa Added intializer 2016-07-01 09:09:35 +01:00
Robert Osfield
64c4a35e9a Added initializers 2016-07-01 08:52:43 +01:00
Robert Osfield
ff5095e8d1 Added initializer 2016-07-01 08:49:55 +01:00
Robert Osfield
68b69b8021 Added initializer 2016-07-01 08:48:49 +01:00
Robert Osfield
8edbe1dc0d Added initiaizer 2016-07-01 08:43:32 +01:00
Robert Osfield
eff07fe61e Added initializer 2016-07-01 08:41:54 +01:00
Robert Osfield
22cb243bd9 Added initialziers 2016-07-01 08:40:25 +01:00
Robert Osfield
9f259731f8 Added initializer 2016-07-01 08:37:48 +01:00
Robert Osfield
c13ba702ee Added initializer 2016-07-01 08:36:54 +01:00
Robert Osfield
eab111a5f5 Replaced the old c style declaration of enum's as it was confusing Coverity 2016-07-01 08:35:08 +01:00
Robert Osfield
d3362f9a23 Added initializers 2016-07-01 08:19:51 +01:00
Robert Osfield
4668511c93 Added initializer 2016-07-01 08:16:39 +01:00
Robert Osfield
e81c48f974 Added initializers 2016-07-01 08:15:01 +01:00
Robert Osfield
82fabc94f9 Added initializer 2016-07-01 08:08:39 +01:00
Robert Osfield
91d60de028 Removed unused member variable and adding initializer 2016-07-01 08:06:42 +01:00
Robert Osfield
3c70d03d30 Added initializers 2016-07-01 08:03:03 +01:00
Robert Osfield
e9c4cbce5c Addded initializer 2016-07-01 08:00:49 +01:00
Robert Osfield
a7a8284786 Added initializer 2016-07-01 07:58:04 +01:00
OpenSceneGraph git repository
c919d64d25 Merge pull request #91 from bjornblissing/feature/DestructionOperation 
CleanUpOperation added to Viewer
 2016-07-01 06:40:52 +01:00
Björn Blissing
ed7d49c5d2 CleanUpOperation added to Viewer 
Sometimes there is need to do cleanup with valid graphic contexts
before closing these contexts. The added operation runs a graphics
operation on each context before closing them.
 2016-06-30 22:09:22 +02:00
Robert Osfield
2ddcd14395 Added initializer 2016-06-30 14:17:51 +01:00
Robert Osfield
4d2bc269d9 Added initializers 2016-06-30 14:16:14 +01:00
Robert Osfield
3ae57e247f Added initializer 2016-06-30 14:12:01 +01:00
Robert Osfield
99458d061d Added initializers 2016-06-30 14:04:52 +01:00
Robert Osfield
ca721a8d05 Added initializer 2016-06-30 13:58:54 +01:00
Robert Osfield
b3765ac3cf Added handling of error condition 2016-06-30 11:31:02 +01:00
Robert Osfield
9e7d361a50 Added handling of error condition 2016-06-30 11:28:59 +01:00
Robert Osfield
6cd944e9c3 Added handling of error return value 2016-06-30 11:26:21 +01:00
Robert Osfield
d2579c0702 Added handling of error value 2016-06-30 11:24:50 +01:00
Robert Osfield
4ed8558178 Fixed handling of return values 2016-06-30 11:19:53 +01:00
Robert Osfield
75183eb3dd Fixed line endings 2016-06-30 11:19:24 +01:00
Robert Osfield
1b409fff8b Added handling of return value 2016-06-30 11:12:45 +01:00
Robert Osfield
cd4a51cf67 Added handling of return value 2016-06-30 11:11:00 +01:00
Robert Osfield
d4475e5b19 Added handling of return value 2016-06-30 11:03:40 +01:00
Robert Osfield
509c0380fa Added handling of return value 2016-06-30 11:00:38 +01:00
Robert Osfield
8f071e055f Added handling of false return 2016-06-30 10:58:17 +01:00
Robert Osfield
e5c0297167 Added handling of false return 2016-06-30 10:55:34 +01:00
Robert Osfield
876c4882a3 Fixed typo 2016-06-30 10:50:11 +01:00
Robert Osfield
72a80ee8cd Added handling of null dynamic_cast 2016-06-30 10:17:23 +01:00
Robert Osfield
ba3eaa83e0 Added handling of null dynamic_cast 2016-06-30 10:08:29 +01:00
Robert Osfield
e2730d0b5c Clean up clone 2016-06-30 10:03:51 +01:00
Robert Osfield
2a5098eacb Added handling of null pointer 2016-06-30 10:01:18 +01:00
Robert Osfield
be26725867 Added handling of null dynamic_cast 2016-06-30 09:59:27 +01:00
Robert Osfield
a469d60ed2 Added handling of null dynamic_cast. 2016-06-30 09:54:13 +01:00
Robert Osfield
576a265095 Added handlng of null dynamic_cast 2016-06-30 09:52:10 +01:00
Robert Osfield
cbba625b07 Added null pointer handling 2016-06-30 09:48:44 +01:00
Robert Osfield
314deedcf5 Added better null pointer handling 2016-06-30 09:46:27 +01:00
Robert Osfield
9e8d09bffc Improved error handling 2016-06-30 09:38:41 +01:00
Robert Osfield
6df325f651 Added handling of error return type 2016-06-30 09:29:32 +01:00
Robert Osfield
05d97aad28 Removed no longer used code 2016-06-30 09:09:54 +01:00
Robert Osfield
9b1107eb64 Improved check against number of bytes read 2016-06-30 08:27:49 +01:00
Robert Osfield
fec64f6d8c Added handling of NULL pointer case 2016-06-30 08:23:51 +01:00
Robert Osfield
7f335fd528 Added handling of possible zero divisor 2016-06-30 08:20:31 +01:00
Robert Osfield
1a10795198 Added handling of possible zero divisor 2016-06-30 08:16:29 +01:00
Robert Osfield
77812b32e0 Added handling of potential zero divisor 2016-06-30 08:14:48 +01:00
Robert Osfield
1c2aeb3138 Added handling of NULL 2016-06-30 08:13:01 +01:00
Robert Osfield
73cdc67367 Addd handling of NULL 2016-06-30 08:02:29 +01:00
Robert Osfield
de6eb1d97e Added handling of NULL 2016-06-30 07:59:51 +01:00
Robert Osfield
ac136d92e7 Added handling of NULL 2016-06-30 07:59:37 +01:00
Robert Osfield
1e0a187613 Added handling of out of memory 2016-06-30 07:50:40 +01:00
Robert Osfield
99a426d47d Added better handling of nulls 2016-06-30 07:50:14 +01:00
Robert Osfield
fa14b5263e Added initializer 2016-06-29 19:59:56 +01:00
Robert Osfield
a24cdb59de Fixed handling of null pointer 2016-06-29 18:01:29 +01:00
Robert Osfield
fb537e089b Cleaned up null pointer handling 2016-06-29 17:58:03 +01:00
Robert Osfield
274a197a82 Moved assignment to within safe block 2016-06-29 17:56:11 +01:00
Robert Osfield
d0bf7e8ce7 Added hanlding of null value 2016-06-29 17:51:32 +01:00
Robert Osfield
467054ba44 Added null pointer handling 2016-06-29 17:47:32 +01:00
Robert Osfield
625c559e8d Added null pointer handling 2016-06-29 17:43:37 +01:00
Robert Osfield
8589d59520 Added handling of null pointer 2016-06-29 17:35:20 +01:00
Robert Osfield
47842987c5 Added null pointer check 2016-06-29 17:33:45 +01:00
Robert Osfield
9fe0c23af4 Added better handling of null istream 2016-06-29 17:31:16 +01:00
Robert Osfield
3c1d3b981c Added null pointer handling 2016-06-29 17:29:28 +01:00
Robert Osfield
e3c48d9f45 Added handling of the possibility of null Options pointers 2016-06-29 17:06:48 +01:00
Robert Osfield
0876677fb2 Removed check against changed flag as check is aleady done outside the method so no need for a duplicate check 2016-06-29 16:07:39 +01:00
Julien Valentin
98b81821fb fix in StateSet.cpp 
the State::DefineMap::changed flag is not resetted to false after currentDefines are updated
 2016-06-29 16:05:14 +01:00
Robert Osfield
990c04d4b9 Moved the scene related requiresUpdateSceneGraph() implementation details from View into Scene. 
Added check against the ImagePager.
 2016-06-29 15:34:11 +01:00
OpenSceneGraph git repository
48c1d0e8da Merge pull request #81 from filnet/checkneedtodoframe 
refactor common code from CompositeViewer::checkNeedToDoFrame() and Viewer::checkNeedToDoFrame() into View
 2016-06-29 15:15:31 +01:00
Robert Osfield
00b1173e70 Added osg::ScissorIndexed that wraps up glScissorIndexed function 2016-06-29 15:11:02 +01:00
Robert Osfield
412e9fc3dd Added osg::DepthRangeIndexed class to wrap up glDepthRangeIndexed functionality. 2016-06-29 12:28:28 +01:00
Robert Osfield
54dbf438cc Fixed cast 2016-06-29 11:36:44 +01:00
Robert Osfield
e932c8e5e8 Added build of new osg::ViewportIndexed 2016-06-29 11:35:56 +01:00
Robert Osfield
e30b570b1f Revert "Fixed incorrect cast" as commit contained more changes than intended. 
This reverts commit 2897ab13cb.
 2016-06-29 11:34:20 +01:00
Robert Osfield
8d7d5d12a1 Added osg::ViewportIndexed that adds support for glViewportIndexed 2016-06-29 11:26:54 +01:00
Robert Osfield
2897ab13cb Fixed incorrect cast 2016-06-29 11:25:08 +01:00
Laurens Voerman
ec74518868 Added glViewerArray, glSissorArray, glDepthRangeArray etc. GL extension support 2016-06-29 09:53:04 +01:00
Robert Osfield
1df3cb9144 Fixed warnings 2016-06-28 19:49:48 +01:00
Robert Osfield
4223028ec1 Disabled -Wextra compile option for GCC + CLang as FBX headers generate lots of warnings we can't fix 2016-06-28 19:46:14 +01:00
Robert Osfield
b2e5e5b388 Revert "corrected syntax error in src/osgPlugins/fbx/ReaderWriterFBX.cpp" 
This reverts commit 7a1324800f.
 2016-06-28 18:39:12 +01:00