Commit Graph

15367 Commits

Author SHA1 Message Date
Julien Valentin
8a84ee7660 add (untested) BindImageTexture serializer
TOREVIEW : my GLBoolean serializer macro seams hacky
2018-01-02 18:12:52 +01: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
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
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
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
OpenSceneGraph git repository
b8fd3abdd5
Merge pull request #402 from mp3butcher/VAS
add a fix in order setArray  work with an user managed interleaved array
2017-12-07 09:49:47 +00:00
Julien Valentin
7f2481e976 add a fix in order setArray work with an user managed interleaved array 2017-12-06 23:17:02 +01:00
Robert Osfield
37dbb04608 Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2017-12-06 10:11:53 +00:00
Robert Osfield
d313184cd0 Added fine grained checking for GL errors in the GLObjectVisitor so that the OSG's default pre compile stage provides better feesback on any GL errors. 2017-12-06 09:51:57 +00:00
Robert Osfield
d82a7e7c0b Removed the unncessary rescale to power of two, and added clear of image to prevent previous image data corrupting the rendered image 2017-12-05 17:16:17 +00:00
Robert Osfield
4501320793 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-12-05 16:33:55 +00:00
Robert Osfield
a8924a7b36 Added "rs=value" Options support to SVG plugin 2017-12-05 16:33:01 +00:00
Robert Osfield
551e9ba17c Fixed AUTHORS 2017-12-04 17:51:21 +00:00
Robert Osfield
7f0baaab61 Added passing of the osgDB::Options to the remove from cache to make sure the cache model for the presentation is found and removed. 2017-12-04 16:43:08 +00:00
Robert Osfield
56681c89cd Changed the reload presentaiton key to 'R' to better match the 'E' for editor 2017-12-04 14:50:12 +00:00
Anna Sokol
279df6d57e From Anna Sokol, "There is no need to specify WINVER of 0x0603 in order to check for the SetProcessDPIAwareness function existence.
If your current OS where the application is running is Windows 8.1 or above it the function will exist in the dll or if its below it wont.
I checked the attached code with both a Windows 7 desktop (where the function doesn't exist) and a Windows 10 tablet (where it does and had my screen scaled to 150%) and in both cases the code worked as intended."
2017-12-04 13:01:52 +00:00
Robert Osfield
1810c9e7e3 Updated ChangeLog and AUTHORS file 2017-12-03 14:27:10 +00:00
Robert Osfield
aa26f99367 Updated ChangeLog 2017-12-03 14:14:34 +00:00
Robert Osfield
9ef79c2f44 Renamed chanels to array to be consistent with the rest of the usage 2017-12-03 11:17:34 +00:00
OpenSceneGraph git repository
92cccff866
Merge pull request #398 from marchelbling/sharedarrayoptimizer-fix
Improve SharedArrayOptimizer
2017-12-03 11:12:20 +00:00