feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update three.js in Canvas3D project template

Browse Source 
Change-Id: I33d97c830d5bb63e75e1e17d908756bbc664747e
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Miikka Heikkinen
2015-09-03 11:21:56 +03:00
parent 9c9dbe3c53
commit 2a2902dedb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/3rdparty/three.js vendored
View File

@@ -25,8 +25,9 @@ THE SOFTWARE.
*/ */
/** /**
* QtQuick port of three.js library https://github.com/mrdoob/three.js * QtQuick port of three.js library from: https://github.com/mrdoob/three.js
* Port source code is available at https://github.com/tronlec/three.js * Latest version for current stable Qt version can be found at: https://github.com/tronlec/three.js/tree/stable
* Latest version for current Qt version under development can be found at: https://github.com/tronlec/three.js/tree/master
* @author Pasi keränen / pasi.keranen@theqtcompany.com * @author Pasi keränen / pasi.keranen@theqtcompany.com
*/ */
@@ -34554,7 +34555,7 @@ THREE.Canvas3DRenderer = function ( parameters ) {
this.uploadTexture = function ( texture ) { this.uploadTexture = function ( texture ) {
if ( texture instanceof THREE.QuickItemTexture ) { if ( texture instanceof THREE.QtQuickItemTexture ) {
var canvasTextureProvider = _gl.getExtension("QTCANVAS3D_texture_provider"); var canvasTextureProvider = _gl.getExtension("QTCANVAS3D_texture_provider");
@@ -35324,13 +35325,13 @@ THREE.Canvas3DRenderer = function ( parameters ) {
}; };
// File:src/qml/QuickItemTexture.js // File:src/qml/QtQuickItemTexture.js
/** /**
* @author miheikki / miikka.heikkinen@theqtcompany.com * @author miheikki / miikka.heikkinen@theqtcompany.com
*/ */
THREE.QuickItemTexture = function ( quickItem, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy ) { THREE.QtQuickItemTexture = function ( quickItem, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy ) {
THREE.Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy ); THREE.Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy );
@@ -35341,6 +35342,6 @@ THREE.QuickItemTexture = function ( quickItem, mapping, wrapS, wrapT, magFilter,
}; };
THREE.QuickItemTexture.prototype = Object.create( THREE.Texture.prototype ); THREE.QtQuickItemTexture.prototype = Object.create( THREE.Texture.prototype );
THREE.QuickItemTexture.prototype.constructor = THREE.QuickItemTexture; THREE.QtQuickItemTexture.prototype.constructor = THREE.QtQuickItemTexture;