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

Updates osgjs from sketchfab

Browse Source 
* updates uservalue serialization (avoid creating multie UserDataContainer for a same object)
* removes vec4ubarray specific serialization (serialization should not enforce the previous color transformation)
This commit is contained in:
Marc Helbling
2017-01-20 15:09:26 +01:00
parent 7cd7618e8c
commit c84b667fa5
4 changed files with 144 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/osgjs/Animation.cpp
View File

@@ -45,7 +45,7 @@ bool addJSONChannel(const std::string& channelType, T* channel, bool packByCoord
osg::ref_ptr<JSONObject> json = new JSONObject;
std::string jsonType = channelType + (packByCoords ? "Packed" : "");
translateObject(json.get(), channel);
writer->translateObject(json.get(), channel);
json->getMaps()["Name"] = new JSONValue<std::string>(channel->getName());
json->getMaps()["TargetName"] = new JSONValue<std::string>(channel->getTargetName());

2
src/osgPlugins/osgjs/ReaderWriterJSON.cpp
View File

@@ -125,7 +125,7 @@ public:
writer.setBaseName(basename);
writer.useExternalBinaryArray(options.useExternalBinaryArray);
writer.mergeAllBinaryFiles(options.mergeAllBinaryFiles);
writer.inlineImages(options.inlineImages);
writer.setInlineImages(options.inlineImages);
writer.setMaxTextureDimension(options.resizeTextureUpToPowerOf2);
writer.setVarint(options.varint);
writer.setBaseLodURL(options.baseLodURL);

34
src/osgPlugins/osgjs/WriteVisitor
View File

@@ -29,8 +29,10 @@
#include <osgAnimation/Bone>
#include <osgAnimation/UpdateBone>
#include <osgSim/ShapeAttribute>
#include <osgText/Text>
#
#include <fstream>
#include <sstream>
#include <vector>
@@ -47,8 +49,9 @@
#define WRITER_VERSION 9
class WriteVisitor;
osg::Array* getTangentSpaceArray(osg::Geometry& geometry);
void translateObject(JSONObject* json, osg::Object* osg);
void getStringifiedUserValue(osg::Object* o, std::string& name, std::string& value);
template<typename T>
bool getStringifiedUserValue(osg::Object* o, std::string& name, std::string& value);
@@ -59,8 +62,9 @@ class WriteVisitor : public osg::NodeVisitor
public:
typedef std::vector<osg::ref_ptr<osg::StateSet> > StateSetStack;
typedef std::pair<std::string, std::string> KeyValue;
typedef std::map<osg::ref_ptr<osg::Object>, osg::ref_ptr<JSONObject> > OsgObjectToJSONObject;
std::map<osg::ref_ptr<osg::Object>, osg::ref_ptr<JSONObject> > _maps;
OsgObjectToJSONObject _maps;
std::vector<osg::ref_ptr<JSONObject> > _parents;
osg::ref_ptr<JSONObject> _root;
StateSetStack _stateset;
@@ -74,6 +78,20 @@ public:
std::map<KeyValue, std::string> _specificBuffers;
std::map<std::string, std::ofstream*> _buffers;
JSONObject* getJSON(osg::Object* object) const {
OsgObjectToJSONObject::const_iterator lookup = _maps.find(object);
if(lookup != _maps.end()) {
return lookup->second->getShadowObject();
}
return 0;
}
void setJSON(osg::Object* object, JSONObject* json) {
if(json) {
_maps[object] = json;
}
}
std::ofstream& getBufferFile(const std::string& name) {
if(_buffers.find(name) == _buffers.end()) {
_buffers[name] = new std::ofstream(name.c_str(), std::ios::binary);
@@ -238,6 +256,10 @@ public:
return getBinaryFilename(flag);
}
void translateObject(JSONObject* json, osg::Object* osg);
JSONObject* createJSONOsgSimUserData(osgSim::ShapeAttributeList*);
JSONObject* createJSONUserDataContainer(osg::UserDataContainer*);
JSONObject* createJSONPagedLOD(osg::PagedLOD* plod);
JSONObject* createJSONStateSet(osg::StateSet* ss);
JSONObject* createJSONTexture(osg::Texture* sa);
@@ -650,10 +672,14 @@ public:
_parents.pop_back();
}
std::string getBaseName() const { return _baseName; }
bool getInlineImages() const { return _inlineImages; }
int getMaxTextureDimension() const { return _maxTextureDimension; }
void setBaseName(const std::string& basename) { _baseName = basename; }
void useExternalBinaryArray(bool use) { _useExternalBinaryArray = use; }
void mergeAllBinaryFiles(bool use) { _mergeAllBinaryFiles = use; }
void inlineImages(bool use) { _inlineImages = use; }
void setInlineImages(bool use) { _inlineImages = use; }
void setVarint(bool use) { _varint = use; }
void setMaxTextureDimension(int use) { _maxTextureDimension = use; }
void addSpecificBuffer(const std::string& bufferFlag) {

199
src/osgPlugins/osgjs/WriteVisitor.cpp
View File

@@ -11,8 +11,6 @@
#include <osg/Material>
#include <osg/BlendFunc>
#include <osgSim/ShapeAttribute>
#include <osgText/Text>
#include <osgAnimation/MorphGeometry>
@@ -76,82 +74,6 @@ osg::ref_ptr<JSONObject> buildRigBoneMap(osgAnimation::RigGeometry& rigGeometry)
}
void translateObject(JSONObject* json, osg::Object* osg)
{
if (!osg->getName().empty()) {
json->getMaps()["Name"] = new JSONValue<std::string>(osg->getName());
}
osgSim::ShapeAttributeList* osgSim_userdata = dynamic_cast<osgSim::ShapeAttributeList* >(osg->getUserData());
if (osgSim_userdata) {
JSONObject* jsonUDC = new JSONObject();
jsonUDC->addUniqueID();
JSONArray* jsonUDCArray = new JSONArray();
jsonUDC->getMaps()["Values"] = jsonUDCArray;
for (unsigned int i = 0; i < osgSim_userdata->size(); i++) {
const osgSim::ShapeAttribute& attr = (*osgSim_userdata)[i];
JSONObject* jsonEntry = new JSONObject();
jsonEntry->getMaps()["Name"] = new JSONValue<std::string>(attr.getName());
osg::ref_ptr<JSONValue<std::string> > value;
switch(attr.getType()) {
case osgSim::ShapeAttribute::INTEGER:
{
std::stringstream ss;
ss << attr.getInt();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::DOUBLE:
{
std::stringstream ss;
ss << attr.getDouble();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::STRING:
{
std::stringstream ss;
ss << attr.getString();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::UNKNOWN:
default:
break;
}
jsonEntry->getMaps()["Value"] = value;
jsonUDCArray->getArray().push_back(jsonEntry);
}
json->getMaps()["UserDataContainer"] = jsonUDC;
} else if (osg->getUserDataContainer()) {
JSONObject* jsonUDC = new JSONObject();
jsonUDC->addUniqueID();
if (!osg->getUserDataContainer()->getName().empty()) {
jsonUDC->getMaps()["Name"] = new JSONValue<std::string>(osg->getUserDataContainer()->getName());
}
JSONArray* jsonUDCArray = new JSONArray();
jsonUDC->getMaps()["Values"] = jsonUDCArray;
for (unsigned int i = 0; i < osg->getUserDataContainer()->getNumUserObjects(); i++) {
osg::Object* o = osg->getUserDataContainer()->getUserObject(i);
std::string name, value;
getStringifiedUserValue(o, name, value);
if(!name.empty() && !value.empty())
{
JSONObject* jsonEntry = new JSONObject();
jsonEntry->getMaps()["Name"] = new JSONValue<std::string>(name);
jsonEntry->getMaps()["Value"] = new JSONValue<std::string>(value);
jsonUDCArray->getArray().push_back(jsonEntry);
}
}
json->getMaps()["UserDataContainer"] = jsonUDC;
}
}
void getStringifiedUserValue(osg::Object* o, std::string& name, std::string& value) {
if(getStringifiedUserValue<std::string>(o, name, value)) return;
if(getStringifiedUserValue<char>(o, name, value)) return;
@@ -352,6 +274,108 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
}
JSONObject* WriteVisitor::createJSONOsgSimUserData(osgSim::ShapeAttributeList* osgSimData) {
JSONObject* jsonUDC = new JSONObject();
jsonUDC->addUniqueID();
JSONArray* jsonUDCArray = new JSONArray();
jsonUDC->getMaps()["Values"] = jsonUDCArray;
for (unsigned int i = 0; i < osgSimData->size(); i++) {
const osgSim::ShapeAttribute& attr = (*osgSimData)[i];
JSONObject* jsonEntry = new JSONObject();
jsonEntry->getMaps()["Name"] = new JSONValue<std::string>(attr.getName());
osg::ref_ptr<JSONValue<std::string> > value;
switch(attr.getType()) {
case osgSim::ShapeAttribute::INTEGER:
{
std::stringstream ss;
ss << attr.getInt();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::DOUBLE:
{
std::stringstream ss;
ss << attr.getDouble();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::STRING:
{
std::stringstream ss;
ss << attr.getString();
value = new JSONValue<std::string>(ss.str());
}
break;
case osgSim::ShapeAttribute::UNKNOWN:
default:
break;
}
jsonEntry->getMaps()["Value"] = value;
jsonUDCArray->getArray().push_back(jsonEntry);
}
return jsonUDC;
}
JSONObject* WriteVisitor::createJSONUserDataContainer(osg::UserDataContainer* container) {
JSONObject* jsonUDC = new JSONObject();
jsonUDC->addUniqueID();
if (!container->getName().empty()) {
jsonUDC->getMaps()["Name"] = new JSONValue<std::string>(container->getName());
}
JSONArray* jsonUDCArray = new JSONArray();
jsonUDC->getMaps()["Values"] = jsonUDCArray;
for (unsigned int i = 0; i < container->getNumUserObjects(); i++) {
osg::Object* o = container->getUserObject(i);
std::string name, value;
getStringifiedUserValue(o, name, value);
if(!name.empty() && !value.empty())
{
JSONObject* jsonEntry = new JSONObject();
jsonEntry->getMaps()["Name"] = new JSONValue<std::string>(name);
jsonEntry->getMaps()["Value"] = new JSONValue<std::string>(value);
jsonUDCArray->getArray().push_back(jsonEntry);
}
}
return jsonUDC;
}
void WriteVisitor::translateObject(JSONObject* json, osg::Object* osg)
{
if (!osg->getName().empty()) {
json->getMaps()["Name"] = new JSONValue<std::string>(osg->getName());
}
JSONObject* jsonUDC = 0;
osgSim::ShapeAttributeList* osgSimData = dynamic_cast<osgSim::ShapeAttributeList* >(osg->getUserData());
if (osgSimData) {
jsonUDC = this->getJSON(osgSimData);
if(!jsonUDC) {
jsonUDC = createJSONOsgSimUserData(osgSimData);
this->setJSON(osgSimData, jsonUDC);
}
}
else if (osg::UserDataContainer* container = osg->getUserDataContainer()) {
jsonUDC = this->getJSON(container);
if(!jsonUDC) {
jsonUDC = createJSONUserDataContainer(container);
this->setJSON(container, jsonUDC);
}
}
if(jsonUDC) {
json->getMaps()["UserDataContainer"] = jsonUDC;
}
}
JSONObject* WriteVisitor::createJSONBufferArray(osg::Array* array, osg::Object* parent)
{
if (_maps.find(array) != _maps.end())
@@ -765,12 +789,16 @@ JSONObject* WriteVisitor::createJSONLight(osg::Light* light)
return jsonLight.release();
}
template <class T> JSONObject* createImageFromTexture(osg::Texture* texture, JSONObject* jsonTexture, bool inlineImages,
int maxTextureDimension, const std::string &baseName = "")
template <class T>
JSONObject* createImageFromTexture(osg::Texture* texture, JSONObject* jsonTexture, WriteVisitor* writer)
{
bool inlineImages = writer->getInlineImages();
int maxTextureDimension = writer->getMaxTextureDimension();
const std::string baseName = writer->getBaseName();
T* text = dynamic_cast<T*>( texture);
if (text) {
translateObject(jsonTexture,text);
writer->translateObject(jsonTexture,text);
JSONObject* image = createImage(text->getImage(), inlineImages, maxTextureDimension, baseName);
if (image)
jsonTexture->getMaps()["File"] = image;
@@ -902,24 +930,21 @@ JSONObject* WriteVisitor::createJSONTexture(osg::Texture* texture)
{
JSONObject* obj = createImageFromTexture<osg::Texture1D>(texture, jsonTexture.get(), this->_inlineImages,
this->_maxTextureDimension, this->_baseName);
JSONObject* obj = createImageFromTexture<osg::Texture1D>(texture, jsonTexture.get(), this);
if (obj) {
return obj;
}
}
{
JSONObject* obj = createImageFromTexture<osg::Texture2D>(texture, jsonTexture.get(), this->_inlineImages,
this->_maxTextureDimension, this->_baseName);
JSONObject* obj = createImageFromTexture<osg::Texture2D>(texture, jsonTexture.get(), this);
if (obj) {
return obj;
}
}
{
JSONObject* obj = createImageFromTexture<osg::TextureRectangle>(texture, jsonTexture.get(), this->_inlineImages,
this->_maxTextureDimension, this->_baseName);
JSONObject* obj = createImageFromTexture<osg::TextureRectangle>(texture, jsonTexture.get(), this);
if (obj) {
return obj;
}