Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Feb 13, 2015

• Fixed fbo multisampling problems that occured under Ubuntu with amd hardware.

  

  Andreas Henne

  committed
  d65f4f4

  Copy full SHA for d65f4f4

Commits on Feb 9, 2015

• Minor text improvements.

  heandreas

  committed
  b0aa82e

  Copy full SHA for b0aa82e

• Merge branch 'master' of https://github.com/openscenegraph/osg

  heandreas

  committed
  8d8cb94

  Copy full SHA for 8d8cb94

Commits on Feb 4, 2015

• Fixed typo.

  Show description for 2bdb951
  robertosfield

  committed
  2bdb951

  Copy full SHA for 2bdb951

Commits on Feb 3, 2015

• Removed unncessary _EXT

  Show description for 8fa1a75
  robertosfield

  committed
  8fa1a75

  Copy full SHA for 8fa1a75

Commits on Feb 2, 2015

• Commented out the experimental V8 and Python plugins as these plugins only existed as a proof of concept test linkage with these dependenices, and have no functionality beyond this.

  Show description for 31ca798
  robertosfield

  committed
  31ca798

  Copy full SHA for 31ca798

Commits on Jan 27, 2015

• Replaced _EXT defines with GL-3.2 versions

  Show description for b5f3f1b
  robertosfield

  committed
  b5f3f1b

  Copy full SHA for b5f3f1b

Commits on Jan 25, 2015

• Fixed conflicts,

  heandreas

  committed
  5c62d1e

  Copy full SHA for 5c62d1e

Commits on Jan 23, 2015

• From Javier Taibo,

  Show description for 6b9d3f7
  robertosfield

  committed
  6b9d3f7

  Copy full SHA for 6b9d3f7

• Changed osgFX::MultiTextureControl so that it uses an osg::FloatArray internally to enable sharing with osg::Uniform.

  Show description for 845d2a0
  robertosfield

  committed
  845d2a0

  Copy full SHA for 845d2a0

• Added MultiTextureControl event handling of shift 012 i.e. ')', '!', '"' and 'A' to toggle full on for each of the respective or all texture units.

  Show description for a66a27b
  robertosfield

  committed
  a66a27b

  Copy full SHA for a66a27b

Commits on Jan 22, 2015

• Added #define GL_SEPARATE_ATTRIBS and correcte GL_INTERLEAVED_ATTRIBS

  Show description for da6c9f5
  robertosfield

  committed
  da6c9f5

  Copy full SHA for da6c9f5

• From Alexey Pavlov, "Export fix for Windows platform"

  Show description for 4af0040
  robertosfield

  committed
  4af0040

  Copy full SHA for 4af0040

• Added GL_INTERLEAVED_ATTRIBS for windows build

  Show description for 643ff9b
  robertosfield

  committed
  643ff9b

  Copy full SHA for 643ff9b

• Fixed warning

  Show description for 879a0ba
  robertosfield

  committed
  879a0ba

  Copy full SHA for 879a0ba

Commits on Jan 21, 2015

• From Andreas Henne, OpenGL core profile fixes required for OSX.

  Show description for 7d7ada2
  robertosfield

  committed
  7d7ada2

  Copy full SHA for 7d7ada2

• Added TextureWeights uniform support and controls to osgFX::MultiTextureControl to support usage with shaders.

  Show description for 7f17aca
  robertosfield

  committed
  7f17aca

  Copy full SHA for 7f17aca

Commits on Jan 20, 2015

• Re-enabled texturing and fixed runtime warning

  Show description for 8463afc
  robertosfield

  committed
  8463afc

  Copy full SHA for 8463afc

• Added hardwired geometry shaders

  Show description for a9dad6d
  robertosfield

  committed
  a9dad6d

  Copy full SHA for a9dad6d

• Updated shaders

  Show description for a486631
  robertosfield

  committed
  a486631

  Copy full SHA for a486631

• Added key osgTerrain::GeometryPool methods virtual to make it easier to override the shaders

  Show description for f1f5c2a
  robertosfield

  committed
  f1f5c2a

  Copy full SHA for f1f5c2a

• Changed the reset of the GLExtensions::Set() in the State destructor so that it checks to see if the local _glExtensions pointer has been set up and taken ownership of the GLExtensions::Set() value

  Show description for 68dc129
  robertosfield

  committed
  68dc129

  Copy full SHA for 68dc129

Commits on Jan 19, 2015

• Added GeometryPool::s/getUseGeometryShader() hint, and OSG_TERRAIN_USE_GEOMETRY_SHADER env var for setting the default value.

  Show description for 5b075d2
  robertosfield

  committed
  5b075d2

  Copy full SHA for 5b075d2

Commits on Jan 16, 2015

• Added support for using geometry shaders to align the quad diagonals with the local terrain

  Show description for 12d8b5b
  robertosfield

  committed
  12d8b5b

  Copy full SHA for 12d8b5b

Commits on Jan 13, 2015

• Minor change.

  

  Andreas Henne

  committed
  807664b

  Copy full SHA for 807664b

• Further work on osgText vertex buffer object support.

  

  Andreas Henne

  committed
  3cdd6af

  Copy full SHA for 3cdd6af

Commits on Jan 12, 2015

• Adde GL3 core profile fixes.

  

  Andreas Henne

  committed
  a71046e

  Copy full SHA for a71046e

• Added a local Vec3Array cache to the HeightFieldDrawable to facilitate efficient intersection testing

  Show description for dc674ad
  robertosfield

  committed
  dc674ad

  Copy full SHA for dc674ad

• Added ability to populate a local vertex cache for when one computes final vertex position in a vertex shader but still want to the Primitive functors to work with the transformed positions.

  Show description for ec74bb5
  robertosfield

  committed
  ec74bb5

  Copy full SHA for ec74bb5

Commits on Jan 7, 2015

• From Javier Taibo, "I have found that since version 1.1, FFMPEG changed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie ex…

  Show description for 3bea4e7
  robertosfield

  committed
  3bea4e7

  Copy full SHA for 3bea4e7

• From Farshid Lashkari, "small change to osg::Image::readImageFromCurrentTexture to allow reading data from compressed cubemap textures."

  Show description for 0a591bc
  robertosfield

  committed
  0a591bc

  Copy full SHA for 0a591bc

Commits on Jan 6, 2015

• Cleaned up GL_TEXTURE_BUFFER_*ARB usage as include/osg/GLDefines now provides the non ARB variants

  Show description for 152b86c
  robertosfield

  committed
  152b86c

  Copy full SHA for 152b86c

• From Julien Valentin, "To sum up changes, I had:

  Show description for 65ea50d
  robertosfield

  committed
  65ea50d

  Copy full SHA for 65ea50d

• Updates SO_VERSION in prep for API modifications since the 3.3.3 dev release

  Show description for 70c19a9
  robertosfield

  committed
  70c19a9

  Copy full SHA for 70c19a9

• From Julien Valentin, added missing initializer

  Show description for a449c73
  robertosfield

  committed
  a449c73

  Copy full SHA for a449c73

Pagination

Previous

Next