6a67be2e32
forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15165 16af8721-9629-0410-8352-f15c8da7e697
115 lines
3.1 KiB
C++
115 lines
3.1 KiB
C++
/* -*-c++-*-
|
|
*
|
|
* OpenSceneGraph example, osgphotoalbum.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef PHOTOARCHIVE_H
|
|
#define PHOTOARCHIVE_H
|
|
|
|
#include <osg/Image>
|
|
|
|
class PhotoArchive : public osg::Referenced
|
|
{
|
|
public:
|
|
|
|
static PhotoArchive* open(const std::string& filename)
|
|
{
|
|
osg::ref_ptr<PhotoArchive> archive = new PhotoArchive(filename);
|
|
if (!archive->empty()) return archive.release();
|
|
else return 0;
|
|
}
|
|
|
|
typedef std::vector<std::string> FileNameList;
|
|
|
|
bool empty() { return _photoIndex.empty(); }
|
|
|
|
void getImageFileNameList(FileNameList& filenameList);
|
|
|
|
static void buildArchive(const std::string& filename, const FileNameList& imageList, unsigned int thumbnailSize=256, unsigned int maximumSize=1024, bool compressed=true);
|
|
|
|
osg::ref_ptr<osg::Image> readImage(const std::string& filename,
|
|
unsigned int target_s, unsigned target_t,
|
|
float& original_s, float& original_t);
|
|
|
|
|
|
|
|
protected:
|
|
|
|
PhotoArchive(const std::string& filename);
|
|
|
|
virtual ~PhotoArchive() {}
|
|
|
|
bool readPhotoIndex(const std::string& filename);
|
|
|
|
struct PhotoHeader
|
|
{
|
|
PhotoHeader():
|
|
original_s(0),
|
|
original_t(0),
|
|
thumbnail_s(0),
|
|
thumbnail_t(0),
|
|
thumbnail_position(0),
|
|
fullsize_s(0),
|
|
fullsize_t(0),
|
|
fullsize_position(0)
|
|
{
|
|
filename[0]='\0';
|
|
}
|
|
|
|
char filename[256];
|
|
unsigned int original_s;
|
|
unsigned int original_t;
|
|
|
|
unsigned int thumbnail_s;
|
|
unsigned int thumbnail_t;
|
|
unsigned int thumbnail_position;
|
|
|
|
unsigned int fullsize_s;
|
|
unsigned int fullsize_t;
|
|
unsigned int fullsize_position;
|
|
};
|
|
|
|
|
|
struct ImageHeader
|
|
{
|
|
ImageHeader():
|
|
s(0),
|
|
t(0),
|
|
internalTextureformat(0),
|
|
pixelFormat(0),
|
|
type(0),
|
|
size(0) {}
|
|
|
|
unsigned int s;
|
|
unsigned int t;
|
|
GLint internalTextureformat;
|
|
GLenum pixelFormat;
|
|
GLenum type;
|
|
unsigned int size;
|
|
};
|
|
|
|
|
|
typedef std::vector<PhotoHeader> PhotoIndexList;
|
|
|
|
std::string _archiveFileName;
|
|
PhotoIndexList _photoIndex;
|
|
|
|
};
|
|
|
|
#endif
|