From 87a07e40e65f2a2540c9fdf579205e3d479d50e4 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Tue, 19 Aug 2014 09:34:17 +0200
Subject: Texture renamed to QTexture

Change-Id: I6f5570ce042b8d3ef44aa76c1fd8ce3a1dde4d3c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/render/io/gltfparser.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/render/io/gltfparser.cpp')

diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 0e39da1b6..91ae3f81f 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -55,7 +55,7 @@
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qmatrixtransform.h>
 #include <Qt3DCore/qcameralens.h>
-#include <texture.h>
+#include <qtexture.h>
 #include <qparameter.h>
 
 #include <QJsonDocument>
@@ -773,7 +773,7 @@ void GLTFParser::processJSONImage( QString id, QJsonObject jsonObj)
 
 void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj)
 {
-    Texture* tex = new Texture();
+    QTexture* tex = new QTexture();
 
     int target = jsonObj.value(KEY_TARGET).toInt();
 
@@ -781,8 +781,8 @@ void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj)
     //int pixelFormat = jsonObj.value(KEY_FORMAT).toInt();
     //int internalFormat = jsonObj.value(KEY_INTERNAL_FORMAT).toInt();
 
-    tex->setTarget(static_cast<Texture::Target>(target));
-    tex->setFormat(Texture::RGBA8_UNorm /* static_cast<QOpenGLTexture::TextureFormat>(internalFormat)*/);
+    tex->setTarget(static_cast<QTexture::Target>(target));
+    tex->setFormat(QTexture::RGBA8_UNorm /* static_cast<QOpenGLTexture::TextureFormat>(internalFormat)*/);
 
     QString samplerId = jsonObj.value(KEY_SAMPLER).toString();
     QString source = jsonObj.value(KEY_SOURCE).toString();
@@ -801,11 +801,11 @@ void GLTFParser::processJSONTexture( QString id, QJsonObject jsonObj)
 
     QJsonObject sampler = samplersDict.value(samplerId).toObject();
 
-    tex->setWrapMode(static_cast<Texture::WrapMode>(sampler.value(KEY_WRAP_S).toInt()));
+    tex->setWrapMode(static_cast<QTexture::WrapMode>(sampler.value(KEY_WRAP_S).toInt()));
     // tex->setWrapMode(sampler.value("wrapT").toInt());
 
-    tex->setMinificationFilter(static_cast<Texture::Filter>(sampler.value(KEY_MIN_FILTER).toInt()));
-    tex->setMagnificationFilter(static_cast<Texture::Filter>(sampler.value(KEY_MAG_FILTER).toInt()));
+    tex->setMinificationFilter(static_cast<QTexture::Filter>(sampler.value(KEY_MIN_FILTER).toInt()));
+    tex->setMagnificationFilter(static_cast<QTexture::Filter>(sampler.value(KEY_MAG_FILTER).toInt()));
 
     m_textures[id] = tex;
 }
-- 
cgit v1.2.3