Updated ChangeLog
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14722 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
parent
5f1b41a84f
commit
32831b1ef8
515
ChangeLog
515
ChangeLog
@ -1,3 +1,518 @@
|
|||||||
|
2015-02-25 19:38 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/las/ReaderWriterLAS.cpp: From Aitor Moreno,
|
||||||
|
"Attached you will find the modified file without the lines which
|
||||||
|
raises the exception. "
|
||||||
|
|
||||||
|
2015-02-25 19:31 robert
|
||||||
|
|
||||||
|
* src/osgSim/ScalarBar.cpp: From Jamie Robertson, "I've been using
|
||||||
|
osgSim::ScalarBar to display fixed range color values (e.g. red
|
||||||
|
from 1-2, green from 3-4 etc), by setting the _numColors the same
|
||||||
|
as the number of actual colors in the ColorRange.
|
||||||
|
|
||||||
|
Currently if you do this you get strange looking results as the
|
||||||
|
colors are calculated for values in the centre of each color
|
||||||
|
step, so if your steps are large, the colors are interpolated
|
||||||
|
sigificantly (see screen grab of red, green and blue colors for
|
||||||
|
illustration).
|
||||||
|
|
||||||
|
I've attached a fix which just uses the original color values
|
||||||
|
whenever _numColors equals the number of actual defined colors in
|
||||||
|
the ColorRange. I doubt anyone would want interpolated colors in
|
||||||
|
these circumstances."
|
||||||
|
|
||||||
|
2015-02-25 19:25 robert
|
||||||
|
|
||||||
|
* CMakeLists.txt, CMakeModules/FindGStreamer.cmake: From Dmitry
|
||||||
|
Marakasov, "While packaging osg-3.3.3 I've discovered that
|
||||||
|
gstreamer detection is
|
||||||
|
broken:
|
||||||
|
|
||||||
|
-- Could NOT find GStreamer (missing: GSTREAMER_BASE_INCLUDE_DIRS
|
||||||
|
GSTREAMER_BASE_LIBRARIES GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS
|
||||||
|
GSTREAMER_GSTREAMER-APP_LIBRARIES
|
||||||
|
GSTREAMER_GSTREAMER-PBUTILS_INCLUDE_DIRS
|
||||||
|
GSTREAMER_GSTREAMER-PBUTILS_LIBRARIES) (found version "1.4.5")
|
||||||
|
|
||||||
|
though all required modules are installed.
|
||||||
|
|
||||||
|
There are two problems: first, module names are spelled
|
||||||
|
incorrectly in root
|
||||||
|
CMakeLists.txt (e.g. gstreamer-app instead of app), so variables
|
||||||
|
expected
|
||||||
|
for them are e.g. GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS instead of
|
||||||
|
GSTREAMER_APP_INCLUDE_DIRS.
|
||||||
|
|
||||||
|
Second, gstreamer base component is detected as GSTREAMER while
|
||||||
|
checked
|
||||||
|
later as GSTREAMER_BASE. I've uncommented the detection as
|
||||||
|
GSTREAMER_BASE, but obviously that should be revisited and only
|
||||||
|
one
|
||||||
|
detection left. With this patch, gstreamer is detected properly
|
||||||
|
and
|
||||||
|
the plugins is successfully built and installed."
|
||||||
|
|
||||||
|
2015-02-25 19:19 robert
|
||||||
|
|
||||||
|
* examples/osgviewerQt/osgviewerQt.cpp: From Jonathan Greig, "I was
|
||||||
|
testing out the example and it works fine as a standalone
|
||||||
|
example, but I found that it didn't work as expected when adding
|
||||||
|
the class to some existing code I have to test it out. The osg
|
||||||
|
widget was appearing but it didn't appear to be updating. After
|
||||||
|
tweaking it to pass on the parent QWidget pointer from my code,
|
||||||
|
it worked as expected. I added the WindowFlags to the attached
|
||||||
|
file for good measure. If you look at the Qt Documentation for
|
||||||
|
QWidget ( http://doc.qt.io/qt-5/qwidget.html#QWidget ), you'll
|
||||||
|
see that is exactly where I got this from. When subclassing a
|
||||||
|
widget as such, you should allow the user to pass in the parent
|
||||||
|
at least, considering that has a major effect on how or if Qt may
|
||||||
|
clean up the memory."
|
||||||
|
|
||||||
|
2015-02-25 18:56 robert
|
||||||
|
|
||||||
|
* examples/osgfont/osgfont.cpp, examples/osgtext/osgtext.cpp,
|
||||||
|
include/osgText/Glyph, include/osgText/Text,
|
||||||
|
src/osgPlugins/freetype/FreeTypeFont.cpp,
|
||||||
|
src/osgQt/QFontImplementation.cpp, src/osgText/DefaultFont.cpp,
|
||||||
|
src/osgText/Glyph.cpp, src/osgText/Text.cpp,
|
||||||
|
src/osgWidget/Input.cpp: From Andreas Henne, Support for GL3 core
|
||||||
|
profile in osgText
|
||||||
|
|
||||||
|
2015-02-25 16:59 robert
|
||||||
|
|
||||||
|
* examples/osgtessellationshaders/osgtessellationshaders.cpp: From
|
||||||
|
Michael McDonnell, "I have changed the code so that the plus key
|
||||||
|
increases both the inner
|
||||||
|
and outer tessellation. The minus key decrease both the inner and
|
||||||
|
outer tessellation. You can still use the arrow keys to control
|
||||||
|
inner
|
||||||
|
and outer tessellation separately."
|
||||||
|
|
||||||
|
From Robert Osfield, clean up the code to fix warnings and make
|
||||||
|
the coding style more consistent with the rest of the OSG.
|
||||||
|
|
||||||
|
2015-02-25 14:55 robert
|
||||||
|
|
||||||
|
* include/osgDB/Serializer, src/osgDB/InputStream.cpp,
|
||||||
|
src/osgDB/OutputStream.cpp: Fixed handling of NULL entries in
|
||||||
|
osg::Geometry TexCoordArrayList and VertexAttribArrayList.
|
||||||
|
|
||||||
|
2015-02-24 11:06 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/lua/LuaScriptEngine.cpp: Fixed matrix setup.
|
||||||
|
|
||||||
|
2015-02-23 20:28 robert
|
||||||
|
|
||||||
|
* src/osg/TransferFunction.cpp: Fixed image allocation operations.
|
||||||
|
|
||||||
|
2015-02-23 11:43 robert
|
||||||
|
|
||||||
|
* src/osgWrappers/serializers/osg/Camera.cpp,
|
||||||
|
src/osgWrappers/serializers/osgText/TextBase.cpp: From Miha
|
||||||
|
Ravšelj and Robert Osfield, fix for serializer bug in
|
||||||
|
osgText::TextBase and osg::Camera
|
||||||
|
|
||||||
|
2015-02-23 11:07 robert
|
||||||
|
|
||||||
|
* src/osgViewer/StatsHandler.cpp: From Arjun Ramamurthy, fix for
|
||||||
|
use of StatsHandler in multipleviews/windows
|
||||||
|
|
||||||
|
2015-02-20 15:12 robert
|
||||||
|
|
||||||
|
* examples/osgterrain/osgterrain.cpp: Changed the toggle of defines
|
||||||
|
so that it works with assumed defaults now set up by the
|
||||||
|
GeometryPool so that when toggling it doesn't have a delay in
|
||||||
|
what the user would expect
|
||||||
|
|
||||||
|
2015-02-20 15:04 robert
|
||||||
|
|
||||||
|
* src/osgTerrain/shaders/terrain_displacement_mapping_CCC_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_CC_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_C_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_flat_vert.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_geom.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_vert.cpp:
|
||||||
|
Removed redudent shaders, and updated remaining shaders to match
|
||||||
|
OpenSceneGraph-Data/shaders
|
||||||
|
|
||||||
|
2015-02-20 15:02 robert
|
||||||
|
|
||||||
|
* examples/osgterrain/osgterrain.cpp, include/osg/StateSet,
|
||||||
|
include/osgTerrain/GeometryPool,
|
||||||
|
src/osgFX/MultiTextureControl.cpp,
|
||||||
|
src/osgTerrain/GeometryPool.cpp, src/osgTerrain/Terrain.cpp:
|
||||||
|
First step of refactoring the osg::Program management in
|
||||||
|
osgTerrain::GeometryPool for better performance by placing
|
||||||
|
default osg::Program and shader defines on a single StateSet
|
||||||
|
below the osgTerrain::Terrain
|
||||||
|
|
||||||
|
2015-02-18 10:52 robert
|
||||||
|
|
||||||
|
* include/osgTerrain/DisplacementMappingTechnique,
|
||||||
|
include/osgTerrain/Terrain,
|
||||||
|
src/osgTerrain/DisplacementMappingTechnique.cpp,
|
||||||
|
src/osgTerrain/Terrain.cpp: Moved osgTerrain::GeometryPool from
|
||||||
|
osgTerrain::DisplacementMappingTechnique to the
|
||||||
|
osgTerrain::Terrain
|
||||||
|
|
||||||
|
2015-02-18 10:23 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/dds/ReaderWriterDDS.cpp: From Sebastian
|
||||||
|
Messerschmidt, "Attached you find a version of the
|
||||||
|
ReaderWriterDDS with info outputs set to OSG_INFO instead of
|
||||||
|
OSG_NOTICE. The old version spams the console for each loaded DDS
|
||||||
|
file."
|
||||||
|
|
||||||
|
2015-02-17 20:42 robert
|
||||||
|
|
||||||
|
* src/osg/StateSet.cpp: Added support for DefineList to
|
||||||
|
StateSet::merge(..)
|
||||||
|
|
||||||
|
2015-02-17 19:40 robert
|
||||||
|
|
||||||
|
* src/osg/OperationThread.cpp: From Stephan Wenglorz, "the attached
|
||||||
|
fix corrects a small bug in OperationThread::setDone(bool),
|
||||||
|
calling it had the opposite effect of what was intended, i.e.
|
||||||
|
setting done to false actually finished the thread. The effect
|
||||||
|
was that VPB threads would exit before starting osgdem when a
|
||||||
|
task had been enqueued, because they initially set done to
|
||||||
|
false."
|
||||||
|
|
||||||
|
2015-02-17 19:22 robert
|
||||||
|
|
||||||
|
* examples/osgterrain/osgterrain.cpp: Removed GL_ usage in defines
|
||||||
|
|
||||||
|
2015-02-17 19:21 robert
|
||||||
|
|
||||||
|
* src/osgTerrain/GeometryPool.cpp: Removed commented out lines
|
||||||
|
|
||||||
|
2015-02-17 10:36 robert
|
||||||
|
|
||||||
|
* include/osg/Callback, include/osg/Object,
|
||||||
|
include/osg/ScriptEngine, include/osgDB/Serializer,
|
||||||
|
include/osgGA/EventHandler, include/osgGA/GUIEventHandler,
|
||||||
|
include/osgViewer/ViewerEventHandlers: Cleaned up warning
|
||||||
|
generated when compiling osgocculusviewer
|
||||||
|
|
||||||
|
2015-02-13 12:50 robert
|
||||||
|
|
||||||
|
* include/osg/Program, include/osg/State, src/osg/Shader.cpp,
|
||||||
|
src/osg/State.cpp: Improvements to the #pragma(tic) shader
|
||||||
|
composition support
|
||||||
|
|
||||||
|
2015-02-13 10:56 robert
|
||||||
|
|
||||||
|
* examples/osgshadercomposition/CMakeLists.txt,
|
||||||
|
examples/osgshadercomposition/oldshadercomposition.cpp,
|
||||||
|
examples/osgshadercomposition/osgshadercomposition.cpp:
|
||||||
|
Deprecated the old ShaderComposition example code so that it's
|
||||||
|
now only invoked if you add a --old to the osgshadercomposition
|
||||||
|
command line.
|
||||||
|
|
||||||
|
Introduced a new shader composition example based on the new
|
||||||
|
#pragama and #define based GLSL shader/osg::StateSet::setDefine()
|
||||||
|
functionality now built into the core OSG.
|
||||||
|
|
||||||
|
2015-02-13 07:45 robert
|
||||||
|
|
||||||
|
* src/osg/glu/libutil/mipmap.cpp: From Farshid Lashkari, "I've
|
||||||
|
attached a fix for some internal glu functions so that they use
|
||||||
|
size_t for computing allocation sizes instead of GLint. I
|
||||||
|
encountered some large images that were triggering integer
|
||||||
|
overflows with the current code."
|
||||||
|
|
||||||
|
2015-02-11 19:21 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/ply/vertexData.cpp: Fixed warning
|
||||||
|
|
||||||
|
2015-02-11 16:41 robert
|
||||||
|
|
||||||
|
* src/osg/Shader.cpp: Added reassignment of the #version line to
|
||||||
|
the first entry in the source list.
|
||||||
|
|
||||||
|
2015-02-11 09:41 robert
|
||||||
|
|
||||||
|
* include/osg/GLDefines: Added GL #define for Windows build
|
||||||
|
|
||||||
|
2015-02-10 21:13 robert
|
||||||
|
|
||||||
|
* include/osg/GLDefines: Windows build fix
|
||||||
|
|
||||||
|
2015-02-10 18:01 robert
|
||||||
|
|
||||||
|
* include/osgDB/Serializer, src/osgDB/ObjectWrapper.cpp: Added
|
||||||
|
GL_LINES_ADJACENCY_EXT variants back into ObjectWraper to enable
|
||||||
|
backwards compatibility.
|
||||||
|
|
||||||
|
2015-02-10 17:53 robert
|
||||||
|
|
||||||
|
* src/osgUtil/GLObjectsVisitor.cpp: Change for new Program API
|
||||||
|
|
||||||
|
2015-02-10 17:20 robert
|
||||||
|
|
||||||
|
* examples/osgterrain/osgterrain.cpp,
|
||||||
|
include/osgTerrain/GeometryPool, src/osgTerrain/GeometryPool.cpp:
|
||||||
|
Added support for new #pragam(atic) shader composition to new
|
||||||
|
displacement mapping technique
|
||||||
|
|
||||||
|
2015-02-10 17:04 robert
|
||||||
|
|
||||||
|
* include/osg/BufferObject, include/osg/Drawable,
|
||||||
|
include/osg/GLDefines, include/osg/Geometry,
|
||||||
|
include/osg/PrimitiveSet, include/osg/Program,
|
||||||
|
include/osg/Shader, include/osg/State, include/osg/StateSet,
|
||||||
|
src/osg/Geometry.cpp, src/osg/Program.cpp, src/osg/Shader.cpp,
|
||||||
|
src/osg/State.cpp, src/osg/StateSet.cpp: Introduced new shader
|
||||||
|
composition approach that utilizes #pragma requires(), #pragma
|
||||||
|
import_defines() and #ifdef in GLSL to enable multiple different
|
||||||
|
versions of shaders based
|
||||||
|
on defines passed in from osg::StateSet::setDefine(..).
|
||||||
|
|
||||||
|
2015-02-04 15:11 robert
|
||||||
|
|
||||||
|
* include/osgGA/EventQueue, src/osgGA/EventQueue.cpp,
|
||||||
|
src/osgQt/GraphicsWindowQt.cpp,
|
||||||
|
src/osgViewer/GraphicsWindowCarbon.cpp,
|
||||||
|
src/osgViewer/GraphicsWindowCocoa.mm,
|
||||||
|
src/osgViewer/GraphicsWindowIOS.mm,
|
||||||
|
src/osgViewer/GraphicsWindowWin32.cpp,
|
||||||
|
src/osgViewer/GraphicsWindowX11.cpp: Fixed typo.
|
||||||
|
|
||||||
|
2015-02-03 16:36 robert
|
||||||
|
|
||||||
|
* include/osg/Shader: Removed unncessary _EXT
|
||||||
|
|
||||||
|
2015-02-02 09:53 robert
|
||||||
|
|
||||||
|
* CMakeLists.txt, src/osgPlugins/CMakeLists.txt: 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.
|
||||||
|
|
||||||
|
2015-01-27 15:07 robert
|
||||||
|
|
||||||
|
* include/osg/GLDefines, include/osg/PrimitiveSet,
|
||||||
|
src/osgDB/ObjectWrapper.cpp: Replaced _EXT defines with GL-3.2
|
||||||
|
versions
|
||||||
|
|
||||||
|
2015-01-23 17:15 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp: From Javier Taibo,
|
||||||
|
"I have found a "bug" in the new audio decoding code (actually I
|
||||||
|
think the bug is in ffmpeg, but anyway it should be wise to
|
||||||
|
protect the OSG plug-in about it). I am attaching a security
|
||||||
|
check in FFmpegDecoderAudio.cpp.
|
||||||
|
|
||||||
|
If anybody is curious about the problem, it happens sometimes
|
||||||
|
when decoding an AAC audio stream. It eventually includes a PCE
|
||||||
|
block inside the AAC audio frame and then ffmpeg audio decoding
|
||||||
|
function signals a "new_frame" with 1024 samples, but a null
|
||||||
|
pointer instead of the audio data. It can be easily detected
|
||||||
|
because in these cases number of channels is 0. Maybe this is the
|
||||||
|
intended behaviour for ffmpeg, but I find it quite weird.
|
||||||
|
"
|
||||||
|
|
||||||
|
" It seems that libav does not have a channels attribute in
|
||||||
|
AVFrame structure. This new version should do."
|
||||||
|
|
||||||
|
2015-01-23 13:51 robert
|
||||||
|
|
||||||
|
* include/osgFX/MultiTextureControl,
|
||||||
|
src/osgFX/MultiTextureControl.cpp,
|
||||||
|
src/osgWrappers/serializers/osgFX/MultiTextureControl.cpp:
|
||||||
|
Changed osgFX::MultiTextureControl so that it uses an
|
||||||
|
osg::FloatArray internally to enable sharing with osg::Uniform.
|
||||||
|
|
||||||
|
2015-01-23 13:50 robert
|
||||||
|
|
||||||
|
* examples/osgterrain/CMakeLists.txt,
|
||||||
|
examples/osgterrain/osgterrain.cpp: Added MultiTextureControl
|
||||||
|
event handling of shift 012 i.e. ')', '!', '"' and 'A' to toggle
|
||||||
|
full on for each of the respective or all texture units.
|
||||||
|
|
||||||
|
2015-01-22 16:49 robert
|
||||||
|
|
||||||
|
* include/osg/GLDefines: Added #define GL_SEPARATE_ATTRIBS and
|
||||||
|
correcte GL_INTERLEAVED_ATTRIBS
|
||||||
|
|
||||||
|
2015-01-22 16:41 robert
|
||||||
|
|
||||||
|
* src/osg/DisplaySettings.cpp: From Alexey Pavlov, "Export fix for
|
||||||
|
Windows platform"
|
||||||
|
|
||||||
|
2015-01-22 15:08 robert
|
||||||
|
|
||||||
|
* include/osg/GLDefines: Added GL_INTERLEAVED_ATTRIBS for windows
|
||||||
|
build
|
||||||
|
|
||||||
|
2015-01-22 15:07 robert
|
||||||
|
|
||||||
|
* examples/osgtransformfeedback/osgtransformfeedback.cpp: Fixed
|
||||||
|
warning
|
||||||
|
|
||||||
|
2015-01-21 15:35 robert
|
||||||
|
|
||||||
|
* include/osg/Texture, src/osg/PolygonMode.cpp, src/osg/State.cpp,
|
||||||
|
src/osg/Texture.cpp: From Andreas Henne, OpenGL core profile
|
||||||
|
fixes required for OSX.
|
||||||
|
|
||||||
|
2015-01-21 11:09 robert
|
||||||
|
|
||||||
|
* include/osgFX/MultiTextureControl,
|
||||||
|
src/osgFX/MultiTextureControl.cpp,
|
||||||
|
src/osgTerrain/GeometryTechnique.cpp,
|
||||||
|
src/osgWrappers/serializers/osgFX/MultiTextureControl.cpp: Added
|
||||||
|
TextureWeights uniform support and controls to
|
||||||
|
osgFX::MultiTextureControl to support usage with shaders.
|
||||||
|
|
||||||
|
2015-01-20 18:01 robert
|
||||||
|
|
||||||
|
* src/osgTerrain/GeometryPool.cpp: Re-enabled texturing and fixed
|
||||||
|
runtime warning
|
||||||
|
|
||||||
|
2015-01-20 17:58 robert
|
||||||
|
|
||||||
|
* src/osgTerrain/GeometryPool.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_geom.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_vert.cpp:
|
||||||
|
Added hardwired geometry shaders
|
||||||
|
|
||||||
|
2015-01-20 17:40 robert
|
||||||
|
|
||||||
|
* src/osgTerrain/shaders/terrain_displacement_mapping_CCC_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_CC_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_C_frag.cpp,
|
||||||
|
src/osgTerrain/shaders/terrain_displacement_mapping_vert.cpp:
|
||||||
|
Updated shaders
|
||||||
|
|
||||||
|
2015-01-20 15:23 robert
|
||||||
|
|
||||||
|
* include/osgTerrain/GeometryPool: Added key
|
||||||
|
osgTerrain::GeometryPool methods virtual to make it easier to
|
||||||
|
override the shaders
|
||||||
|
|
||||||
|
2015-01-20 11:24 robert
|
||||||
|
|
||||||
|
* src/osg/State.cpp: 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
|
||||||
|
|
||||||
|
2015-01-19 11:29 robert
|
||||||
|
|
||||||
|
* include/osgTerrain/GeometryPool, src/osgTerrain/GeometryPool.cpp:
|
||||||
|
Added GeometryPool::s/getUseGeometryShader() hint, and
|
||||||
|
OSG_TERRAIN_USE_GEOMETRY_SHADER env var for setting the default
|
||||||
|
value.
|
||||||
|
|
||||||
|
2015-01-16 11:03 robert
|
||||||
|
|
||||||
|
* include/osgTerrain/GeometryPool, src/osgTerrain/GeometryPool.cpp:
|
||||||
|
Added support for using geometry shaders to align the quad
|
||||||
|
diagonals with the local terrain
|
||||||
|
|
||||||
|
2015-01-12 10:31 robert
|
||||||
|
|
||||||
|
* include/osgTerrain/GeometryPool, src/osgTerrain/GeometryPool.cpp:
|
||||||
|
Added a local Vec3Array cache to the HeightFieldDrawable to
|
||||||
|
facilitate efficient intersection testing
|
||||||
|
|
||||||
|
2015-01-12 10:30 robert
|
||||||
|
|
||||||
|
* include/osg/PrimitiveSet, include/osg/TemplatePrimitiveFunctor,
|
||||||
|
include/osg/TriangleFunctor: 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.
|
||||||
|
|
||||||
|
2015-01-07 14:14 robert
|
||||||
|
|
||||||
|
* CMakeModules/FindFFmpeg.cmake,
|
||||||
|
src/osgPlugins/ffmpeg/CMakeLists.txt,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegDecoder.cpp,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegHeaders.hpp,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegImageStream.cpp,
|
||||||
|
src/osgPlugins/ffmpeg/FFmpegImageStream.hpp,
|
||||||
|
src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp: 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 example. To
|
||||||
|
make the audio work when the OSGffmpeg plug-in is compiled
|
||||||
|
against recent FFMPEG versions, FFmpegDecoderAudio must check for
|
||||||
|
planar formats and in these cases request the samples as packed.
|
||||||
|
This way all works as before. It can be checked with osgmovie
|
||||||
|
example application.
|
||||||
|
|
||||||
|
$ osgmovie --audio movie.avi.ffmpeg
|
||||||
|
FFmpegImageStream::open audio failed, audio stream will be
|
||||||
|
disabled: unknown audio format
|
||||||
|
|
||||||
|
With the attached FFmpegDecoderAudio.cpp, audio sounds correctly.
|
||||||
|
|
||||||
|
I am also attaching a modified version of FindFFmpeg.cmake that
|
||||||
|
allows to set as FFMPEG_DIR the ffmpeg compiled in the source
|
||||||
|
directory structure. It should not break anything as it only adds
|
||||||
|
some additional search paths.
|
||||||
|
"
|
||||||
|
|
||||||
|
2015-01-07 10:36 robert
|
||||||
|
|
||||||
|
* src/osg/Image.cpp: From Farshid Lashkari, "small change to
|
||||||
|
osg::Image::readImageFromCurrentTexture to allow reading data
|
||||||
|
from compressed cubemap textures."
|
||||||
|
|
||||||
|
2015-01-06 17:23 robert
|
||||||
|
|
||||||
|
* include/osg/TextureBuffer, src/osg/StateSet.cpp,
|
||||||
|
src/osg/TextureBuffer.cpp: Cleaned up GL_TEXTURE_BUFFER_*ARB
|
||||||
|
usage as include/osg/GLDefines now provides the non ARB variants
|
||||||
|
|
||||||
|
2015-01-06 17:12 robert
|
||||||
|
|
||||||
|
* examples/CMakeLists.txt, examples/osgtransformfeedback,
|
||||||
|
examples/osgtransformfeedback/CMakeLists.txt,
|
||||||
|
examples/osgtransformfeedback/osgtransformfeedback.cpp,
|
||||||
|
include/osg/GLExtensions, include/osg/Program,
|
||||||
|
src/osg/GLExtensions.cpp, src/osg/Program.cpp,
|
||||||
|
src/osg/StateSet.cpp,
|
||||||
|
src/osgWrappers/serializers/osg/Program.cpp: From Julien
|
||||||
|
Valentin, "To sum up changes, I had:
|
||||||
|
-some extensions in GLExtensions
|
||||||
|
- GL_TEXTURE_BUFFER as target in osg::StateSet
|
||||||
|
- a VBO based transform feed back example
|
||||||
|
"
|
||||||
|
|
||||||
|
2015-01-06 17:09 robert
|
||||||
|
|
||||||
|
* CMakeLists.txt: Updates SO_VERSION in prep for API modifications
|
||||||
|
since the 3.3.3 dev release
|
||||||
|
|
||||||
|
2015-01-06 14:55 robert
|
||||||
|
|
||||||
|
* src/osgVolume/Property.cpp: From Julien Valentin, added missing
|
||||||
|
initializer
|
||||||
|
|
||||||
|
2015-01-06 14:41 robert
|
||||||
|
|
||||||
|
* src/osgWrappers/serializers/osgVolume/VolumeTechnique.cpp: From
|
||||||
|
Julien Valentin, typo fix
|
||||||
|
|
||||||
|
2015-01-05 17:39 robert
|
||||||
|
|
||||||
|
* src/osgPlugins/stl/ReaderWriterSTL.cpp: From Jason Beverage,
|
||||||
|
"Here is a fix to the STL plugin that fixes build errors
|
||||||
|
introduced in the last commit. It's just a simple addition of the
|
||||||
|
stdint.h header."
|
||||||
|
|
||||||
|
2014-12-24 11:56 robert
|
||||||
|
|
||||||
|
* AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp:
|
||||||
|
Updated ChangeLog and AUTHORS
|
||||||
|
|
||||||
2014-12-24 11:43 robert
|
2014-12-24 11:43 robert
|
||||||
|
|
||||||
* CMakeModules/FindCOLLADA.cmake: Removed debug message
|
* CMakeModules/FindCOLLADA.cmake: Removed debug message
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user