diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/frontend/qabstracttextureprovider.h
index 4121e01..436e3f8 100644
--- a/src/render/frontend/qabstracttextureprovider.h
+++ b/src/render/frontend/qabstracttextureprovider.h
@@ -190,6 +190,17 @@ public:
RGB_BP_UNSIGNED_FLOAT = 0x8E8F, // GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
RGB_BP_SIGNED_FLOAT = 0x8E8E, // GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
RGB_BP_UNorm = 0x8E8C, // GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
+ R11_EAC_UNorm = 0x9270, // GL_COMPRESSED_R11_EAC
+ R11_EAC_SNorm = 0x9271, // GL_COMPRESSED_SIGNED_R11_EAC
+ RG11_EAC_UNorm = 0x9272, // GL_COMPRESSED_RG11_EAC
+ RG11_EAC_SNorm = 0x9273, // GL_COMPRESSED_SIGNED_RG11_EAC
+ RGB8_ETC2 = 0x9274, // GL_COMPRESSED_RGB8_ETC2
+ SRGB8_ETC2 = 0x9275, // GL_COMPRESSED_SRGB8_ETC2
+ RGB8_PunchThrough_Alpha1_ETC2 = 0x9276, // GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
+ SRGB8_PunchThrough_Alpha1_ETC2 = 0x9277, // GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
+ RGBA8_ETC2_EAC = 0x9278, // GL_COMPRESSED_RGBA8_ETC2_EAC
+ SRGB8_Alpha8_ETC2_EAC = 0x9279, // GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
+ RGB8_ETC1 = 0x8D64, // GL_ETC1_RGB8_OES
// sRGB formats
SRGB8 = 0x8C41, // GL_SRGB8
diff --git a/src/render/frontend/qgeometry.h b/src/render/frontend/qgeometry.h
index 59c957d..5578f41 100644
--- a/src/render/frontend/qgeometry.h
+++ b/src/render/frontend/qgeometry.h
@@ -69,6 +69,7 @@ Q_SIGNALS:
void verticesPerPatchChanged();
protected:
+ QGeometry(QGeometryPrivate &dd, QNode *parent = 0);
void copy(const QNode *ref) Q_DECL_OVERRIDE;
private:
diff --git a/src/render/io/texturedata.h b/src/render/io/texturedata.h
index a403b0e..427453d 100644
--- a/src/render/io/texturedata.h
+++ b/src/render/io/texturedata.h
@@ -67,7 +67,8 @@ public:
void setData(const QByteArray &data,
QOpenGLTexture::PixelFormat fmt,
QOpenGLTexture::PixelType ptype);
- void setCompressedData(QByteArray data, QOpenGLTexture::PixelFormat fmt);
+
+ bool setCompressedFile(const QString &source);
QByteArray data() const
{ return m_data; }
INFO - New header: src/render/frontend/qcylindergeometry.h
/****************************************************************************
**
** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt3D module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later 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 2.0 requirements will be
** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QT3D_QCYLINDERGEOMETRY_H
#define QT3D_QCYLINDERGEOMETRY_H
#include <Qt3DRenderer/qt3drenderer_global.h>
#include <Qt3DRenderer/qgeometry.h>
QT_BEGIN_NAMESPACE
namespace Qt3D {
class QCylinderGeometryPrivate;
class QT3DRENDERERSHARED_EXPORT QCylinderGeometry : public QGeometry
{
Q_OBJECT
Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
Q_PROPERTY(int slices READ slices WRITE setSlices NOTIFY slicesChanged)
Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)
public:
explicit QCylinderGeometry(QNode *parent = 0);
~QCylinderGeometry();
void updateVertices();
void updateIndices();
void setRings(int rings);
void setSlices(int slices);
void setRadius(float radius);
void setLength(float length);
int rings() const;
int slices() const;
float radius() const;
float length() const;
Q_SIGNALS:
void radiusChanged();
void ringsChanged();
void slicesChanged();
void lengthChanged();
protected:
QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = 0);
private:
Q_DECLARE_PRIVATE(QCylinderGeometry)
QT3D_CLONEABLE(QCylinderGeometry)
};
} // namespace Qt3D
QT_END_NAMESPACE
#endif // QT3D_QCYLINDERGEOMETRY_H
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
