Robert Osfield
|
2f65456dd4
|
Merge branch 'master' into shader_pipeline
|
2018-01-21 13:11:51 +00:00 |
|
Robert Osfield
|
18d5a9159f
|
Restructured the system() fallback to be usable for C and C++
|
2018-01-21 12:09:49 +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
|
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
|
903b0895f7
|
Added non const variants of State::getDisplaySettings/getActiveDisplaySettings().
|
2018-01-09 12:16:32 +00:00 |
|
Robert Osfield
|
3e676f67ff
|
Removed inappropriate //
|
2018-01-06 13:09:16 +00:00 |
|
Robert Osfield
|
230ee49428
|
Added ValueObject::get/setScaleValue(..) convinient methods
|
2018-01-06 12:54:14 +00:00 |
|
Robert Osfield
|
339b7ffa7c
|
Removed inappropriate //
|
2018-01-06 12:52:34 +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
|
6ef90054bc
|
Merge pull request #425 from mp3butcher/callbacks
Support for multiple nest Camera DrawCallbacks
|
2018-01-05 09:18:39 +00:00 |
|
OpenSceneGraph git repository
|
73689caa5f
|
Had to fix positioning of { and spacing to be consistent with the rest of the OSG
|
2018-01-04 15:28:45 +00: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
|
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 |
|
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
|
2b315b7a78
|
Added ValueObject::get/setScaleValue(..) convinient methods
|
2017-12-20 20:12:49 +00: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
|
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
|
803026814a
|
From Raymond de Vries, Windows build fixes
|
2017-12-01 14:38:52 +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 |
|
OpenSceneGraph git repository
|
021dca0072
|
Cleaned up code layout
|
2017-11-29 08:14:44 +00:00 |
|
Julien Valentin
|
739303b3d9
|
override compile and createVAS in order to do nothing
|
2017-11-28 20:38:54 +01: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 |
|
Robert Osfield
|
338b0e2b7b
|
Moved getenv usage across to safer osg::getEnvVar() usage
|
2017-11-01 17:38:33 +00:00 |
|
Robert Osfield
|
0e7e06349e
|
Added safety check for getenv parsing to prevent overflow attacks via getenv.
|
2017-11-01 16:43:32 +00:00 |
|
Robert Osfield
|
e59ad87044
|
Made template function inline to avoid multiple declaration issues
|
2017-11-01 14:16:54 +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 |
|