FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,690 Commits 1 Branch 26 Tags 73 MiB
c58041cf0b
Commit Graph

15690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
73689caa5f
Had to fix positioning of { and spacing to be consistent with the rest of the OSG 2018-01-04 15:28:45 +00:00
OpenSceneGraph git repository
70488271bd
Merge pull request #426 from mp3butcher/moreExtensions 
add more Extensions
 2018-01-04 15:20:57 +00:00
Julien Valentin
196256fdcd Evolve DSO 
add Node associate on Drawable based:
Drawable
Geometry
DrawPixels.cpp
ShapeDrawable.cpp
RigGeometry.cpp
ConnectedParticleSystem.cpp
FadeText.cpp
Text.cpp
Text3D.cpp
TextBase.cpp
 2018-01-04 05:15:13 +01:00
Julien Valentin
0e76dc169e add more Extensions 2018-01-04 04:18:38 +01:00
Julien Valentin
61548dc5a8 add recursivity on Camera Callbacks 2018-01-04 03:59:25 +01:00
Julien Valentin
662bea239c add GLSampler as Texture Property 
and a simple example mixing (add) 2 textures
 2018-01-03 21:34:10 +01:00
Robert Osfield
e3d438d80f Merge branch 'master' into shader_pipeline 2018-01-03 12:34:01 +00:00
OpenSceneGraph git repository
6492ec8c6b
Merge pull request #421 from mp3butcher/imagebinding 
complete Imagebinding integration
 2018-01-03 11:11:16 +00:00
Julien Valentin
c605b24432 remove old BindImageTexture path 2018-01-02 18:29:42 +01:00
Julien Valentin
f9b1c614bc adapt examples for new BindImageTexture 2018-01-02 18:15:25 +01:00
Julien Valentin
8a84ee7660 add (untested) BindImageTexture serializer 
TOREVIEW : my GLBoolean serializer macro seams hacky
 2018-01-02 18:12:52 +01:00
Robert Osfield
55d4be66b3 Merge branch 'master' into shader_pipeline 2018-01-01 12:36:31 +00:00
OpenSceneGraph git repository
b4c62bd32b
Merge pull request #415 from aluaces/fix/opencascade_minimal 
Use a minimal set of OpenCASCADE libraries.
 2018-01-01 12:07:17 +00:00
Robert Osfield
eb72f3ed30 Renamed ImageTexture file to BindImageTexture to better fit it's OpenGL implementaton. 
Improved the indentation so it's more consistent with the rest of the OSG.
 2018-01-01 11:10:55 +00:00
Robert Osfield
1f4ae0425c Merge branch 'imagebinding' of https://github.com/mp3butcher/OpenSceneGraph into mp3butcher-imagebinding 2018-01-01 10:16:10 +00:00
OpenSceneGraph git repository
f0bb9da9c6
Changed the enum value to be consistent with StateAttribute 2018-01-01 10:14:58 +00:00
OpenSceneGraph git repository
e27148240a
Change enum name to be consistent with assciated class name 2018-01-01 10:13:14 +00:00
OpenSceneGraph git repository
9d4ee0d766
Improved spacing and indentaton 
To keep things consistent with the rest of the OSG
 2018-01-01 10:12:09 +00:00
Robert Osfield
7a351d3407 Changed the case of method name to be consistent with the rest of the OSG 2017-12-31 13:44:21 +00:00
OpenSceneGraph git repository
ce4d76ef21
Merge pull request #411 from rickyviking/fbxGeometrySupport 
Fbx writer: added support to convert geometries directly attached as node
 2017-12-31 13:43:09 +00:00
OpenSceneGraph git repository
407402df14
Merge pull request #414 from aluaces/fix/osg_winver_switch 
Added optional checking the windows version at build configuration time to fix cross-compilation.
 2017-12-31 13:34:26 +00:00
OpenSceneGraph git repository
91aec8107a
Improved indentation 2017-12-31 13:32:44 +00:00
Robert Osfield
dd1f95d24d Fixed typo 2017-12-31 13:17:23 +00:00
Robert Osfield
94a1a84a59 Fixed handling of reassignment of ArrayDispatch when vertex aliasing is toggled 2017-12-31 12:38:17 +00:00
Robert Osfield
b5a3e0d532 Fixed handling of reassignment of ArrayDispatch when vertex aliasing is toggled 2017-12-31 12:35:44 +00:00
mp3butcher
2f8a262a0e add flexier Image Unit Binding implementation (allow different IUBs for a Texture) 2017-12-28 19:04:32 +01:00
Alberto Luaces
958e954b93 Use a minimal set of OpenCASCADE libraries. 
This eases the configuration avoiding to look for unused or nonexistent
libraries.
 2017-12-26 15:45:03 +01:00
Alberto Luaces
08e1a06fcd Detecting the windows version at build time breaks cross-compilation. 
I have made this auto-detection optional (default ON).
 2017-12-26 15:35:42 +01:00
Robert Osfield
a1e0d76032 Added TextureCubeMap::setImage/getImage() methpds 2017-12-20 20:13:33 +00:00
Robert Osfield
2b315b7a78 Added ValueObject::get/setScaleValue(..) convinient methods 2017-12-20 20:12:49 +00:00
Riccardo Corsi
ef8891351f Fbx writer: added support to convert geometries directly attached as node, without geodes. 2017-12-20 09:52:50 +01:00
Robert Osfield
d426513b64 Merge branch 'master' into shader_pipeline 2017-12-19 10:43:44 +00:00
Robert Osfield
5afd32b2d9 Introduced dedicated VertexArrayStateList class to wrap up the VertexArrayState container with convinience methods to help initialize them. 
Using the new VertexArrayStateList class fixed bug associated with setting new setTexCoord() array when a VertexArrayState is already assigned.
 2017-12-19 09:57:57 +00:00
Robert Osfield
d2bfde30f0 Deprecated dirtyDisplayLists(), use established dirtyGLObjects() instead 2017-12-18 13:54:08 +00:00
OpenSceneGraph git repository
3bb327e93f
Merge pull request #408 from eligovision/OpenSceneGraph_serializers 
Open scene graph serializers
 2017-12-18 10:45:00 +00:00
OpenSceneGraph git repository
24813331c6
Merge pull request #409 from jcarpent/master 
[Fix] Use explicitelly colladom 1.4.1
 2017-12-18 10:39:29 +00:00
OpenSceneGraph git repository
dd1c0edd4b
Merge pull request #406 from eligovision/OpenSceneGraph_text 
TextBase: left alignment position fix
 2017-12-18 10:33:35 +00:00
jcarpent
1d46178d72 [Fix] Use explicitelly colladom 1.4.1 2017-12-14 19:27:08 +01:00
Konstantin S. Matveyev
df8dc83fc7 osgAnimation serializes: static linking fix 2017-12-13 11:48:55 +03:00
Konstantin S. Matveyev
23ed49b330 Merge remote-tracking branch 'upstream/master' into OpenSceneGraph_serializers 2017-12-13 11:48:08 +03:00
Konstantin S. Matveyev
2d3ed2a3c7 TextBase: left alignment position fix 2017-12-12 12:08:50 +03:00
Robert Osfield
7e0163383f Quitened down debug output 2017-12-09 19:18:43 +00:00
Robert Osfield
854beb39ce Quited now deboug output 2017-12-09 18:42:40 +00:00
Robert Osfield
588cad24e2 Quietened down debug messages 2017-12-09 18:29:19 +00:00
Robert Osfield
9bf3d2b7ce Pushed background image away from eye point a small amount to prevent z fighting with text on the image plane. 2017-12-09 11:12:35 +00:00
Robert Osfield
90748f8b74 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-12-08 16:15:52 +00:00
Robert Osfield
6ef0e667d2 Added support for OSG_BORDERLESS_WINDOW="x y width heigh" and --bordless-window x y width height to make it easier to manage custom placement of viewers without window decoration 2017-12-08 16:10:57 +00:00
OpenSceneGraph git repository
5de9c97ff5
Merge pull request #403 from mp3butcher/VAS 
fix logo reader plugin
 2017-12-08 11:19:20 +00:00
Julien Valentin
53d8032656 fix logo reader plugin 
TODO upgrade to a more modern gl (remove glDrawpixel usage)
 2017-12-07 20:13:57 +01:00
Robert Osfield
25f5605ad8 Improvements to dot visitors 2017-12-07 17:52:24 +00:00