FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged with upstream/OpenSceneGraph-3.6

Browse Source
This commit is contained in:
valid-ptr
2021-03-24 17:45:11 +03:00
committed by konstantin.matveyev
parent b728587fab 8b2e02b71d
commit e260dfb582
28 changed files with 162 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/osg/Config.in
View File

@@ -37,5 +37,6 @@
#cmakedefine OSG_USE_DEPRECATED_API
#cmakedefine OSG_ENVVAR_SUPPORTED
#cmakedefine OSG_WINDOWING_SYSTEM_CARBON
#cmakedefine OSG_WINDOWING_SYSTEM_NONE
#endif

60
src/osg/Image.cpp
View File

@@ -538,10 +538,10 @@ unsigned int Image::computeNumComponents(GLenum pixelFormat)
{
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT): return 3;
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT): return 3;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT): return 4;
case(GL_COMPRESSED_SIGNED_RED_RGTC1_EXT): return 1;
case(GL_COMPRESSED_RED_RGTC1_EXT): return 1;
@@ -721,13 +721,13 @@ unsigned int Image::computePixelSizeInBits(GLenum format,GLenum type)
switch(format)
{
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT): return 8;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT): return 8;
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT): return 8;
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT): return 4;
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT): return 8;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT): return 8;
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT): return 8;
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT): return 8;
case(GL_COMPRESSED_SIGNED_RED_RGTC1_EXT): return 4;
case(GL_COMPRESSED_RED_RGTC1_EXT): return 4;
@@ -948,14 +948,14 @@ unsigned int Image::computeBlockSize(GLenum pixelFormat, GLenum packing)
{
switch(pixelFormat)
{
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
return osg::maximum(8u, packing); // block size of 8
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
return osg::maximum(8u, packing); // block size of 8
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG):
case(GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG):
@@ -1106,12 +1106,12 @@ bool Image::isCompressed() const
case(GL_COMPRESSED_RGBA_ARB):
case(GL_COMPRESSED_RGB_ARB):
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_SIGNED_RED_RGTC1_EXT):
case(GL_COMPRESSED_RED_RGTC1_EXT):
@@ -2030,11 +2030,11 @@ bool Image::isImageTranslucent() const
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
return false;
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT):
case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT):
return dxtc_tool::isCompressedImageTranslucent(_s, _t, _pixelFormat, _data);
default:

7
src/osg/Texture2DArray.cpp
View File

@@ -400,11 +400,8 @@ void Texture2DArray::apply(State& state) const
osg::Image* image = itr->get();
if (image)
{
if (getModifiedCount(n,contextID) != image->getModifiedCount())
{
getModifiedCount(n,contextID) = image->getModifiedCount();
applyTexImage2DArray_subload(state, image, n, _textureWidth, _textureHeight, image->r(), _internalFormat, _numMipmapLevels);
}
getModifiedCount(n,contextID) = image->getModifiedCount();
applyTexImage2DArray_subload(state, image, n, _textureWidth, _textureHeight, image->r(), _internalFormat, _numMipmapLevels);
n += image->r();
}
}

10
src/osg/dxtctool.cpp
View File

@@ -190,11 +190,11 @@ bool isCompressedImageTranslucent(size_t width, size_t height, GLenum format, vo
int blockCount = ((width + 3) >> 2) * ((height + 3) >> 2);
switch(format)
{
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
return false;
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_RGB_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT):
return false;
case(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT):
case(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT):
{
const DXT1TexelsBlock *texelsBlock = reinterpret_cast<const DXT1TexelsBlock*>(imageData);

2
src/osg/glu/libtess/tess.cpp
View File

@@ -213,7 +213,7 @@ osg::gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value )
tess->windingRule = windingRule;
return;
default:
break;
return;
}
case GLU_TESS_BOUNDARY_ONLY:

13
src/osgPlugins/dae/daeReader.cpp
View File

