summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2010-12-02 20:03:54 +0100
committerGunnar Sletta <gunnar.sletta@nokia.com>2010-12-02 20:03:54 +0100
commit866391982c913f47623ac25ef57bb1ccc49acae3 (patch)
tree2909c8c0fd63a3801b69983a89b80db3106a7cbf
parent05260ab5903d4ce42fba14c92b17d91759426da8 (diff)
Add a few missing files
-rw-r--r--src/adaptationlayers/default/default_texturemanager.cpp66
-rw-r--r--src/adaptationlayers/default/default_texturemanager.h55
2 files changed, 121 insertions, 0 deletions
diff --git a/src/adaptationlayers/default/default_texturemanager.cpp b/src/adaptationlayers/default/default_texturemanager.cpp
new file mode 100644
index 0000000..58da9d5
--- /dev/null
+++ b/src/adaptationlayers/default/default_texturemanager.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt scene graph research project.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "default_texturemanager.h"
+
+DefaultTextureManager::DefaultTextureManager()
+{
+}
+
+TextureReference *DefaultTextureManager::requestUploadedTexture(const QImage &image, UploadHints hints)
+{
+ QGLContext *context = const_cast<QGLContext *>(QGLContext::currentContext());
+ int id = context->bindTexture(image,
+ GL_TEXTURE_2D,
+ image.hasAlphaChannel() ? GL_RGBA : GL_RGB,
+ QGLContext::PremultipliedAlphaBindOption);
+
+ TextureReference *ref = new TextureReference();
+ ref->setTextureId(id);
+ ref->setOwnsTexture(true);
+ ref->setAlphaChannel(image.hasAlphaChannel());
+ ref->setTextureSize(image.size());
+ ref->setStatus(TextureReference::Ready);
+
+ printf("created texture: %d for %p\n", id, ref);
+
+ return ref;
+}
diff --git a/src/adaptationlayers/default/default_texturemanager.h b/src/adaptationlayers/default/default_texturemanager.h
new file mode 100644
index 0000000..f2f8659
--- /dev/null
+++ b/src/adaptationlayers/default/default_texturemanager.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt scene graph research project.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DEFAULTTEXTUREMANAGER_H
+#define DEFAULTTEXTUREMANAGER_H
+
+#include "adaptationinterfaces.h"
+
+class DefaultTextureManager : public TextureManager
+{
+public:
+ DefaultTextureManager();
+
+ TextureReference *requestUploadedTexture(const QImage &image, UploadHints hints);
+};
+
+#endif // DEFAULTTEXTUREMANAGER_H