Commit Graph

10588 Commits

Author SHA1 Message Date
Laurens Voerman
df6194de5f remove unused variable "maxBonePerVertex" 2018-01-15 15:59:56 +01:00
OpenSceneGraph git repository
1946ff652d Merge pull request #444 from mp3butcher/osgSampler2
Osg sampler2  add static helper func in order to generate Samplers of a Samplerless StateSet
2018-01-14 13:25:23 +00:00
OpenSceneGraph git repository
a6a72755b8 Merge pull request #443 from mp3butcher/osgSampler1
Add MinLOD MaxLOD and LODBias to Texture
2018-01-14 12:40:34 +00:00
Julien Valentin
4c0a861f91 add static helper func in order to generate Samplers of a Samplerless StateSet
+fix ident
2018-01-13 21:25:47 +01:00
Julien Valentin
8894939577 add MinLOD MaxLOD and LODBias to Texture and its serializer
as well as ShadowTextureMode None enum
2018-01-13 21:20:32 +01:00
Julien Valentin
d2b8468bf4 add MinLOD MaxLOD and LODBias to Texture 2018-01-13 21:16:16 +01:00
Robert Osfield
3e6d118d10 Disabled the use of the GeometryFinishedObjectReadCallback in the Geometry serializer as this doesn't look it's needed anymore. 2018-01-13 16:43:42 +00:00
Konstantin S. Matveyev
bb84f1ea3c osgViewer::ViewerBase setThreadingModel func fix: should not start threading, must only restart 2018-01-13 15:49:39 +03:00
Robert Osfield
ae57f3cd46 Added ability to toggle on/off use of C system() function call, using OSG_SYSTEM_SUPPORTED Cmake option 2018-01-12 19:52:31 +00:00
Robert Osfield
6a3d9b2aa2 Added os_utils header 2018-01-12 17:03:31 +00:00
Robert Osfield
a7cc9664c0 Renamed EnvVar header to os_utils in prep for adding more OS related calls to it 2018-01-12 16:48:17 +00:00
OpenSceneGraph git repository
bfbae8ad12 Merge pull request #437 from filnet/text_typo
osgText: fix typos related to SIGNED_DISTANCE_FIELD
2018-01-11 14:32:53 +00:00
Robert Osfield
7d311915e7 Merged NVTT cmake fixes from 3.4 branch 2018-01-11 09:39:27 +00:00
Robert Osfield
0cee5f5d27 Added returns to avoid fall through between case statements 2018-01-11 08:51:08 +00:00
Robert Osfield
6bd2d9054e Moved setFusionDistance() into View::updateSceneView() 2018-01-10 16:55:02 +00:00
Philippe Renon
3e12972a03 osgText: fix typos related to SIGNED_DISTANCE_FIELD 2018-01-10 14:21:25 +01:00
Andreas Ekstrand
0eacd8161a Small fix in the osgjs plugin. Since osgjs uses pixel area for PIXEL_SIZE_ON_SCREEN PagedLOD ranges instead of a diameter, it's a more correct approximation to square the ranges in this case. 2018-01-10 11:07:46 +00:00
Robert Osfield
df280811a1 Merged Program.cpp from shader_pipeline 2018-01-08 10:52:35 +00:00
Robert Osfield
0fafb385f9 Fixed indentation 2018-01-08 10:31:47 +00:00
Robert Osfield
f866836d60 Added extension support checks 2018-01-08 10:14:13 +00:00
Robert Osfield
818dee31d8 Fixed build with GLES2 2018-01-08 10:04:28 +00:00
Robert Osfield
b45803898d Added suppor for StateSet::DefineList 2018-01-06 14:59:16 +00:00
Robert Osfield
9944d949fc Improvements to lua/OSG integration 2018-01-06 14:57:39 +00:00
Robert Osfield
2108141b4e Replaced old style access of ValueObject values to new ValueObject::getScaleValue() methods 2018-01-06 13:47:18 +00:00
Robert Osfield
bdff0955dc Added TextureCubeMap::setImage/getImage() methpds 2018-01-06 13:11:36 +00:00
OpenSceneGraph git repository
4d4b02848b Had to fix spacing and bracket position yet again... 2018-01-06 12:31:23 +00:00
Julien Valentin
518048bc64 allow read of zipped script 2018-01-05 19:57:41 +01:00
Robert Osfield
4abc97f44b Fixed return values 2018-01-05 12:12:24 +00:00
OpenSceneGraph git repository
741db16916 Merge pull request #428 from mp3butcher/serializerfixbis
add Node associate on Drawable serializers
2018-01-05 11:26:06 +00:00
OpenSceneGraph git repository
eca7831281 Merge pull request #424 from mp3butcher/osgSampler
GL3.3 SamplerObject as StateAttribute
2018-01-05 09:43:16 +00:00
OpenSceneGraph git repository
f5108459be Fixed indentation and spacing issues 2018-01-05 09:41:32 +00:00
OpenSceneGraph git repository
6ef90054bc Merge pull request #425 from mp3butcher/callbacks
Support for multiple nest Camera DrawCallbacks
2018-01-05 09:18:39 +00:00
Julien Valentin
e33a407aaf add BufferData associate to Image and subclasses 2018-01-04 22:50:30 +01: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
Julien Valentin
c605b24432 remove old BindImageTexture path 2018-01-02 18:29:42 +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
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
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
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
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