Julien Valentin
f4663b0e32
add ARB_BufferStorage extensions
2018-01-25 16:22:33 +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
Robert Osfield
ea5086ca9e
Quitended down debug output
2018-01-17 16:17:24 +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
Robert Osfield
9fdc713b97
Merge branch 'master' into shader_pipeline
2018-01-14 13:28:45 +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
d2b8468bf4
add MinLOD MaxLOD and LODBias to Texture
2018-01-13 21:16:16 +01: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
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
6a413da143
Merge branch 'master' into shader_pipeline
2018-01-05 11:35:11 +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
Julien Valentin
0e76dc169e
add more Extensions
2018-01-04 04:18:38 +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
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
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
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
Robert Osfield
854beb39ce
Quited now deboug output
2017-12-09 18:42:40 +00:00
Robert Osfield
b8c48c646e
Merge branch 'master' into shader_pipeline
2017-12-07 09:52:53 +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
77e7d7072a
From Raymond de Vries, added missing header
2017-12-04 18:55:47 +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
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
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
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
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
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
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
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
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
Robert Osfield
dfec052eb9
Fixed handling of GL_TEXTURE_CUBE_MAP when using glTextureStorage.
2017-11-10 17:12:20 +00:00
OpenSceneGraph git repository
821ca4e5cd
Revert " following guidance from OpenGL Common Mistakes:"
2017-11-10 16:58:29 +00:00
Julien Valentin
f7f76a1029
following guidance from OpenGL Common Mistakes:
...
mipmaps should be upload with glTexImage2D and not glTexSubImage2D
2017-11-06 16:22:03 +01:00
Robert Osfield
ce69f18ec7
Replaced getenv usage with safer osg::getEnvVar
2017-11-02 10:43:41 +00:00
Robert Osfield
aa744edacc
Fixed warning
2017-11-02 10:02:34 +00:00
Robert Osfield
239b0faa4c
Replaced getenv calls with safer osg::getEnvVar usage
2017-11-02 10:00:28 +00:00
Robert Osfield
338b0e2b7b
Moved getenv usage across to safer osg::getEnvVar() usage
2017-11-01 17:38:33 +00:00
Robert Osfield
51a9c66856
Added OSG_ENVVAR_SUPPORTED cmake control and bool osg::getEnvVar(const char* name, T& value, ...) conviniece funcions to make it easier to implement optinal getenv reading code.
2017-11-01 13:32:47 +00:00
Robert Osfield
6a2bd1f898
Added missing initializers
2017-10-31 17:43:39 +00:00
Robert Osfield
6ec932b000
Merge branch 'master' into shader_pipeline
2017-10-30 16:25:41 +00:00
Robert Osfield
45e520663d
Quitened down the DisplaySettings::setShaderHint() output for NONE.
2017-10-30 13:40:50 +00:00
Robert Osfield
bf517febfc
Merge branch 'master' into shader_pipeline
2017-10-28 12:58:47 +01:00
Robert Osfield
9c9439ef73
Added DisplaySettings:s/getgTextShaderTechnique() and OSG_TEXT_SHADER_TECHNIQUE env var support to DisplaySettings.
...
Added using of DisplaySettings:getgTextShaderTechnique() to Text default constructor.
Added better debug output control in Text.cpp
2017-10-24 14:46:13 +01:00
Robert Osfield
6b75439ae4
Merge branch 'master' into text_improvements
2017-10-20 14:14:14 +01:00
Robert Osfield
24c2a0ca60
Moved the assignment of the ModifiedCount to before GL texture calls.
2017-10-19 20:57:25 +01:00
Robert Osfield
6496c304f9
Implemented inplace replacement
2017-10-18 10:32:18 +01:00
David Siñuela Pastor
cc8a34cd14
Do not break systems with cr as line endings
2017-10-18 10:30:57 +01:00
Robert Osfield
ad45bf1d61
Fixed warning
2017-10-16 11:52:54 +01:00
Robert Osfield
ea379e64e7
Fixed build error
2017-10-16 10:12:19 +01:00
Robert Osfield
5067db39f8
Moved bracket to be consistent with the rest of the OSG
2017-10-16 10:08:18 +01:00
OpenSceneGraph git repository
bfca9998ea
Merge pull request #366 from LaurensVoerman/rotateDXT
...
add support for dxt compressed images to createImageWithOrientationConversion
2017-10-16 10:00:49 +01:00
Robert Osfield
0a5c6d3fd6
Improved the formating of GLSL source that is passed to OpenGL to make debugging shaders easier.
2017-10-14 09:03:08 +01:00
Laurens Voerman
274cea19bf
copySubImage support for block compressed images, added support for astc compressed type.
2017-10-13 16:54:04 +02:00
Robert Osfield
f07bf5be2a
Merge branch 'master' into text_improvements
2017-10-12 16:44:40 +01:00
Laurens Voerman
0fedfd2ff9
add support for dxt compressed images to createImageWithOrientationConversion
2017-10-12 17:38:16 +02:00
Laurens Voerman
63f12986b4
added dxtc support in Image::getColor, enhanced Image::isImageTranslucent to test opacity of dxt3 and dxt5 images
2017-10-12 13:49:57 +02:00
Robert Osfield
d6af00d9bd
Merge branch 'master' into text_improvements
2017-10-10 09:21:34 +01:00
Robert Osfield
4906844ea7
Added explictly unbinding of VBO for setInterleavedArrays().
2017-10-06 18:03:36 +01:00
Robert Osfield
9ac2b2eb7b
Added VertexArrayState::ArrayDispatch::className() method and implementation for each ArrayDispatch subclass to help with debugging
2017-10-06 17:47:19 +01:00
Robert Osfield
7fb37016fd
Merge branch 'master' into text_improvements
2017-10-05 12:14:03 +01:00
Robert Osfield
a1f519cbec
Removed debug info
2017-09-21 15:41:21 +01:00
Robert Osfield
420094174e
Added commented out debug output to make it easier to test in future
2017-09-20 11:01:04 +01:00
Robert Osfield
72cf6734a1
Added osgText/shaders to support greyscale and Signed Distance Field based text
2017-09-19 16:35:28 +01:00
Robert Osfield
cc7cf54353
Added support for subsititing $VAR_NAME entries in shaders to enable writing shaders that work across GLSL versions.
2017-09-18 18:09:15 +01:00
Mathieu MARACHE
e2f826b8fc
Under macOS the glValidateProgram reports too many
...
false negatives (errors) about missing buffers, etc..
From the internet https://stackoverflow.com/questions/15335510/opengl-glvalidateprogram-error-on-mac-os-x :
« […] The purpose of glValidateProgram is not to use it as an added "check" step after linking the program, because the GL and application state is hardly ready for actually using that program at this point, probably it's even before we get around to initializing the default framebuffer (its bitdepth, its multisample buffers, etc), and that's what the error hints at.
An appropriate place to call glValidateProgram would be right before you make a real render call. »
2017-08-29 11:34:27 +02:00
Mathieu MARACHE
1408c2664e
osg::Program::isFixedFunction() should'nt return true fixed function is unavailable, even if _shaderList.empty() is true
2017-08-28 09:44:10 +02:00
Julien Valentin
c89b08ea1f
Add extensions
2017-08-25 00:19:22 +02:00
Robert Osfield
68e0b25d32
Cleaned up warnings and removed assorts.
2017-08-24 15:13:14 +01:00
Julien Valentin
107b7be95b
Merge remote-tracking branch 'upstream/master' into MDI7
2017-08-24 11:26:23 +02:00
