Robert Osfield
a7839d77cd
Added support for PixelBufferObject to Texture2DArray
2018-02-10 17:55:50 +00:00
Robert Osfield
1306fe2611
Added support for PixelBufferObject to Texture2DArray
2018-02-10 17:50:39 +00:00
Robert Osfield
97ba981dce
Merge branch 'master' into shader_pipeline
2018-02-08 09:28:40 +00:00
Robert Osfield
79f9cfae80
From Ravi Mathur, "he freetype plugin currently forces the use of the first font within a truetype collection (.ttc index 0). I made a slight modification such that users can specify any font index via the userOptions input to osgText::readFontFile(). Specifically, the freetype plugin now accepts a new string option of the format "index=< unsigned int >". Example usage:
...
Code:
// Chooses the second font within the Menlo font collection
osg::ref_ptr<osgDB::Options> fontOptions = new osgDB::Options;
fontOptions->setObjectCacheHint(osgDB::Options::CACHE_OBJECTS);
fontOptions->setOptionString("index=1");
text->setFont(osgText::readFontFile("Menlo.ttc", fontOptions));
"
2018-02-07 18:28:17 +00:00
Robert Osfield
a0c23d914d
Merge branch 'master' into shader_pipeline
2018-02-07 09:27:53 +00:00
Robert Osfield
55a45e3c0e
Changed the text bounding box calcualtion so that it only takes in to account the basic glyph size, and doesn't add in the glyph margin used for accounting for texel sampling
2018-02-06 17:54:33 +00:00
OpenSceneGraph git repository
6d1d1bb000
Revert "BindingTextureImage: a more complex condition for _texture->apply ?"
2018-02-02 09:54:31 +00:00
Robert Osfield
e77be08e56
Maded CLAMP_TO_EDGE default clamp mode
2018-02-01 10:50:09 +00:00
Ilya Zhuravlev
92b45581af
getGLExtensionFuncPtr: support gl4es wrapper on Android.
2018-01-29 16:07:13 -05:00
Robert Osfield
0c35541fc5
Merge branch 'master' into shader_pipeline
2018-01-27 10:56:09 +00:00
OpenSceneGraph git repository
8046ef5b6b
Merge pull request #459 from mp3butcher/bufferstorage
...
add more extensions
2018-01-27 09:20:12 +00:00
OpenSceneGraph git repository
03977b5619
Merge pull request #461 from filnet/issue_458
...
os_utils: fix non portable use of "defined"
2018-01-27 09:17:30 +00:00
Philippe Renon
13d88c7fec
os_utils: fix non portable use of "defined"
...
see https://github.com/openscenegraph/OpenSceneGraph/issues/458
2018-01-26 10:33:48 +01:00
Julien Valentin
f4663b0e32
add ARB_BufferStorage extensions
2018-01-25 16:22:33 +01:00
Robin Stevens
3cd5e43fdf
Typo in comment
2018-01-24 10:29:49 +01:00
Robert Osfield
a2eb879965
Merge branch 'master' into shader_pipeline
2018-01-23 12:38:50 +00:00
Robert Osfield
e49aaa9f2c
Removed the OSG_SYSTEM_SUPPORTED cmake var and added use of posix_spawn under Apple with C system function used elsewhere.
2018-01-23 11:43:55 +00:00
Robert Osfield
368dd5dd92
Merge branch 'master' into shader_pipeline
2018-01-23 10:39:05 +00:00
OpenSceneGraph git repository
022d1df97d
Merge pull request #454 from mp3butcher/imagebinding
...
BindingTextureImage: a more complex condition for _texture->apply ?
2018-01-23 10:26:20 +00:00
Robert Osfield
2f65456dd4
Merge branch 'master' into shader_pipeline
2018-01-21 13:11:51 +00:00
Robert Osfield
b36b5fa8da
Changed fallback message to be consistent with fucntion name
2018-01-21 12:19:27 +00:00
Robert Osfield
18d5a9159f
Restructured the system() fallback to be usable for C and C++
2018-01-21 12:09:49 +00:00
Julien Valentin
588a9ae10d
use introduced getBufferData to determine _target->apply requirements.
2018-01-21 01:24:01 +01:00
Laurens Voerman
9ef68841c0
text copy - get unicode text to clipboard.
2018-01-19 11:20:34 +01:00
Robert Osfield
ea5086ca9e
Quitended down debug output
2018-01-17 16:17:24 +00:00
Robert Osfield
41e3b723a7
Merge branch 'master' into shader_pipeline
2018-01-15 16:52:10 +00:00
OpenSceneGraph git repository
fb4d14d49f
Merge pull request #448 from LaurensVoerman/submit_remove_unused_maxBonePerVertex
...
remove unused variable "maxBonePerVertex"
2018-01-15 16:30:23 +00:00
Robert Osfield
6a5afd63e7
Merge branch 'master' into shader_pipeline
2018-01-15 16:03:21 +00:00
Robert Osfield
5ad1a652a0
Moved defined into GLDefines header to avoid compile issues under Windows
2018-01-15 16:02:44 +00:00
Laurens Voerman
df6194de5f
remove unused variable "maxBonePerVertex"
2018-01-15 15:59:56 +01:00
Robert Osfield
9fdc713b97
Merge branch 'master' into shader_pipeline
2018-01-14 13:28:45 +00: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
2dc6c568a9
Merge branch 'master' into shader_pipeline
2018-01-13 16:52:21 +00: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
26b06a8daa
Merge branch 'master' into shader_pipeline
2018-01-12 19:55:34 +00: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
Robert Osfield
8d170ccfe6
Merge branch 'master' into shader_pipeline
2018-01-11 14:34:11 +00:00
Robert Osfield
eea0cf9642
Merge branch 'master' into shader_pipeline
2018-01-11 14:33:24 +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
f95ca26fab
Merge branch 'master' into shader_pipeline
2018-01-11 08:54:53 +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
9e7fa60f16
Change index parameter handling to getScalerValue()
2018-01-08 10:49:48 +00:00
Robert Osfield
e65caecf82
Merge branch 'master' into shader_pipeline
2018-01-08 10:46:03 +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
e677195084
Merge branch 'master' into shader_pipeline
2018-01-06 13:48:28 +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
Robert Osfield
6adf226c27
Merge branch 'master' into shader_pipeline
2018-01-06 12:41:41 +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
575474a269
Merge branch 'master' into shader_pipeline
2018-01-05 15:20:07 +00:00
Robert Osfield
4abc97f44b
Fixed return values
2018-01-05 12:12:24 +00:00
Robert Osfield
6a413da143
Merge branch 'master' into shader_pipeline
2018-01-05 11:35:11 +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
Robert Osfield
e3d438d80f
Merge branch 'master' into shader_pipeline
2018-01-03 12:34:01 +00: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
55d4be66b3
Merge branch 'master' into shader_pipeline
2018-01-01 12:36:31 +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
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
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
Robert Osfield
a1e0d76032
Added TextureCubeMap::setImage/getImage() methpds
2017-12-20 20:13:33 +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
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
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
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
Robert Osfield
b8c48c646e
Merge branch 'master' into shader_pipeline
2017-12-07 09:52:53 +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
49e9674fcf
Fixed typos
2017-12-06 18:16:47 +00:00
Robert Osfield
66aa7a235f
Added support for Program::addBindAttirbLocation() and removeBindAttribLocation().
2017-12-06 13:29:47 +00:00
Robert Osfield
963ba7b671
Merge branch 'master' into shader_pipeline
2017-12-06 10:33:32 +00: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
a92232fd01
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:50:42 +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
a8924a7b36
Added "rs=value" Options support to SVG plugin
2017-12-05 16:33:01 +00:00
Robert Osfield
77e7d7072a
From Raymond de Vries, added missing header
2017-12-04 18:55:47 +00:00
Robert Osfield
bad8939022
Merge branch 'master' into shader_pipeline
2017-12-04 18:46:24 +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
a17b1ac547
Added object map to DisplaySettings::setObject(std::string, Object*) & getObject(std::string)
...
This enables caching of data, such as pre-loaded files or other objects
2017-12-03 16:43:06 +00:00
Robert Osfield
bd95db2031
Merge branch 'master' into shader_pipeline
2017-12-03 11:34:15 +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
Robert Osfield
200537ed6f
Removed redundent !ps
2017-12-03 10:49:39 +00:00
Robert Osfield
5ff16798a3
Removed unused local variable and associated typedef
2017-12-03 09:49:09 +00:00
Robert Osfield
9a96e211f9
Quietened down cppcheck false positive.
2017-12-03 09:45:37 +00:00
Robert Osfield
3870edf376
Fixed leak and clean up formatting.
2017-12-03 09:38:32 +00:00
Robert Osfield
ef5410aaf0
From Jordi Torres, fixed leak and inappropriate read bug
2017-12-03 09:34:43 +00:00
Robert Osfield
6ca3cab0d5
From Jordi Torres, removed unused local variable
2017-12-03 09:32:50 +00:00
Robert Osfield
24d32e89a1
From Jordi Torres, fix indentation and removed redundent break;
2017-12-03 09:30:35 +00:00
Robert Osfield
bd716b38c7
From Jordi Torres, added ref_ptr<> usage to quieten cppcheck false positive
2017-12-03 09:27:41 +00:00
Robert Osfield
24c3b40b56
From Jordi Torres, removed unused local variables
2017-12-02 18:07:13 +00:00
Robert Osfield
c913c0e6f7
From Jordi Torres, removed unused local variables
2017-12-02 18:04:43 +00:00
Robert Osfield
d7f5357059
From Jordi Torres, Removed unused local variables
2017-12-02 18:00:03 +00:00
Robert Osfield
4fc3c8ef26
From Jordi Torres, removed unused local variables
2017-12-02 17:58:17 +00:00
Robert Osfield
c85e56940e
From Jordi Torres, removed unused local variables
2017-12-02 17:52:47 +00:00
Robert Osfield
847e472130
Commented out unused local variables
2017-12-02 17:42:53 +00:00
Robert Osfield
e44fb08f6a
From Jordi Torres, removed unused local variable
2017-12-02 17:41:27 +00:00
Robert Osfield
490b9b0e0e
Fixed string parsing and substituion bugs isn substitudeEnvVars(..)
2017-12-02 17:35:36 +00:00
Robert Osfield
302f625ec7
From Jordi Torres, removed unused local variables
2017-12-02 17:08:14 +00:00
Robert Osfield
da68d32482
Improved readaibility of text by removing redundent indirection.
2017-12-02 16:35:16 +00:00
Robert Osfield
59f841bc20
Fixes for cppcheck reported issues
2017-12-02 16:20:34 +00:00
Robert Osfield
803026814a
From Raymond de Vries, Windows build fixes
2017-12-01 14:38:52 +00:00
Robert Osfield
c84ad74fa9
Added suppor for StateSet::DefineList
2017-12-01 13:00:42 +00:00
Robert Osfield
8bf575df2f
Improvements to lua/OSG integration
2017-12-01 12:07:28 +00:00
Marc Helbling
75af025c55
Improve SharedArrayOptimizer
...
When an array is shared within and outside a geometry, it's still worth it and safe
to recreate the reference within each individual geometry.
2017-12-01 12:26:02 +01:00
Robert Osfield
eb6d74e816
Fixed Lua / osg::UniformBase integration
2017-12-01 10:21:02 +00:00
Robert Osfield
b9d39250da
Fixed env var parsing
2017-12-01 10:20:48 +00:00
Robert Osfield
dadfe8ae0b
Merge branch 'master' into shader_pipeline
2017-12-01 09:14:52 +00:00
OpenSceneGraph git repository
2366305e83
Merge pull request #396 from bjornblissing/feature/DPIAwareScaling
...
Applications declared as DPI-aware in the Windows environment
2017-11-30 14:13:21 +00:00
Robert Osfield
05b0f142c8
Quieted down dubug output
2017-11-30 12:48:47 +00:00
Björn Blissing
9fac39c5e0
Applications declared DPI-aware in the Windows environment
...
Applications that run on a Windows computer with desktop scaling enabled
gets scaled incorrectly since windows assumes that applications are
DPI-unaware unless declared otherwise.
This change declares the application DPI-aware, thus not automatically
scaled by the operating system.
The corresponding library call requires Windows 8.1 or later.
2017-11-30 13:00:54 +01:00
Björn Blissing
e8f7eeb5dc
Removed unnecessary define in FileUtils
...
The define of _WIN32_WINNT was added to handle an error case from MinGW
,as described in commit 712ca432193bf6fb1778
2017-11-30 12:50:09 +01:00
Robert Osfield
a16702627a
Typo fix
2017-11-29 21:20:10 +00:00
Robert Osfield
d3815759a9
Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2017-11-29 14:44:00 +00:00
Robert Osfield
a6069c3226
Introduced Drawable::CreateVertexArrayStateCallback to enable customization of how VertexArrayState objects.
...
Added public accessors to the Drawable::VertexArrayStateList.
2017-11-29 14:22:31 +00:00
Robert Osfield
03434b20cf
Added mapping of GLSL file extension to shader Type.
2017-11-29 12:22:03 +00:00
OpenSceneGraph git repository
27e5041d97
Merge pull request #394 from mathieu/master
...
Make the culling be disabled at the drawable level
2017-11-29 10:38:52 +00:00
Robert Osfield
c0a276e850
Added back in serializer support for comput dispatch groups to retain backwards compatibility.
2017-11-29 10:11:35 +00:00
Mathieu
cf05cd5bf3
Make the culling be disables at the drawable level not at the geode level
2017-11-29 11:05:53 +01:00
Robert Osfield
9f6eb74d28
Merge branch 'ComputeDispatch' of https://github.com/mp3butcher/OpenSceneGraph into mp3butcher-ComputeDispatch
2017-11-29 09:30:56 +00:00
OpenSceneGraph git repository
cd0744ddfa
Cleaned up code layout
2017-11-29 08:16:53 +00:00
Robert Osfield
1152da8bbd
Quietened down debug output
2017-11-28 18:08:08 +00:00
Robert Osfield
85917ea4d4
Quietened down debug output
2017-11-28 18:05:59 +00:00
Robert Osfield
5ad22dc4af
Quitened down debug output
2017-11-28 18:04:26 +00:00
Julien Valentin
195df4f811
numgroup removed but introduce a reto compatibility bug in Program serializer
...
hope nobody use it
2017-11-28 17:39:32 +01:00
Julien Valentin
bf1b4ec2bb
add ComputeDispatch class
...
revoke glDispatch in PCProgram::useProgram
update example
2017-11-28 17:30:04 +01:00
Robert Osfield
117045170d
To the GLSL shader plugin added support forL
...
#pragma include shaderfile.glsl
To enable easier reuse of shaders
2017-11-28 15:31:39 +00:00
Robert Osfield
284f91b3e0
Replaced deprecated osg::Shader::reaDShaderFile()/loadShaderFromSource() usage
2017-11-27 18:38:37 +00:00
Robert Osfield
5f13a3aa11
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2017-11-27 18:36:41 +00:00
Robert Osfield
34336931fa
Deprecated the osg::Shader::reaDShaderFile() and osg::Shader::loadShaderSourceFromFile() methods.
...
Programmers should use osgDB::readRefShaderFile()/readShaderFile() instead.
2017-11-27 18:28:15 +00:00
Robert Osfield
f81a46da5b
Added support for .cs, .compute, .tctrlm .teval extensions in the GLSL plugin
2017-11-27 18:27:13 +00:00
OpenSceneGraph git repository
6abb9b27f9
Merge pull request #387 from jtorresfabra/remove_custom_code
...
Removes custom code added for sketchfab channel compression that shou…
2017-11-27 15:54:39 +00:00
Robert Osfield
bc4a9d9dd0
Refactored the MergeGeometry::mergeGroup(..) method to avoid O(N^2) issue with using removeChildren() on groups with very large numbers of children.
2017-11-27 15:44:11 +00:00
Jordi
66eeabd7d0
Removes custom code added for sketchfab channel compression that should not be there
2017-11-27 15:48:50 +01:00
Robert Osfield
80d1de7832
Removed use of local static to avoid threading issue.
2017-11-22 11:05:17 +00:00
OpenSceneGraph git repository
a5eb5c7bb0
Merge pull request #383 from anormann1974/patch-1
...
Fixed missing initialization of B_ and N_ in constructor
2017-11-21 14:01:14 +00:00
Robert Osfield
7f97b9f999
Added Text::getCharacterCorners(...) method to help applications that want to find out the positions of characters being rendered.
2017-11-21 13:41:57 +00:00
Andre Normann
e0eb4fbda8
Fixed missing initialization of B_ and N_ in constructor
2017-11-21 13:54:45 +01:00
Raymond de Vries
41dda781ee
attached fixes for configuring and building the osgPlugin exr with Visual Studio and using out-of-the-box builds of ilmbase and openexr, i.e. without manual/extra config for using these 2 libs with the OSG.
...
Previously, the assumption was made that ilmbase and openexr were installed in a common directory and hence the header files and libs were both found in that common directory. That is not consistent with other libs and this submission makes it consistent and therefore the OSG configures out of the box. I made this work for ilmbase-2.1.0.tar.gz / openexr-2.1.0.tar.gz and ilmbase-2.2.0.tar.gz / openexr-2.2.0.tar.gz
2017-11-14 10:59:08 +00:00
Robert Osfield
49a5fdbd1f
Fixed typo
2017-11-13 13:08:39 +00:00
Robert Osfield
9c605ba9be
Fixed CoverityScan reported errors
2017-11-13 13:06:12 +00:00
Robert Osfield
d98d9c9e72
FIxed two CoverityScan detected memory leaks
2017-11-13 12:49:33 +00:00
Andre Normann
a811de2ba7
Attached is a fix in GLExtension, which is based on latest git version, that fixes the usage of uniform buffer objects on macOS. Under macOS core OpenGL features aren't exported as extension. OpenGL 3.1 includes the GL_ARB_uniform_buffer_object as core feature for example. On macOS a simple osg::isGLExtensionSupported() call would fail. It is required to use the isGLExtensionOrVersionSupported() method. This is what my fix does.
2017-11-13 10:24:31 +00:00
OpenSceneGraph git repository
8d36049dcd
Merge pull request #382 from openscenegraph/osganimation
...
Osganimation improvements
2017-11-11 14:43:10 +00:00
OpenSceneGraph git repository
8d5a9e84fc
Build fix
2017-11-11 13:27:43 +00:00
OpenSceneGraph git repository
729680714c
Readbility improvements and updating version to 152
2017-11-11 13:08:42 +00:00
OpenSceneGraph git repository
3567e31009
Added versioning to the new serialization additions
2017-11-11 13:04:34 +00:00
OpenSceneGraph git repository
8694fd61ba
Code readability improvements
2017-11-11 13:00:56 +00:00
OpenSceneGraph git repository
4977939c05
Code readability improvements
2017-11-11 12:58:52 +00:00
OpenSceneGraph git repository
8e55ed5923
Code readability improvements
2017-11-11 12:54:28 +00:00
OpenSceneGraph git repository
f59efe0bfe
Code readability improvement
2017-11-11 12:46:48 +00:00
OpenSceneGraph git repository
8ee8550aac
Fix of incorrect Program assignment bug and coding style
2017-11-11 12:42:34 +00:00
OpenSceneGraph git repository
b23cc72037
coding style/readability fixes
2017-11-11 12:33:44 +00:00
OpenSceneGraph git repository
4753b8b2b9
coding style fix
2017-11-11 12:24:27 +00:00
