Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
fabrobinet committed Jan 31, 2014
1 parent 795a2b0 commit 552c262
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions converter/COLLADA2GLTF/COLLADA2GLTFWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,8 @@ namespace GLTF
shared_ptr <JSONObject> extras)
{
shared_ptr <JSONObject> values = cvtEffect->getValues();
GLTFProfile* profile = this->_converterContext.profile.get();
GLTFConverterContext &converterContext = this->_converterContext;
GLTFProfile* profile = converterContext.profile.get();

ColorOrTexture slot;

Expand Down Expand Up @@ -1418,15 +1419,14 @@ namespace GLTF
slotObject->setUnsignedInt32("type", profile->getGLenumForString("SAMPLER_2D"));

//do we need a new sampler ?
GLTFProfile* profile = this->_converterContext.profile.get();
std::string samplerUID = this->getSamplerUIDForParameters(__GetGLWrapMode(sampler->getWrapS(), profile),
__GetGLWrapMode(sampler->getWrapT(), profile),
__GetFilterMode(sampler->getMinFilter(), profile),
__GetFilterMode(sampler->getMagFilter(), profile));

std::string textureUID = "texture_" + imageUID;

shared_ptr <GLTF::JSONObject> textures = this->_converterContext.root->createObjectIfNeeded("textures");
shared_ptr <GLTF::JSONObject> textures = converterContext.root->createObjectIfNeeded("textures");
if (textures->contains(textureUID) == false) {
shared_ptr <JSONObject> textureObject(new JSONObject());
textureObject->setString("source", imageUID);
Expand Down

0 comments on commit 552c262

Please sign in to comment.