Robert Osfield
1152da8bbd
Quietened down debug output
2017-11-28 18:08:08 +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
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
45e520663d
Quitened down the DisplaySettings::setShaderHint() output for NONE.
2017-10-30 13:40:50 +00: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
OpenSceneGraph git repository
b89384d810
Merge pull request #318 from mp3butcher/osganimation
...
change the design of BufferIndexBinding to work with BufferData instead of BufferObject +matrix transpose
2017-08-24 09:53:32 +01:00
Julien Valentin
d49f0d67af
change the design of BufferIndexBinding to work with BufferData instead of BufferObject
...
allow convenient BufferData abstraction + serialization of BufferIndexBinding
2017-08-24 03:28:55 +02:00
Julien Valentin
3b03699fbc
add a transpose method for 4x4
...
and a transpose3x3 to transpose only orthogonal part of a mat4x4
2017-08-23 23:49:36 +02:00
Laurens Voerman
682730fbe4
reduce the need to reallocate the std::ostream buffer behind osg::Notify (causing multitreading issues) by pre-allocating 4095 bytes.
2017-08-23 11:53:16 +02:00
Konstantin S. Matveyev
d1453a41c2
Geometry::compileGLObjects function VAO fix
2017-08-22 10:12:36 +03:00
konstantin.matveyev
6841f37ccc
[*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES
2017-08-20 18:01:49 +03:00
Robert Osfield
f3adcda6b7
Removed the GLclampd declaration and replaced its usage with GLdouble to standardize the OSG extension setup with current GL/GLES headers.
...
Added a float fallback from osg::DepthDangeIndex to suppprt GLES.
2017-08-16 14:20:00 +01:00
luzpaz
2cd31f65e4
misc. typo fixes
...
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
konstantin.matveyev
8e8d5b2fe0
Emscripten: EGL instead of SDL2 in GLExtensions.cpp
2017-08-14 11:19:04 +03:00
Robert Osfield
d1adb9acbc
Added missing break statements
2017-07-28 14:34:59 +01:00
