Changeset 846 for trunk/doc/src/examples/hellogl_es.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/examples/hellogl_es.qdoc (modified) (3 diffs)

trunk/doc/src/examples/hellogl_es.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
-** 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.
-**
-** 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.
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact
@@ -64 +50 @@
     the OpenGL ES window within the native window manager. In
     QGLWidget::initializeGL() we initialize OpenGL ES.
-
-    \section1 Using OpenGL ES rendering commands
-
-    To update the scene, we reimplment QGLWidget::paintGL(). We use OpenGL ES
-    rendering commands just like we do with standard OpenGL. Since the OpenGL
-    ES common light profile only supports fixed point functions, we need to
-    abstract it somehow. Hence, we define an abstraction layer in
-    \c{cl_helper.h}.
-
-    \snippet examples/opengl/hellogl_es/cl_helper.h 0
-
-    Instead of \c glFogxv() or \c glFogfv() we use \c q_glFogv() and to
-    convert the coordinates of a vertice we use the macro \c f2vt(). That way,
-    if QT_OPENGL_ES_CL is defined we use the fixed point functions and every
-    float is converted to fixed point.
-
-    If QT_OPENGL_ES_CL is not defined we use the floating point functions.
-
-    \snippet examples/opengl/hellogl_es/cl_helper.h 1
-
-    This way we support OpenGL ES Common and Common Light with the same code
-    and abstract the fact that we use either the floating point functions or
-    otherwise the fixed point functions.
 
     \section1 Porting OpenGL to OpenGL ES