@@ -292,14 +292,23 @@ bool daeReader::convert( std::istream& fin )
// set fileURI to null device
const std::string fileURI("from std::istream");
fin.imbue(std::locale::classic());
// get the size of the file and rewind
fin.seekg(0, std::ios::end);
std::streampos length = fin.tellg();
unsigned long length = static_cast<unsigned long>(fin.tellg());
fin.seekg(0, std::ios::beg);
// use a vector as buffer and read from stream
std::vector<char> buffer(length);
std::vector<char> buffer(length + 1ul);
buffer[length] = 0;
fin.read(&buffer[0], length);
if (fin.fail())
{
OSG_WARN << "daeReader::convert: Failed to read istream" << std::endl;
return false;
}
domElement* loaded_element = _dae->openFromMemory(fileURI, &buffer[0]);
_document = dynamic_cast<domCOLLADA*>(loaded_element);

3
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@@ -1079,15 +1079,12 @@ bool WriteDDSFile(const osg::Image *img, std::ostream& fout, bool autoFlipDDSWri
// Initialize ddsd structure and its members
DDSURFACEDESC2 ddsd;
memset( &ddsd, 0, sizeof( ddsd ) );
DDPIXELFORMAT ddpf;
memset( &ddpf, 0, sizeof( ddpf ) );
//DDCOLORKEY ddckCKDestOverlay;
//DDCOLORKEY ddckCKDestBlt;
//DDCOLORKEY ddckCKSrcOverlay;
//DDCOLORKEY ddckCKSrcBlt;
DDSCAPS2 ddsCaps;
memset( &ddsCaps, 0, sizeof( ddsCaps ) );
ddsd.dwSize = sizeof(ddsd);
ddpf.dwSize = sizeof(ddpf);

1
src/osgPlugins/gles/IndexMeshVisitor.cpp
View File

@@ -55,7 +55,6 @@ void IndexMeshVisitor::process(osg::Geometry& geom) {
new_primitives.reserve(primitives.size());
// compute duplicate vertices
typedef std::vector<unsigned int> IndexList;
unsigned int numVertices = geom.getVertexArray()->getNumElements();
IndexList indices(numVertices);
unsigned int i, j;

6
src/osgPlugins/gles/glesUtil
View File

@@ -222,9 +222,6 @@ namespace glesUtil {
virtual void apply(osg::Vec2ubArray& array) { remap(array); }
virtual void apply(osg::MatrixfArray& array) { remap(array); }
protected:
RemapArray& operator= (const RemapArray&) { return *this; }
};
@@ -252,9 +249,6 @@ namespace glesUtil {
}
return 0;
}
protected:
VertexAttribComparitor& operator= (const VertexAttribComparitor&) { return *this; }
};
// Move the values in an array to new positions, based on the

3
src/osgPlugins/gstreamer/GStreamerImageStream.cpp
View File

@@ -22,6 +22,7 @@ GStreamerImageStream::GStreamerImageStream():
GStreamerImageStream::GStreamerImageStream(const GStreamerImageStream & image, const osg::CopyOp & copyop) :
osg::ImageStream(image, copyop),
OpenThreads::Thread(),
_loop(0),
_pipeline(0),
_internal_buffer(0),
@@ -239,7 +240,7 @@ GstFlowReturn GStreamerImageStream::on_new_preroll(GstAppSink *appsink, GStreame
return GST_FLOW_OK;
}
gboolean GStreamerImageStream::on_message(GstBus *bus, GstMessage *message, GStreamerImageStream *user_data)
gboolean GStreamerImageStream::on_message(GstBus* /*bus*/, GstMessage *message, GStreamerImageStream* user_data)
{
if( GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS)
{

2
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -287,7 +287,7 @@ bool DataInputStream::uncompress(std::istream& fin, std::string& destination) co
return ret == Z_STREAM_END ? true : false;
}
#else
bool DataInputStream::uncompress(std::istream& fin, std::string& destination) const
bool DataInputStream::uncompress(std::istream& /*fin*/, std::string& /*destination*/) const
{
return false;
}

2
src/osgPlugins/ive/DataOutputStream.cpp
View File

@@ -320,7 +320,7 @@ bool DataOutputStream::compress(std::ostream& fout, const std::string& source) c
return true;
}
#else
bool DataOutputStream::compress(std::ostream& fout, const std::string& source) const
bool DataOutputStream::compress(std::ostream& /*fout*/, const std::string& /*source*/) const
{
return false;
}

