summaryrefslogtreecommitdiffstats
path: root/src/threed/global
diff options
context:
space:
mode:
Diffstat (limited to 'src/threed/global')
-rw-r--r--src/threed/global/global.pri7
-rw-r--r--src/threed/global/qglnamespace.cpp290
-rw-r--r--src/threed/global/qglnamespace.h163
-rw-r--r--src/threed/global/qt3dglobal.h74
4 files changed, 0 insertions, 534 deletions
diff --git a/src/threed/global/global.pri b/src/threed/global/global.pri
deleted file mode 100644
index 2fac1022..00000000
--- a/src/threed/global/global.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDEPATH += $$PWD
-VPATH += $$PWD
-HEADERS += \
- global/qt3dglobal.h \
- global/qglnamespace.h
-SOURCES += \
- qglnamespace.cpp
diff --git a/src/threed/global/qglnamespace.cpp b/src/threed/global/qglnamespace.cpp
deleted file mode 100644
index 63418cf3..00000000
--- a/src/threed/global/qglnamespace.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** This file is part of the QtQuick3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglnamespace.h"
-#include <QtCore/qsize.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \namespace QGL
-
- \brief The QGL namespace contains miscellaneous identifiers
- used throughout the Qt3D module.
-*/
-
-/*!
- \enum QGL::VertexAttribute
- \since 4.8
- This enum defines the type of vertex attribute to set on an effect with QGLPainter::setVertexAttribute()
-
- \value Position The primary position of the vertex.
- \value Normal The normal at each vertex.
- \value Color The color at each vertex.
- \value TextureCoord0 The texture co-ordinate at each vertex for texture unit 0.
- \value TextureCoord1 The texture co-ordinate at each vertex for texture unit 1.
- \value TextureCoord2 The texture co-ordinate at each vertex for texture unit 2.
- \value CustomVertex0 First custom vertex attribute. Custom attributes
- can be used for any purpose: texture co-ordinates, colors,
- or other values of interest to shader programs.
- \value CustomVertex1 Second custom vertex attribute.
- \value UserVertex First user-assigned vertex attribute. Additional
- attributes can be assigned as UserVertex, UserVertex + 1, etc.
- Note that on OpenGL/ES 2.0 systems, usually the maximum
- number of vertex attributes is 8, which means that user-assigned
- vertex attributes will be out of range.
-*/
-
-/*!
- \enum QGL::Face
- \since 4.8
- This enum defines the faces to apply an operation to.
-
- \value FrontFaces Apply the operation to front faces only.
- \value BackFaces Apply the operation to back faces only.
- \value AllFaces Apply the operation to both front and back faces.
-*/
-
-/*!
- \enum QGL::DrawingMode
- \since 4.8
- This enum defines the type of OpenGL primitive to render with QGLPainter::draw().
-
- \value Points Draws a point at each of the specified vertices.
- \value Lines Draws a series of unconnected line segments, using two
- vertices for each line.
- \value LineLoop series of connected line segments, from the
- first to the last vertex, and then connecting the last
- vertex back to the first vertex.
- \value LineStrip Draws a series of connected line segments, from the
- first to the last vertex.
- \value Triangles Draws a series of triangles using three vertices from
- the enabled vertex arrays for each triangle.
- \value TriangleStrip Draws a series of triangles in a strip, starting
- with the first three vertices and then one extra vertex for each
- additional triangle.
- \value TriangleFan Draws a series of triangles that fan out around the
- first vertex in the enabled vertex arrays, starting with the
- first three vertices and then one extra vertex for each additional
- triangle.
- \value LinesAdjacency Draws a series of unconnected lines, using
- two vertices for each line to define the positions, and an
- additional vertices per line to define adjacent points.
- This drawing mode is only supported on OpenGL systems that
- have geometry shaders.
- \value LineStripAdjacency Draws a series of connected line segments,
- from the second to the second last vertex. The first and last
- vertices define adjacent points. This drawing mode is only
- supported on OpenGL systems that have geometry shaders.
- \value TrianglesAdjacency Draws a series of triangles using three
- vertices from the enabled vertex arrays for each triangle.
- An additional three vertices per triangle are supplied to
- define adjacent points. This drawing mode is only supported
- on OpenGL systems that have geometry shaders.
- \value TriangleStripAdjacency Draws a series of triangles in a strip,
- with additional vertices for points adjacent to the strip.
- This drawing mode is only supported on OpenGL systems that
- have geometry shaders.
-*/
-
-/*!
- \enum QGL::StandardEffect
- \since 4.8
- This enum defines a standard drawing effect for use with QGLPainter.
-
- \value FlatColor Single flat color specified by QGLPainter::setColor()
- with no lighting.
- \value FlatPerVertexColor Per-vertex flat colors specified by a
- QGL::Color vertex array with no lighting.
- \value FlatReplaceTexture2D Map a texture across the fragments with
- no lighting. The final fragment color is replaced directly
- with the texture. The texture is sourced from texture unit 0.
- \value FlatDecalTexture2D Map a texture across the fragments, combined
- with QGLPainter::color(), and no lighting. The texture is sourced
- from texture unit 0.
- \value LitMaterial Material colors specified by
- QGLPainter::setFaceMaterial() with lighting enabled. It is
- assumed that per-vertex normals are provided. Under OpenGL/ES 2.0
- only one light is supported, with single-sided materials,
- and no attenuation.
- \value LitDecalTexture2D Map a texture across the fragments, combined
- with the material color specified by QGLPainter::setFaceMaterial(),
- and lighting using the GL_DECAL combination rule. The texture is
- sourced from texture unit 0. It is assumed that per-vertex
- normals are provided. Under OpenGL/ES 2.0 only one light is
- supported, with single-sided materials, and no attenuation.
- \value LitModulateTexture2D Map a texture across the fragments, combined
- with the material color specified by QGLPainter::setFaceMaterial(),
- and lighting using the GL_MODULATE combination rule. The texture
- is sourced from texture unit 0. It is assumed that per-vertex
- normals are provided. Under OpenGL/ES 2.0 only one light is
- supported, with single-sided materials, and no attenuation.
-*/
-
-/*!
- \enum QGL::TextureWrap
- \since 4.8
- This enum defines the wrapping mode for texture co-ordinates.
-
- \value Repeat Ignore the integer part of the texture co-ordinate and
- create a repeating pattern using the texture.
- \value Clamp Clamps the texture co-ordinate to the range 0 to 1.
- This value is not supported in OpenGL/ES, where it will be
- treated the same as ClampToEdge.
- \value ClampToBorder Clamps the texture co-ordinate to the range
- (-1 / 2N) to (1 + 1 / 2N) where N is the size of the texture in
- the direction of clamping. This value is supported in OpenGL 1.3
- and higher. In OpenGL versions less than 1.3, this value will
- be treated the same as Clamp. In OpenGL/ES, this value will be
- treated the same as ClampToEdge.
- \value ClampToEdge Clamps the texture co-ordinate to the range
- (1 / 2N) to (1 - 1 / 2N) where N is the size of the texture in
- the direction of clamping. This value is supported in OpenGL 1.2
- and higher, and in all versions of OpenGL/ES. In OpenGL versions
- less than 1.2, this value will be treated the same as Clamp.
- \value MirroredRepeat If the integer part of the texture co-ordinate
- is even, then use the fractional part. If the integer part of
- the texture co-ordinate is odd, then use 1 - the fractional part.
- This creates an alternating repeating pattern from the texture.
- This value is only supported in OpenGL 1.4 and higher, or
- OpenGL/ES 2.0 and higher. On other versions, MirroredRepeat
- will be treated the same as Repeat.
-*/
-
-/*!
- \enum QGL::Eye
- \since 4.8
- This enum defines the eye that is being rendered by a QGLPainter
- when stereo rendering is in effect.
-
- \value NoEye Do not perform an eye adjustment on the camera because
- stereo rendering is not in effect.
- \value LeftEye Render the scene from the perspective of the left eye.
- \value RightEye Render the scene from the perspective of the right eye.
-*/
-
-/*!
- \enum QGL::Smoothing
- \since 4.8
- \relates QGLBuilder
-
- This enum defines vertex smoothing treatments.
- \value NoSmoothing No smoothing processing is performed.
- \value Smooth Lighting normals averaged for each face for a smooth appearance.
- \value Faceted Lighting normals separate for each face for a faceted appearance.
-*/
-
-/*!
- \enum QGL::Mouse3DKeys
- \since 4.8
- This enum defines extra key codes for QKeyEvent related to 3D mice
- devices. See QMouse3DEventProvider for further details.
-
- \value Key_Fit Reset the transform so the model is centered to
- fit within the view.
- \value Key_TopView Switch to the top view.
- \value Key_LeftView Switch to the left view.
- \value Key_RightView Switch to the right view.
- \value Key_FrontView Switch to the front view.
- \value Key_BottomView Switch to the bottom view.
- \value Key_BackView Switch to the back view.
- \value Key_RotateCW90 Rotate clockwise by 90 degrees.
- \value Key_RotateCCW90 Rotate counter-clockwise by 90 degrees.
- \value Key_ISO1 Show an isometric view of the model with top, front,
- and right sides.
- \value Key_ISO2 Show an isometric view of the model with top, back
- and left sides.
- \value Key_Button1 Special function button 1.
- \value Key_Button2 Special function button 2.
- \value Key_Button3 Special function button 3.
- \value Key_Button4 Special function button 4.
- \value Key_Button5 Special function button 5.
- \value Key_Button6 Special function button 6.
- \value Key_Button7 Special function button 7.
- \value Key_Button8 Special function button 8.
- \value Key_Button9 Special function button 9.
- \value Key_Button10 Special function button 10.
- \value Key_Rotations Toggles whether or not the rotation axes on a
- 3D mouse will be filtered.
- \value Key_Translations Toggles whether or not the translation axes
- on a 3D mouse will be filtered.
- \value Key_DominantAxis Toggles whether or not 3D mouse movements
- should be constrained to the dominant axis.
- \value Key_IncreaseSensitivity Increase the sensitivity of the mouse
- to wrist movements.
- \value Key_DecreaseSensitivity Decrease the sensitivity of the mouse
- to wrist movements.
-*/
-
-/*!
- Returns the next power of two that is greater than or
- equal to \a value. The \a value must be positive or the
- result is undefined.
-
- This is a convenience function for use with GL texture
- handling code.
-*/
-int QGL::nextPowerOfTwo(int value)
-{
- value--;
- value |= value >> 1;
- value |= value >> 2;
- value |= value >> 4;
- value |= value >> 8;
- value |= value >> 16;
- ++value;
- return value;
-}
-
-/*!
- Returns the next power of two that is greater than or
- equal to the width and height components of \a value.
-
- This is a convenience function for use with GL texture
- handling code.
-*/
-QSize QGL::nextPowerOfTwo(const QSize& value)
-{
- return QSize(nextPowerOfTwo(value.width()),
- nextPowerOfTwo(value.height()));
-}
-
-QT_END_NAMESPACE
diff --git a/src/threed/global/qglnamespace.h b/src/threed/global/qglnamespace.h
deleted file mode 100644
index 4987e87c..00000000
--- a/src/threed/global/qglnamespace.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** This file is part of the QtQuick3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLNAMESPACE_H
-#define QGLNAMESPACE_H
-
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QSize;
-
-namespace QGL
-{
- enum VertexAttribute {
- Position,
- Normal,
- Color,
- TextureCoord0,
- TextureCoord1,
- TextureCoord2,
- CustomVertex0,
- CustomVertex1,
- UserVertex
- };
-
- enum Face
- {
- FrontFaces = 0x0404, // GL_FRONT
- BackFaces = 0x0405, // GL_BACK
- AllFaces = 0x0408 // GL_FRONT_AND_BACK
- };
-
- enum DrawingMode
- {
- Points = 0x0000, // GL_POINTS
- Lines = 0x0001, // GL_LINES
- LineLoop = 0x0002, // GL_LINE_LOOP
- LineStrip = 0x0003, // GL_LINE_STRIP
- Triangles = 0x0004, // GL_TRIANGLES
- TriangleStrip = 0x0005, // GL_TRIANGLE_STRIP
- TriangleFan = 0x0006, // GL_TRIANGLE_FAN
- LinesAdjacency = 0x000A, // GL_LINES_ADJACENCY
- LineStripAdjacency = 0x000B, // GL_LINE_STRIP_ADJACENCY
- TrianglesAdjacency = 0x000C, // GL_TRIANGLES_ADJACENCY
- TriangleStripAdjacency = 0x000D // GL_TRIANGLE_STRIP_ADJACENCY
- };
-
- enum StandardEffect
- {
- FlatColor,
- FlatPerVertexColor,
- FlatReplaceTexture2D,
- FlatDecalTexture2D,
- LitMaterial,
- LitDecalTexture2D,
- LitModulateTexture2D
- };
-
- enum TextureWrap
- {
- Repeat = 0x2901, // GL_REPEAT
- Clamp = 0x2900, // GL_CLAMP
- ClampToBorder = 0x812D, // GL_CLAMP_TO_BORDER
- ClampToEdge = 0x812F, // GL_CLAMP_TO_EDGE
- MirroredRepeat = 0x8370 // GL_MIRRORED_REPEAT
- };
-
- enum Eye
- {
- NoEye,
- LeftEye,
- RightEye
- };
-
- enum Smoothing
- {
- NoSmoothing,
- Smooth,
- Faceted
- };
-
- enum Mouse3DKeys
- {
- Key_Fit = 0x01200002,
- Key_TopView = 0x01200003,
- Key_LeftView = 0x01200004,
- Key_RightView = 0x01200005,
- Key_FrontView = 0x01200006,
- Key_BottomView = 0x01200007,
- Key_BackView = 0x01200008,
- Key_RotateCW90 = 0x01200009,
- Key_RotateCCW90 = 0x0120000a,
- Key_ISO1 = 0x0120000b,
- Key_ISO2 = 0x0120000c,
- Key_Button1 = 0x0120000d,
- Key_Button2 = 0x0120000e,
- Key_Button3 = 0x0120000f,
- Key_Button4 = 0x01200010,
- Key_Button5 = 0x01200011,
- Key_Button6 = 0x01200012,
- Key_Button7 = 0x01200013,
- Key_Button8 = 0x01200014,
- Key_Button9 = 0x01200015,
- Key_Button10 = 0x01200016,
- Key_Rotations = 0x0120001b,
- Key_Translations = 0x0120001c,
- Key_DominantAxis = 0x0120001d,
- Key_IncreaseSensitivity = 0x0120001e,
- Key_DecreaseSensitivity = 0x0120001f
- };
-
- Q_QT3D_EXPORT int nextPowerOfTwo(int value);
- Q_QT3D_EXPORT QSize nextPowerOfTwo(const QSize& value);
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/threed/global/qt3dglobal.h b/src/threed/global/qt3dglobal.h
deleted file mode 100644
index 488e7e17..00000000
--- a/src/threed/global/qt3dglobal.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** This file is part of the QtQuick3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DGLOBAL_H
-#define QT3DGLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-// XXX: Move to qglobal.h eventually.
-QT_LICENSED_MODULE(Qt3D)
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-# if defined(QT_NODLL)
-# undef QT_MAKEDLL
-# undef QT_DLL
-# elif defined(QT_MAKEDLL) /* create a Qt DLL library */
-# if defined(QT_DLL)
-# undef QT_DLL
-# endif
-# if defined(QT_BUILD_QT3D_LIB)
-# define Q_QT3D_EXPORT Q_DECL_EXPORT
-# else
-# define Q_QT3D_EXPORT Q_DECL_IMPORT
-# endif
-# elif defined(QT_DLL) /* use a Qt DLL library */
-# define Q_QT3D_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-#if !defined(Q_QT3D_EXPORT)
-# if defined(QT_SHARED)
-# define Q_QT3D_EXPORT Q_DECL_EXPORT
-# else
-# define Q_QT3D_EXPORT
-# endif
-#endif
-
-#endif