22
src/osgPlugins/osc/OscReceivingDevice.cpp
View File

@@ -309,7 +309,7 @@ public:
return true;
}
catch(osc::Exception e) {
catch(osc::Exception& e) {
handleException(e);
}
@@ -342,7 +342,7 @@ public:
return true;
}
catch(osc::Exception e) {
catch(osc::Exception& e) {
handleException(e);
}
@@ -378,7 +378,7 @@ public:
return true;
}
catch(osc::Exception e) {
catch(osc::Exception& e) {
handleException(e);
}
@@ -413,7 +413,7 @@ public:
return true;
}
catch(osc::Exception e) {
catch(osc::Exception& e) {
handleException(e);
}
@@ -449,7 +449,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -491,7 +491,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -529,7 +529,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -588,7 +588,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -630,7 +630,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -662,7 +662,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;
@@ -695,7 +695,7 @@ public:
return true;
}
catch (osc::Exception e) {
catch (osc::Exception& e) {
handleException(e);
}
return false;

8
src/osgPlugins/zip/unzip.cpp
View File

@@ -269,7 +269,7 @@ FILETIME dosdatetime2filetime(WORD dosdate,WORD dostime)
return ft;
}
bool FileExists(const TCHAR *fn)
static bool FileExists(const TCHAR *fn)
{ return (GetFileAttributes(fn)!=0xFFFFFFFF);
}
#endif
@@ -1741,9 +1741,9 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
//
extern const char inflate_copyright[] =
" inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
// This symbol conflicts with other dependencies when OSG is used in static-lib mode
// extern const char inflate_copyright[] =
// " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
// If you use the zlib library in a product, an acknowledgment is welcome
// in the documentation of your product. If for some reason you cannot
// include such an acknowledgment, I would appreciate that you keep this

5
src/osgUtil/MeshOptimizers.cpp
View File

@@ -109,6 +109,11 @@ struct VertexAttribComparitor : public GeometryArrayGatherer
{
}
VertexAttribComparitor(const VertexAttribComparitor& rhs)
: GeometryArrayGatherer(rhs)
{
}
bool operator() (unsigned int lhs, unsigned int rhs) const
{
for(ArrayList::const_iterator itr=_arrayList.begin();

2
src/osgUtil/tristripper/include/detail/graph_array.h
View File

@@ -446,7 +446,7 @@ inline void graph_array<N>::swap(graph_type & Right)
template <class N>
inline void unmark_nodes(graph_array<N> & G)
{
std::for_each(G.begin(), G.end(), std::mem_fun_ref(&graph_array<N>::node::unmark));
for(typename graph_array<N>::node_iterator itr = G.begin(); itr != G.end(); ++itr) itr->unmark();
}

10
src/osgWidget/WindowManager.cpp
View File

@@ -317,7 +317,14 @@ bool WindowManager::pickAtXY(float x, float y, WidgetList& wl)
// Iterate over every picked result and create a list of Widgets that belong
// to that Window.
for(Intersections::iterator i = intr.begin(); i != intr.end(); i++) {
Window* win = dynamic_cast<Window*>(i->nodePath.back()->getParent(0));
Window* win = 0;
const osg::NodePath& nodePath = i->nodePath;
for(osg::NodePath::const_reverse_iterator np_itr = nodePath.rbegin(); np_itr != nodePath.rend(); ++np_itr)
{
win = dynamic_cast<Window*>(*np_itr);
if (win) break;
}
// Make sure that our window is valid, and that our pick is within the
// "visible area" of the Window.
@@ -336,7 +343,6 @@ bool WindowManager::pickAtXY(float x, float y, WidgetList& wl)
else if(activeWin != win) break;
Widget* widget = dynamic_cast<Widget*>(i->drawable.get());
if(!widget) continue;
// We need to return a list of every Widget that was picked, so