diff --git a/.clang-format b/.clang-format
index 4ffb182c0fb8f021a6b1f31aee4b7f1b34608f63..2aaf0e39557ece48add0ffeb74722b3f42ec8026 100644
--- a/.clang-format
+++ b/.clang-format
@@ -77,8 +77,6 @@ IncludeCategories:
Priority: 11
- Regex: '^"gpu/'
Priority: 12
- - Regex: '^"gui/'
- Priority: 12
- Regex: '^"lbm/'
Priority: 13
- Regex: '^"lbm_mesapd_coupling/'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3918112bbc1acfab3b974399bab35b2b506b92e..f45deb9a889c97fade978ce159e4d294198d2454 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,6 @@ stages:
-DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
-DWALBERLA_BUILD_WITH_FFTW=$WALBERLA_BUILD_WITH_FFTW
-DWALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT=$WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT
- -DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
-DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
-DWALBERLA_STL_BOUNDS_CHECKS=$WALBERLA_STL_BOUNDS_CHECKS
-DWALBERLA_LOGLEVEL=$WALBERLA_LOGLEVEL
@@ -78,7 +77,6 @@ stages:
WALBERLA_BUILD_WITH_METIS: "ON"
WALBERLA_BUILD_WITH_PARMETIS: "ON"
WALBERLA_BUILD_WITH_FFTW: "ON"
- WALBERLA_ENABLE_GUI: "OFF"
WALBERLA_LOGLEVEL: "DETAIL"
WARNING_ERROR: "ON"
artifacts:
@@ -2058,7 +2056,7 @@ cppcheck:
image: i10git.cs.fau.de:5005/walberla/buildenvs/cppcheck
script:
- cppcheck --version
- - cppcheck . --max-configs=10 --enable=warning --enable=style --enable=performance --enable=portability -i src/gui/extern -i src/geometry/structured/extern -i sqlite3.c -i StackWalker.cpp -I src/ -I tests/ -I apps/ -D WALBERLA_BUILD_WITH_MPI -D WALBERLA_BUILD_WITH_METIS -D WALBERLA_BUILD_WITH_PYTHON --xml 2> report.xml
+ - cppcheck . --max-configs=10 --enable=warning --enable=style --enable=performance --enable=portability -i src/geometry/structured/extern -i sqlite3.c -i StackWalker.cpp -I src/ -I tests/ -I apps/ -D WALBERLA_BUILD_WITH_MPI -D WALBERLA_BUILD_WITH_METIS -D WALBERLA_BUILD_WITH_PYTHON --xml 2> report.xml
- cppcheck-htmlreport --file=report.xml --report-dir=html_report --source-dir=.
artifacts:
untracked: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fa4614abdc44ce8c7c57167d0f25c71b5deb855..0e5badc0fd38f5192d78e091455140ad1c0ad959 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,6 @@ include( CTest )
# Build options
option ( WALBERLA_DOUBLE_ACCURACY "Floating point accuracy, defaults to double" ON )
-option ( WALBERLA_ENABLE_GUI "Compile with GUI" )
option ( WALBERLA_BUILD_TESTS "Build Testcases" ON )
option ( WALBERLA_BUILD_BENCHMARKS "Build Benchmarks" ON )
@@ -831,29 +830,6 @@ endif()
-############################################################################################################################
-##
-## Qt
-##
-############################################################################################################################
-option (WALBERLA_ENABLE_GUI "This flag builds the graphical user interface, depends on Qt Libraries")
-
-if ( WALBERLA_ENABLE_GUI )
-
- message( WARNING "The GUI is deprecated and will probably not work correctly." )
- find_package( Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml REQUIRED )
- set( OpenGL_GL_PREFERENCE LEGACY )
- find_package( OpenGL REQUIRED )
-
- INCLUDE( ${QT_USE_FILE} )
- list ( APPEND SERVICE_LIBS ${OPENGL_LIBRARIES} ${QT_LIBRARIES} )
-
-endif(WALBERLA_ENABLE_GUI)
-
-############################################################################################################################
-
-
-
############################################################################################################################
##
## METIS
diff --git a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
index bb199b8fb23a5bfd3eb0cd29f73a504f00fbe1ff..14aaa76e74fa8ba909f6a5bafdd7bf4a5c87e55b 100644
--- a/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
+++ b/apps/benchmarks/PhaseFieldAllenCahn/CMakeLists.txt
@@ -15,10 +15,10 @@ waLBerla_generate_target_from_python(NAME BenchmarkPhaseFieldCodeGen
if (WALBERLA_BUILD_WITH_GPU_SUPPORT )
waLBerla_add_executable(NAME benchmark_multiphase
FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py
- DEPENDS blockforest core gpu field postprocessing python_coupling lbm_generated geometry timeloop gui BenchmarkPhaseFieldCodeGen)
+ DEPENDS blockforest core gpu field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen)
else ()
waLBerla_add_executable(NAME benchmark_multiphase
FILES benchmark_multiphase.cpp InitializerFunctions.cpp multiphase_codegen.py
- DEPENDS blockforest core field postprocessing python_coupling lbm_generated geometry timeloop gui BenchmarkPhaseFieldCodeGen)
+ DEPENDS blockforest core field postprocessing python_coupling lbm_generated geometry timeloop BenchmarkPhaseFieldCodeGen)
endif (WALBERLA_BUILD_WITH_GPU_SUPPORT )
diff --git a/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.prm b/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.prm
index 3ef98e079053e48b38a698729785f7521dffb094..0c1c374b4b81ab73b4bb5af1f01a54434e5d5291 100644
--- a/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.prm
+++ b/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.prm
@@ -26,7 +26,6 @@ Parameters
omega 1.92;
initShearFlow 1;
- useGui 0;
}
/*
diff --git a/apps/tutorials/basics/01_BlocksAndFields.cpp b/apps/tutorials/basics/01_BlocksAndFields.cpp
index 670d557d634480a5203fdc46a8fd0cbf21c3e6dd..5f209feeefa2d92b8e46082564e2ae598098c008 100644
--- a/apps/tutorials/basics/01_BlocksAndFields.cpp
+++ b/apps/tutorials/basics/01_BlocksAndFields.cpp
@@ -21,8 +21,8 @@
#include "blockforest/Initialization.h"
#include "core/Environment.h"
#include "field/Field.h"
-#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
+#include "vtk/all.h"
namespace walberla {
@@ -43,13 +43,13 @@ int main( int argc, char ** argv )
real_c(0.5),
false,
false, false, false);
-
+ vtk::writeDomainDecomposition(blocks);
+
blocks->addStructuredBlockData< Field<real_t,1> >( &createFields, "My Field" );
SweepTimeloop timeloop( blocks, uint_c(1) );
- GUI gui( timeloop, blocks, argc, argv );
- gui.run();
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/basics/01_BlocksAndFields.dox b/apps/tutorials/basics/01_BlocksAndFields.dox
index 4feaf75a4ed7f104ad0f37514bddbe5b0d0a5c1a..7987acc835098cf79f8872355db4a501237b1a25 100644
--- a/apps/tutorials/basics/01_BlocksAndFields.dox
+++ b/apps/tutorials/basics/01_BlocksAndFields.dox
@@ -88,33 +88,25 @@ is a good idea.
\section tut01_vis Visualizing the Setup
-In order to visualize the domain, we can use the graphical user interface (GUI) module of waLBerla. Since this module depends on the Qt Library, one has to
-explicitly enable the module before compiling waLBerla. This is done by setting the CMake Option WALBERLA_ENABLE_GUI.
+In order to visualize the domain, we will export it to a VTK file, which can then be inspected using tools
+like ParaView.
-We have to add two more includes to our file, one for the GUI module and one for the time loop, which is used by the GUI.
+We have to add one more include to our file for the time loop.
A detailed description of the time loop follows in the next tutorial.
\code
-#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
\endcode
-In the main function we first create a time loop object, which we pass to the GUI:
+In the main function we first create a time loop object, which we run:
\code
// blockforest::createUniformBlockGrid(...)
SweepTimeloop timeloop( blocks, uint_c(1) );
-GUI gui( timeloop, blocks, argc, argv );
-gui.run();
+timeloop.run();
\endcode
-When you run the program now, a window should open showing the domain consisting of blocks:
-
-\image html tutorial_basics01_blocks.jpeg
-
-If no window opens, the GUI was probably not compiled. Make sure that WALBERLA_ENABLE_GUI is enabled and Qt was found.
-
\section tut01_fields Storing Data on a Block
So far, we have partitioned our domain into blocks. The next step is to allocate data on these blocks.
@@ -163,14 +155,9 @@ The callback function can now be registered at the block storage with the follow
// add a field to all blocks
blocks->addStructuredBlockData< Field<real_t,1> >( &createFields, "My Field" );
-// time loop and GUI...
+// time loop ...
\endcode
-In order to view the field in the GUI, click on "New Grid View" and drag a block into the window. The "Grid View Properties"
-dock widget can then be used to display slices of the field.
-
-\image html tutorial_basics01_field.jpeg
-
The next tutorial contains the writing of algorithms operating on block data: \ref tutorial_basics_02
\tableofcontents
diff --git a/apps/tutorials/basics/02_Sweeps.cpp b/apps/tutorials/basics/02_Sweeps.cpp
index 24bdffce6fed3de325e6dbd50cad52043049907a..85fc3e69d32f26e9fe512a137b046dc73c0ff20f 100644
--- a/apps/tutorials/basics/02_Sweeps.cpp
+++ b/apps/tutorials/basics/02_Sweeps.cpp
@@ -21,8 +21,9 @@
#include "blockforest/Initialization.h"
#include "core/Environment.h"
#include "field/Field.h"
-#include "gui/Gui.h"
+#include "field/vtk/VTKWriter.h"
#include "timeloop/SweepTimeloop.h"
+#include "vtk/all.h"
#include <functional>
@@ -120,7 +121,7 @@ int main( int argc, char ** argv )
}
// create time loop
- const uint_t numberOfTimesteps = uint_c(10); // number of time steps for non-gui runs
+ const uint_t numberOfTimesteps = uint_c(10); // number of time steps
SweepTimeloop timeloop( blocks, numberOfTimesteps );
// registering the function sweep
@@ -131,10 +132,15 @@ int main( int argc, char ** argv )
// registering the class sweep
timeloop.add() << Sweep( SimpleSweep(fieldID), "BogusAlgorithmButNowAsFunctor" );
- // two sweeps were registered, so both are executed in each time step
+ // Create vtk output object, a dataWriter and write the output
+ vtk::writeDomainDecomposition(blocks);
+ auto vtkOutput = vtk::createVTKOutput_BlockData(*blocks);
+ auto dataWriter = make_shared< field::VTKWriter< Field< real_t, 1 > > >(fieldID, "field");
+ vtkOutput->addCellDataWriter(dataWriter);
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(vtkOutput), "VTK Output");
- GUI gui( timeloop, blocks, argc, argv );
- gui.run();
+ // two sweeps were registered, so both are executed in each time step
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/basics/02_Sweeps.dox b/apps/tutorials/basics/02_Sweeps.dox
index 138ed0e448aa00434e3e70dfd3febcb7ac5c0724..3ba1b603d5a1ef9dfbd681a42082cdc1b137c9f0 100644
--- a/apps/tutorials/basics/02_Sweeps.dox
+++ b/apps/tutorials/basics/02_Sweeps.dox
@@ -95,7 +95,7 @@ So far, we know how to access blocks and the data stored on them. Hence, we coul
an algorithm without using the sweep concept or the provided time loop classes.
However, if you use the time loop classes you obtain additional features like the sweep/data selection per
-block (explained in a later tutorial), automatic time measurement, or time loop control from the GUI.
+block (explained in a later tutorial), or automatic time measurement.
So let us start with writing our first sweep. A sweep function is a simple function that takes
as its only argument an IBlock pointer.
diff --git a/apps/tutorials/basics/03_GameOfLife.cpp b/apps/tutorials/basics/03_GameOfLife.cpp
index 780f053ba382d82f428ee013264aa75fe4a87f51..b98a5d7836d8856a56da4d6b51468c36c9ff08bf 100644
--- a/apps/tutorials/basics/03_GameOfLife.cpp
+++ b/apps/tutorials/basics/03_GameOfLife.cpp
@@ -26,16 +26,17 @@
#include "field/AddToStorage.h"
#include "field/communication/PackInfo.h"
+#include "field/vtk/VTKWriter.h"
#include "geometry/initializer/ScalarFieldFromGrayScaleImage.h"
#include "geometry/structured/GrayScaleImage.h"
-#include "gui/Gui.h"
-
#include "stencil/D2Q9.h"
#include "timeloop/SweepTimeloop.h"
+#include "vtk/all.h"
+
namespace walberla {
@@ -205,15 +206,21 @@ int main( int argc, char ** argv )
fieldInitializer.init( image, uint_c(2), false );
// create time loop
- const uint_t numberOfTimesteps = uint_c(10); // number of timesteps for non-gui runs
+ const uint_t numberOfTimesteps = uint_c(10); // number of timesteps
SweepTimeloop timeloop( blocks, numberOfTimesteps );
// registering the sweep
timeloop.add() << BeforeFunction( myCommScheme, "Communication" )
<< Sweep( GameOfLifeSweep(fieldID), "GameOfLifeSweep" );
- GUI gui ( timeloop, blocks, argc, argv );
- gui.run();
+ // Create vtk output object, a dataWriter and write the output
+ vtk::writeDomainDecomposition(blocks);
+ auto vtkOutput = vtk::createVTKOutput_BlockData(*blocks);
+ auto dataWriter = make_shared< field::VTKWriter< Field< real_t, 1 > > >(fieldID, "field");
+ vtkOutput->addCellDataWriter(dataWriter);
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(vtkOutput), "VTK Output");
+
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/basics/CMakeLists.txt b/apps/tutorials/basics/CMakeLists.txt
index cd734965d2c9cde8b11c76622ada116ed43983c7..e417b95163d0f2d3d1e33da3761e54598db9d66e 100644
--- a/apps/tutorials/basics/CMakeLists.txt
+++ b/apps/tutorials/basics/CMakeLists.txt
@@ -3,13 +3,13 @@ waLBerla_link_files_to_builddir( *.png )
waLBerla_add_executable ( NAME 01_Tutorial_BlocksAndFields1
FILES 01_BlocksAndFields.cpp
- DEPENDS blockforest core field timeloop gui )
+ DEPENDS blockforest core field timeloop )
waLBerla_add_executable ( NAME 02_Tutorial_Sweeps
FILES 02_Sweeps.cpp
- DEPENDS blockforest core field timeloop gui )
+ DEPENDS blockforest core field timeloop )
waLBerla_add_executable ( NAME 03_Tutorial_GameOfLife
FILES 03_GameOfLife.cpp
- DEPENDS blockforest core field geometry timeloop gui )
+ DEPENDS blockforest core field geometry timeloop )
diff --git a/apps/tutorials/gpu/01_GameOfLife_cuda.cpp b/apps/tutorials/gpu/01_GameOfLife_cuda.cpp
index 2cfc8b30b94e1bad57508d23f5a672de7ccc8df5..4ce33898c900a26962fff3a042f04260f26c6252 100644
--- a/apps/tutorials/gpu/01_GameOfLife_cuda.cpp
+++ b/apps/tutorials/gpu/01_GameOfLife_cuda.cpp
@@ -80,7 +80,7 @@ int main( int argc, char ** argv )
commScheme.addPackInfo( make_shared<Packing>(gpuFieldSrcID) );
// Create Timeloop
- const uint_t numberOfTimesteps = uint_t(101); // number of timesteps for non-gui runs
+ const uint_t numberOfTimesteps = uint_t(101); // number of timesteps
SweepTimeloop timeloop ( blocks, numberOfTimesteps );
// Registering the sweep
diff --git a/apps/tutorials/lbm/01_BasicLBM.cpp b/apps/tutorials/lbm/01_BasicLBM.cpp
index 6c1d920e9c046c0c9f0d93fd87422dc5c0406165..d9b0566057bb1af4b2715cd8db503eef0a5db9c1 100644
--- a/apps/tutorials/lbm/01_BasicLBM.cpp
+++ b/apps/tutorials/lbm/01_BasicLBM.cpp
@@ -25,7 +25,6 @@
#include "domain_decomposition/all.h"
#include "field/all.h"
#include "geometry/all.h"
-#include "gui/all.h"
#include "lbm/all.h"
#include "timeloop/all.h"
@@ -104,20 +103,7 @@ int main( int argc, char ** argv )
// add VTK output to time loop
lbm::VTKOutput< LatticeModel_T, FlagField_T >::addToTimeloop( timeloop, blocks, walberlaEnv.config(), pdfFieldId, flagFieldId, fluidFlagUID );
- // create adaptors, so that the GUI also displays density and velocity
- // adaptors are like fields with the difference that they do not store values
- // but calculate the values based on other fields ( here the PdfField )
- field::addFieldAdaptor<lbm::Adaptor<LatticeModel_T>::Density> ( blocks, pdfFieldId, "DensityAdaptor" );
- field::addFieldAdaptor<lbm::Adaptor<LatticeModel_T>::VelocityVector>( blocks, pdfFieldId, "VelocityAdaptor" );
-
- if( parameters.getParameter<bool>( "useGui", false ) )
- {
- GUI gui ( timeloop, blocks, argc, argv );
- lbm::connectToGui<LatticeModel_T> ( gui );
- gui.run();
- }
- else
- timeloop.run();
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/lbm/01_BasicLBM.dox b/apps/tutorials/lbm/01_BasicLBM.dox
index 4bbeaaed4a96f5ffc3b1b47af29bcabe474462a4..f0aaf79ca4226d544c2317d5453ca3165cf79845 100644
--- a/apps/tutorials/lbm/01_BasicLBM.dox
+++ b/apps/tutorials/lbm/01_BasicLBM.dox
@@ -292,7 +292,7 @@ lbm::VTKOutput< LatticeModel_T, FlagField_T >::addToTimeloop( timeloop, blocks,
In order to know how to use the `VTK` block in the configuration file for setting up VTK output, please have a look
at: \ref docVTKConfigurationFile
-Finally, the simulation is run by either calling the "run" function of the time loop or using the GUI.
+Finally, the simulation is run by calling the "run" function of the time loop.
Now you can build the tutorial application, play around with the configuration file, and try loading different obstacles.
diff --git a/apps/tutorials/lbm/01_BasicLBM.prm b/apps/tutorials/lbm/01_BasicLBM.prm
index 15efce2094b505f5063d99fe84e62847161c9db7..2433f298678e89383d557f0681ca48581f92f0b3 100644
--- a/apps/tutorials/lbm/01_BasicLBM.prm
+++ b/apps/tutorials/lbm/01_BasicLBM.prm
@@ -5,7 +5,6 @@ Parameters
initialVelocity < 0.1, 0, 0 >;
timesteps 10000;
- useGui 1;
remainingTimeLoggerFrequency 3; // in seconds
}
diff --git a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
index 3476c73d0e2b9613e09de513d7b33891aa832908..17941bc322dd18ee9c4bd8bacc3ef750247dcba9 100644
--- a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
+++ b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
@@ -24,7 +24,6 @@
#include "blockforest/all.h"
#include "field/all.h"
#include "geometry/all.h"
-#include "gui/all.h"
#include "lbm/all.h"
#include "timeloop/all.h"
@@ -621,21 +620,7 @@ int main( int argc, char ** argv )
// add VTK output to time loop
lbm::VTKOutput< LatticeModel_T, FlagField_T >::addToTimeloop( timeloop, blocks, walberlaEnv.config(), pdfFieldId, flagFieldId, fluidFlagUID );
-
- // create adaptors, so that the GUI also displays density and velocity
- // adaptors are like fields with the difference that they do not store values
- // but calculate the values based on other fields ( here the PdfField )
- field::addFieldAdaptor<lbm::Adaptor<LatticeModel_T>::Density> ( blocks, pdfFieldId, "DensityAdaptor" );
- field::addFieldAdaptor<lbm::Adaptor<LatticeModel_T>::VelocityVector>( blocks, pdfFieldId, "VelocityAdaptor" );
-
- if ( parameters.getParameter<bool>( "useGui", false ) )
- {
- GUI gui ( timeloop, blocks, argc, argv );
- lbm::connectToGui<LatticeModel_T> ( gui );
- gui.run();
- }
- else
- timeloop.run();
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/lbm/04_LBComplexGeometry.cpp b/apps/tutorials/lbm/04_LBComplexGeometry.cpp
index 6148efcc4ecde851cf742863b1299bd9a7247f84..bd3cd4edf0a6a01717f835c3f45ab80976688cea 100644
--- a/apps/tutorials/lbm/04_LBComplexGeometry.cpp
+++ b/apps/tutorials/lbm/04_LBComplexGeometry.cpp
@@ -29,8 +29,6 @@
#include "geometry/all.h"
-#include "gui/all.h"
-
#include "lbm/all.h"
#include "mesh_common/DistanceComputations.h"
@@ -307,24 +305,7 @@ int main(int argc, char** argv)
timeloop.addFuncAfterTimeStep(vtk::writeFiles(vtkOutput), "VTK Output");
- // create adaptors, so that the GUI also displays density and velocity
- // adaptors are like fields with the difference that they do not store values
- // but calculate the values based on other fields ( here the PdfField )
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::Density >(blocks, pdfFieldId, "DensityAdaptor");
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::VelocityVector >(blocks, pdfFieldId, "VelocityAdaptor");
-
- //////////////////////
- /// RUN SIMULATION ///
- //////////////////////
-
- if (parameters.getParameter< bool >("useGui", false))
- {
- GUI gui(timeloop, blocks, argc, argv);
- lbm::connectToGui< LatticeModel_T >(gui);
- gui.run();
- }
- else
- timeloop.run();
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/lbm/04_LBComplexGeometry.prm b/apps/tutorials/lbm/04_LBComplexGeometry.prm
index 5509aa3a81a44a4594b3894804639486aa47c979..6dc9acb5d81c96003c796f51ec9256bc13e44e99 100644
--- a/apps/tutorials/lbm/04_LBComplexGeometry.prm
+++ b/apps/tutorials/lbm/04_LBComplexGeometry.prm
@@ -5,7 +5,6 @@ Parameters
initialVelocity < 0.1, 0, 0 >;
timesteps 5000;
- useGui 0;
remainingTimeLoggerFrequency 3; // in seconds
}
diff --git a/apps/tutorials/lbm/06_LBBoundaryCondition.cpp b/apps/tutorials/lbm/06_LBBoundaryCondition.cpp
index 8d095d222eda3a4e3822ae147d74d020b214ad6f..9b215a0e9ca13c5a91b0b67486c2efe151b79a16 100644
--- a/apps/tutorials/lbm/06_LBBoundaryCondition.cpp
+++ b/apps/tutorials/lbm/06_LBBoundaryCondition.cpp
@@ -28,8 +28,6 @@
#include "geometry/all.h"
-#include "gui/all.h"
-
#include "lbm/all.h"
#include "timeloop/all.h"
@@ -467,22 +465,7 @@ int main(int argc, char** argv)
timeloop.addFuncAfterTimeStep(vtk::writeFiles(vtkOutput), "VTKOutput");
- // create adaptors, so that the GUI also displays density and velocity
- // adaptors are like fields with the difference that they do not store values
- // but calculate the values based on other fields ( here the PdfField )
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::Density >(blocks, pdfFieldID, "DensityAdaptor");
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::VelocityVector >(blocks, pdfFieldID, "VelocityAdaptor");
-
- if (parameters.getParameter< bool >("useGui", false))
- {
- GUI gui(timeloop, blocks, argc, argv);
- lbm::connectToGui< LatticeModel_T >(gui);
- gui.run();
- }
- else
- {
- timeloop.run();
- }
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/apps/tutorials/lbm/06_LBBoundaryCondition.prm b/apps/tutorials/lbm/06_LBBoundaryCondition.prm
index b5c96a99d9736258fbff11ae5596ad540131f243..5e64bcf3c4c30be715ecbf6c2d269d7e9a80225a 100644
--- a/apps/tutorials/lbm/06_LBBoundaryCondition.prm
+++ b/apps/tutorials/lbm/06_LBBoundaryCondition.prm
@@ -4,7 +4,6 @@ Parameters
initialVelocity < 0.0, 0, 0 >;
timesteps 5000;
- useGui 0;
remainingTimeLoggerFrequency 3; // in seconds
}
diff --git a/apps/tutorials/lbm/CMakeLists.txt b/apps/tutorials/lbm/CMakeLists.txt
index f54756798e3be281ba50e08159377b24065bb980..fd200aebb4ceb7fd928e3eb6fded6b3436a39e81 100644
--- a/apps/tutorials/lbm/CMakeLists.txt
+++ b/apps/tutorials/lbm/CMakeLists.txt
@@ -3,11 +3,11 @@ waLBerla_link_files_to_builddir( *.png )
waLBerla_add_executable ( NAME 01_BasicLBM
FILES 01_BasicLBM.cpp
- DEPENDS blockforest core field lbm geometry timeloop gui )
+ DEPENDS blockforest core field lbm geometry timeloop )
waLBerla_add_executable ( NAME 02_BasicLBM_ExemplaryExtensions
FILES 02_BasicLBM_ExemplaryExtensions.cpp
- DEPENDS blockforest core field lbm geometry timeloop gui )
+ DEPENDS blockforest core field lbm geometry timeloop )
waLBerla_add_executable ( NAME 03_LBLidDrivenCavity
FILES 03_LBLidDrivenCavity.cpp
diff --git a/apps/tutorials/pde/01_SolvingPDE.cpp b/apps/tutorials/pde/01_SolvingPDE.cpp
index f0f996817e60baecd5b9e1b4a8a932987c07c754..0a058def9918537181fc9e79ec9de54a8b8bf91a 100644
--- a/apps/tutorials/pde/01_SolvingPDE.cpp
+++ b/apps/tutorials/pde/01_SolvingPDE.cpp
@@ -27,12 +27,14 @@
#include "field/Field.h"
#include "field/AddToStorage.h"
#include "field/communication/PackInfo.h"
+#include "field/vtk/VTKWriter.h"
#include "stencil/D2Q5.h"
-#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
+#include "vtk/all.h"
+
#include <cmath>
#include <vector>
@@ -291,9 +293,14 @@ int main( int argc, char ** argv )
timeloop.add() << BeforeFunction( myCommScheme, "Communication" )
<< Sweep( JacobiSweepStencil( srcID, dstID, rhsID, weights ), "JacobiSweepStencil" );
- // start the GUI and run the simulation
- GUI gui ( timeloop, blocks, argc, argv );
- gui.run();
+ // Create vtk output object, a dataWriter and write the output
+ vtk::writeDomainDecomposition(blocks);
+ auto vtkOutput = vtk::createVTKOutput_BlockData(*blocks);
+ auto dataWriter = make_shared< field::VTKWriter< Field< real_t, 1 > > >(srcID, "field");
+ vtkOutput->addCellDataWriter(dataWriter);
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(vtkOutput), "VTK Output");
+
+ timeloop.run();
return 0;
}
diff --git a/apps/tutorials/pde/01_SolvingPDE.dox b/apps/tutorials/pde/01_SolvingPDE.dox
index 7fecad56d109b8d5c64a5844ad5f7184d4d51db2..b74d14a3b2240453de2ad2139a6dfe3473becdd7 100644
--- a/apps/tutorials/pde/01_SolvingPDE.dox
+++ b/apps/tutorials/pde/01_SolvingPDE.dox
@@ -291,9 +291,6 @@ shared_ptr< StructuredBlockForest > blocks = blockforest::createUniformBlockGrid
Putting everything together, setting up the communication scheme for the D2Q5 stencil and adding everything to the time loop,
as known from the basic tutorials, the simulation can be carried out.
-Using the GUI, the converged profile looks like:
-
-\image html tutorial_pde01_solution.png
In the next tutorial of the PDE section, \ref tutorial_pde02, the Jacobi method is used to solve the linear system of equations arising from an implicit time-stepping method
for the solution of the famous heat equation.
diff --git a/apps/tutorials/pde/02_HeatEquation.cpp b/apps/tutorials/pde/02_HeatEquation.cpp
index 398b9a66cf05835b2b0b9a7ac92cc433ca25696b..6c22dadb2250cb21192000650207ebdd03cc7bcc 100644
--- a/apps/tutorials/pde/02_HeatEquation.cpp
+++ b/apps/tutorials/pde/02_HeatEquation.cpp
@@ -32,7 +32,6 @@
#include "stencil/D2Q5.h"
-#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
#include "vtk/VTKOutput.h"
@@ -245,9 +244,7 @@ int main( int argc, char ** argv )
// This can not be done as a sweep since it includes an interior iteration, independent of the time loop.
timeloop.addFuncAfterTimeStep( JacobiIteration( srcID, dstID, rhsID, weights, blocks, myCommScheme, uint_c(10000) ), "JacobiIteration");
- // start the GUI and run the simulation
- GUI gui ( timeloop, blocks, argc, argv );
- gui.run();
+ timeloop.run();
return 0;
}
diff --git a/apps/tutorials/pde/02_HeatEquation.dox b/apps/tutorials/pde/02_HeatEquation.dox
index bdecf8bea6178db801e8f7d853c4149a20617d23..8bc5f122aa4d845e1d0730ad26302fb628e59ac6 100644
--- a/apps/tutorials/pde/02_HeatEquation.dox
+++ b/apps/tutorials/pde/02_HeatEquation.dox
@@ -176,7 +176,6 @@ This is similar to what was done in the previous tutorial for the right-hand sid
With this, all parts are present and the simulation can be started.
-When inspecting the results in the GUI using the color representation of the `src` field, you will see.... no changes.
No worries, everything we did was correct but the color gets automatically scaled in each time step.
Since the initial profile just shrinks over time, the results will always look the same.
When you use the numeric representation, you will actually see changes in the values, which get smaller from one time step to the next one.
@@ -206,7 +205,7 @@ As arguments, the field we want to output together with the block structure and
The fourth argument specifies the write frequency where the value 1 denotes that we want to have an output after every time step.
The number of ghost layers that are written can be specified by the fifth argument, where in our case we only have one and output it.
-To start the simulation without the GUI, we simply write:
+To start the simulation, we simply write:
\code
// run the simulation for the specified number of time steps
timeloop.run();
diff --git a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
index e3b521447b5bcba08f18459d121acddbb02d4151..8c7d79a05b50fcb25babd2a91dd5e5574d77f1ab 100644
--- a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
+++ b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
@@ -33,7 +33,6 @@
#include "stencil/D2Q5.h"
#include "stencil/D2Q9.h"
-#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
#include "vtk/VTKOutput.h"
diff --git a/apps/tutorials/pde/CMakeLists.txt b/apps/tutorials/pde/CMakeLists.txt
index b7ae15744f1bc1aa5bde74bfa7d25d0587d661ac..b0b4514a56349056da05eacfa1b16b9b6e63139d 100644
--- a/apps/tutorials/pde/CMakeLists.txt
+++ b/apps/tutorials/pde/CMakeLists.txt
@@ -4,13 +4,13 @@ waLBerla_link_files_to_builddir( *.png )
waLBerla_add_executable ( NAME 01_SolvingPDE
FILES 01_SolvingPDE.cpp
- DEPENDS blockforest core field stencil timeloop gui )
+ DEPENDS blockforest core field stencil timeloop )
waLBerla_add_executable ( NAME 02_HeatEquation
FILES 02_HeatEquation.cpp
- DEPENDS blockforest core field stencil timeloop gui )
+ DEPENDS blockforest core field stencil timeloop )
waLBerla_add_executable ( NAME 03_HeatEquation_Extensions
FILES 03_HeatEquation_Extensions.cpp
- DEPENDS blockforest core field stencil timeloop gui vtk )
+ DEPENDS blockforest core field stencil timeloop vtk )
\ No newline at end of file
diff --git a/doc/doxygen_for_1.8.4.in b/doc/doxygen_for_1.8.4.in
index fe4995e528988e4bdcb47bd253cb80bfaacf40bb..ced2e948b116d1979ffe6ce98e8539a17dff1010 100644
--- a/doc/doxygen_for_1.8.4.in
+++ b/doc/doxygen_for_1.8.4.in
@@ -714,7 +714,6 @@ RECURSIVE = YES
EXCLUDE = @walberla_SOURCE_DIR@/src/openCL/CL/cl.hpp \
@walberla_SOURCE_DIR@/src/openCL/cl.hpp \
- @walberla_SOURCE_DIR@/src/gui/extern \
@walberla_SOURCE_DIR@/src/blockforest/metis
diff --git a/doc/setup.dox b/doc/setup.dox
index 4afde5ea5edee04d21c6429ee606959eae0f886b..535ce8953e7a5f4df6ba66a174222e0545d7c636 100644
--- a/doc/setup.dox
+++ b/doc/setup.dox
@@ -30,9 +30,6 @@ You can disable MPI using the CMake switch `WALBERLA_BUILD_WITH_MPI`.
\subsubsection libs_qt Qt (optional)
waLBerla can be build with a graphical user interface, which is disabled by default.
-The GUI is mainly useful for debugging and visualizing very small scale simulations.
-To enable the GUI, set the CMake switch `WALBERLA_ENABLE_GUI` to ON and install
-Qt4 on your system.
\subsection setup_building_waLBerla_commands Compiling the code
@@ -61,7 +58,6 @@ Some commonly-used build variables:
Build variable | Default | Meaning
-----------------------------------| -------- | -----------------------------------------------------------
CMAKE_BUILD_TYPE | Release | Either Debug (non optimized, for debugging with asserts), Release (production runs), DebugOptimized (optimized, but for debugging with asserts), or RelWithDebInfo (Release with debug infos)
-WALBERLA_ENABLE_GUI | OFF | Builds the graphical user interface. Make sure you have QT development libraries installed.
WALBERLA_BUILD_TUTORIALS | ON | Builds all the tutorials located in "apps/tutorials" (= they are added to the 'all' target in the Makefile). If disabled, the tutorials can still be built by going to "apps/tutorials" in the build folder and running make.
WALBERLA_BUILD_WITH_MPI | ON | Since one main goal of waLBerla are massively parallel simulations, this is enabled by default. However, MPI can be disabled.
WALBERLA_BUILD_WITH_OPENMP | OFF | Enables/Disables OpenMP support for thread-parallel computation. Can also be combined with MPI for hybrid simulations!
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13e7ac49ebbf92c6718f00e275af7077e7e17539..0dea809f16ff6cd4e327e8c169ad7cfd1636b89a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,6 @@ endif()
add_subdirectory( field )
add_subdirectory( gather )
add_subdirectory( geometry )
-add_subdirectory( gui )
add_subdirectory( lbm )
add_subdirectory( lbm_generated )
add_subdirectory( lbm_mesapd_coupling )
diff --git a/src/field/AddToStorage.h b/src/field/AddToStorage.h
index 14c7cd4a6e5951b13cfe277b4ebb5d8c2099a7ba..66db81a406a55649984f079b36c37e33c2a0ef7d 100644
--- a/src/field/AddToStorage.h
+++ b/src/field/AddToStorage.h
@@ -246,7 +246,7 @@ BlockDataID addToStorage( const shared_ptr< BlockStorage_T > & blocks,
*
* \param blocks BlockStorage where the original field is stored and the new one is created
* \param fieldToClone BlockDataID of the Field that is cloned
-* \param identifier name for new the field ( displayed in GUI and debugging functions )
+* \param identifier name for new the field ( displayed in debugging functions )
*/
//**********************************************************************************************************************
template< typename Field_T, typename BlockStorage_T >
@@ -274,7 +274,7 @@ BlockDataID addCloneToStorage( const shared_ptr< BlockStorage_T > & blocks,
*
* \param blocks BlockStorage where the original field is stored and the new one is created
* \param fieldToClone BlockDataID of the Field that is cloned
-* \param identifier name for new the field ( displayed in GUI and debugging functions )
+* \param identifier name for new the field ( displayed in debugging functions )
*/
//**********************************************************************************************************************
template< typename Field_T, typename BlockStorage_T >
diff --git a/src/gui/AddFilesQt.cmake b/src/gui/AddFilesQt.cmake
deleted file mode 100644
index 5ffa2a86bfc20373fa5aa7f59a2973a7a43c1834..0000000000000000000000000000000000000000
--- a/src/gui/AddFilesQt.cmake
+++ /dev/null
@@ -1,101 +0,0 @@
-# Scans the given directory and returns all subfolders
-macro (list_subdirectories RETURN_VAL curdir)
-
- FILE ( GLOB _subdirs RELATIVE ${curdir} "${curdir}/*" )
- foreach(dir ${_subdirs})
- if(IS_DIRECTORY ${curdir}/${dir})
- LIST( APPEND ${RETURN_VAL} ${curdir}/${dir} )
- endif()
- endforeach(dir)
-
-endmacro(list_subdirectories)
-
-
-# Traverses given list of subfolders and
-# writes all files needed for compilation in OUT_FILES variable
-# Processed Files:
-# - cpp files (are omitted if NO_CPPS is specified)
-# - scans all headers for Q_OBJECT macro, and adds moc files if necessary
-# (are omitted if NO_MOCS is specified)
-# - adds rules to process .ui and .qrc files
-#
-# Example Usage:
-# add_files_qt( outFiles source1 sourceDir2 NO_CPPS NO_MOCS)
-#
-# The position of the flag arguments NO_CPPS and NO_MOCS is not important so
-# add_files_qt( outFiles NO_CPPS NO_MOCS source1 sourceDir2)
-# is also valid ( and equivalent)
-macro ( add_files_qt OUT_FILES )
-
- set(argList ${ARGN}) # strangely argList behaves different than ARGN
- set( ADD_CPPS ON)
- set( ADD_MOCS ON)
-
- list(FIND argList "NO_CPPS" noCppIndex)
- if( noCppIndex GREATER -1)
- set( ADD_CPPS OFF)
- list(REMOVE_ITEM argList "NO_CPPS" )
- endif()
-
- list(FIND argList "NO_MOCS" noMocIndex)
- if( noMocIndex GREATER -1)
- set( ADD_MOCS OFF)
- list(REMOVE_ITEM argList "NO_MOCS" )
- endif()
-
-
- set (SOURCE_GROUP_PREFIX "")
-
- list(FIND argList "SOURCE_GROUP" srcGroupIndex)
- if( srcGroupIndex GREATER -1)
- math(EXPR incrIndex "${srcGroupIndex} + 1" )
- list(GET argList ${incrIndex} SOURCE_GROUP_PREFIX)
- list(REMOVE_AT argList ${srcGroupIndex} )
- list(REMOVE_AT argList ${srcGroupIndex} )
- endif()
-
-
- foreach( DIRECTORY ${argList} )
- set( ALL_HEADER )
- set( MOC_HEADER )
- set( CPP )
- set( UI )
- set( RES )
- set( MOC_OUTPUT_FILES )
- set( UI_OUTPUT_FILES )
- set( RES_OUTPUT_FILES )
-
- file( GLOB ALL_HEADER . ${DIRECTORY}/*.h )
- file( GLOB UI . ${DIRECTORY}/*.ui )
- file( GLOB RES . ${DIRECTORY}/*.qrc )
- file( GLOB CPP . ${DIRECTORY}/*.cpp )
-
- # Find files which need moc processing
- # (are recognized on Q_OBJECT macro inside file)
- foreach( _current_HEADER ${ALL_HEADER} )
- GET_FILENAME_COMPONENT(_abs_HEADER ${_current_HEADER} ABSOLUTE)
- FILE( READ ${_abs_HEADER} _contents)
- STRING( REGEX MATCHALL "Q_OBJECT" _match "${_contents}" )
-
- IF( _match)
- LIST( APPEND MOC_HEADER ${_current_HEADER} )
- ENDIF (_match)
- endforeach( _current_HEADER )
-
-
- QT4_WRAP_CPP(MOC_OUTPUT_FILES ${MOC_HEADER} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
- QT4_WRAP_UI(UI_OUTPUT_FILES ${UI} )
- QT4_ADD_RESOURCES(RES_OUTPUT_FILES ${RES})
-
- LIST( APPEND ${OUT_FILES} ${UI_OUTPUT_FILES} ${RES_OUTPUT_FILES} ${ALL_HEADER} )
- if( ADD_MOCS )
- LIST( APPEND ${OUT_FILES} ${MOC_OUTPUT_FILES} )
- endif()
- if( ADD_CPPS )
- LIST( APPEND ${OUT_FILES} ${CPP} )
- endif()
-
-
- endforeach( DIRECTORY )
-
-endmacro ()
diff --git a/src/gui/BlockSliceView/BlockSliceView.cpp b/src/gui/BlockSliceView/BlockSliceView.cpp
deleted file mode 100644
index 18d19442aad72f54e5cdb19992f09c95a19a1abf..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/BlockSliceView.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockSliceView.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockSliceView.h"
-#include "DisplayAdaptor.h"
-#include "DisplayPropertiesItem.h"
-#include "GuiUtil.h"
-
-#include "core/Abort.h"
-#include "core/debug/Debug.h"
-
-#include "stencil/D2Q9.h"
-#include "stencil/D3Q19.h"
-
-#include <QDebug>
-#include <QDebug>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QFont>
-#include <QGLWidget>
-#include <QMimeData>
-#include <QResizeEvent>
-#include <QWheelEvent>
-
-
-namespace walberla {
-namespace gui {
-
-
-
-BlockSliceView::BlockSliceView( StructuredBlockForest & forest,
- const GUI & gui,
- QStackedWidget * propertyStack,
- ISliceChangeListener * sliceChangeListener,
- QWidget * par )
- : QGraphicsView(par),
- sliceChangeListener_( sliceChangeListener ),
- sliceIdValid_( false ),
- propertyStack_ ( propertyStack),
- blockForest_( forest ),
- block_( NULL ),
- ghostLayerIndicator_ ( NULL )
-{
- setRenderHints( QPainter::Antialiasing );
- setViewport( new QGLWidget( QGLFormat(QGL::SampleBuffers)) );
- setViewportUpdateMode( QGraphicsView::FullViewportUpdate );
- scene = new QGraphicsScene( this );
- setScene( scene );
-
- setDragMode( QGraphicsView::ScrollHandDrag );
-
- // Setup PropertyUi
- propertyWidget_ = new QWidget( this );
- propertyUi_.setupUi( propertyWidget_ );
- propertyWidget_->setEnabled( false );
- propertyWidget_->show();
- propertyStack->addWidget( propertyWidget_ );
- propertyStack->setCurrentWidget( propertyWidget_ );
-
- // Connect slice change signals
- connect( propertyUi_.spnSlice, SIGNAL( valueChanged(int) ),
- this, SLOT ( onSliceValueChange() ) );
-
- connect( propertyUi_.cmbSlice, SIGNAL( currentIndexChanged(int) ),
- this, SLOT ( paintGrid() ) );
-
- propertyUi_.cmbSlice->setCurrentIndex(2);
-
- // create display items / properties
- propertyWidget_->setVisible( false );
- gui.createAdaptors( displayItems_ );
- for( auto i = displayItems_.begin(); i != displayItems_.end(); ++i )
- {
- connect( (*i), SIGNAL(requestRedraw()), this , SLOT( redraw() ) );
- (*i)->addConfigurationItem( propertyUi_.optionsTree->invisibleRootItem() );
- }
-
- propertyUi_.optionsTree->installEventFilter(this);
-
- // For enable/disable of display adaptors
- connect( propertyUi_.optionsTree, SIGNAL(itemClicked ( QTreeWidgetItem * , int ) ), this, SLOT( redraw() ) );
-}
-
-BlockSliceView::~BlockSliceView()
-{
- if( sliceIdValid_ && sliceChangeListener_ )
- sliceChangeListener_->removeSlice( sliceId_ );
-
- // Delete display items
- for( auto i = displayItems_.begin(); i != displayItems_.end(); ++i )
- delete *i;
-
- // Delete cells
- for(int i=0; i < cells.size(); ++i )
- for(int j=0; j< cells[i].size(); ++j)
- delete cells[i][j];
-
-}
-
-
-void BlockSliceView::paintGrid()
-{
- if ( displayItems_.size() < 1 )
- return;
-
- // Configure display items
-
- // Query Display Items for the size and number of ghost layers
- Vector3<uint_t> innerSize ( uint_t(0) );
- nrOfGhostLayers_ = 0;
-
- cell_idx_t sliceVal = 0;
- int sliceDim = propertyUi_.cmbSlice->currentIndex ();
-
- for ( auto i = displayItems_.begin(); i != displayItems_.end(); ++i )
- {
- Vector3<uint_t> curSize;
- cell_idx_t curNrOfGhostLayers;
- (*i)->configure( block_, sliceDim, sliceVal, curSize, curNrOfGhostLayers );
-
- innerSize[0] = std::max( innerSize[0], curSize[0] );
- innerSize[1] = std::max( innerSize[1], curSize[1] );
- innerSize[2] = std::max( innerSize[2], curSize[2] );
- nrOfGhostLayers_ = std::max( nrOfGhostLayers_, curNrOfGhostLayers );
- }
-
-
- // Delete existing cells
- for( int i=0; i < cells.size(); ++i )
- for( int j=0; j< cells[i].size(); ++j )
- delete cells[i][j];
-
- double bps = CellView::BLOCK_PIXEL_SIZE;
-
- int xSize = int_c( innerSize[0] ) + 2 * nrOfGhostLayers_;
- int ySize = int_c( innerSize[1] ) + 2 * nrOfGhostLayers_;
-
- cells.resize( xSize );
- for( int i=0; i< xSize; ++i )
- {
- cells[i].resize(ySize);
- for(int j=0; j< ySize; ++j)
- {
- cells[i][j] = new CellView();
- cells[i][j]->setToolTip( QString("%1, %2").arg(i - nrOfGhostLayers_).arg(j - nrOfGhostLayers_) );
- scene->addItem( cells[i][j] );
- cells[i][j]->setPos(QPointF(i*bps, (ySize-j-1)*bps));
- }
- }
-
-
- // Draw red rectangle around inner region
- if ( ghostLayerIndicator_ )
- delete ghostLayerIndicator_;
- ghostLayerIndicator_ = new QGraphicsRectItem( nrOfGhostLayers_ * bps, nrOfGhostLayers_ * bps,
- real_c( innerSize[0] )* bps, real_c( innerSize[1] )* bps );
- ghostLayerIndicator_->setPen( QPen( QBrush(Qt::red), 2) );
- scene->addItem( ghostLayerIndicator_ );
-
-
- // Fit the grid into the view, but leave additional border of ADDITITONAL_SPACE
- const double ADDITIONAL_SPACE = 0.2 * bps;
- fitInView(-ADDITIONAL_SPACE,
- ySize * bps +ADDITIONAL_SPACE,
- xSize * bps + 2*ADDITIONAL_SPACE,
- ySize * bps + 2*ADDITIONAL_SPACE,
- Qt::KeepAspectRatio);
-
-
- updateSliceIndicatorIn3DView();
-
- propertyUi_.spnSlice->setMaximum( int_c( innerSize[2] - 1 + uint_c( nrOfGhostLayers_ ) ) );
- propertyUi_.spnSlice->setMinimum( - nrOfGhostLayers_ );
- propertyUi_.spnSlice->setValue ( 0 );
-
-
- redraw();
-}
-
-
-void BlockSliceView::updateSliceIndicatorIn3DView()
-{
- if ( ! sliceChangeListener_ )
- return;
-
- // Update slice indicator in 3D view
- if ( sliceIdValid_ && sliceChangeListener_ ) {
- sliceChangeListener_->removeSlice( sliceId_ );
- sliceIdValid_ = false;
- }
-
- const cell_idx_t sliceVal = propertyUi_.spnSlice->value ();
- const int sliceDim = propertyUi_.cmbSlice->currentIndex ();
-
- cell_idx_t range = cell_idx_c( propertyUi_.spnSlice->maximum() +1 - propertyUi_.spnSlice->minimum() - 2*nrOfGhostLayers_ );
- double relSliceVal = (1.0 * sliceVal + 0.5) / range;
- sliceId_ = sliceChangeListener_->addSlice( block_, sliceDim , relSliceVal );
- sliceIdValid_ = true;
-
-}
-
-void BlockSliceView::onSliceValueChange()
-{
- cell_idx_t sliceVal = propertyUi_.spnSlice->value ();
- int sliceDim = propertyUi_.cmbSlice->currentIndex ();
-
- for (auto i = displayItems_.begin() ; i != displayItems_.end(); ++i )
- {
- Vector3<uint_t> sizeDummy;
- cell_idx_t glDummy;
- (*i)->configure( block_, sliceDim, sliceVal, sizeDummy, glDummy );
- }
- redraw();
- updateSliceIndicatorIn3DView();
-}
-
-void BlockSliceView::redraw()
-{
- if( ! block_ )
- return;
-
- reset();
-
- for ( auto i = displayItems_.begin(); i != displayItems_.end(); ++i )
- (*i)->draw( cells, nrOfGhostLayers_ );
-}
-
-void BlockSliceView::reset()
-{
- for(int i=0; i< cells.size(); ++i)
- for(int j=0; j< cells[i].size(); ++j)
- cells[i][j]->reset();
-}
-
-void BlockSliceView::setBlock(IBlock * block)
-{
- auto blockId = dynamic_cast<blockforest::Block*>( block )->getId();
- uint_t bx,by,bz;
- blockForest_.getRootBlockCoordinates( bx,by,bz, blockId );
- nativeParentWidget()->setWindowTitle( QString("Block (%1,%2,%3)").arg( int_c(bx)).arg(int_c(by)).arg(int_c(bz) ) );
-
- block_ = block;
- propertyWidget_->setVisible( true );
-
- paintGrid();
- propertyWidget_->setEnabled( true );
-}
-
-void BlockSliceView::focusInEvent ( QFocusEvent * )
-{
- propertyStack_->setCurrentWidget( propertyWidget_ );
- if ( !block_ )
- propertyWidget_->setVisible( false );
-
- if( sliceIdValid_ && sliceChangeListener_ )
- sliceChangeListener_->setSliceActive( sliceId_, true );
-}
-
-void BlockSliceView::focusOutEvent ( QFocusEvent * )
-{
- if( sliceIdValid_ && sliceChangeListener_)
- sliceChangeListener_->setSliceActive( sliceId_, false );
-}
-
-
-
-bool BlockSliceView::eventFilter( QObject * obj, QEvent * ev )
-{
- QTreeWidget * treeWidget = dynamic_cast<QTreeWidget*> ( obj );
-
- if ( treeWidget && ev->type() == QEvent::ContextMenu )
- {
- QContextMenuEvent * menuEvent = dynamic_cast<QContextMenuEvent*> (ev);
- QTreeWidgetItem * it = treeWidget->itemAt( treeWidget->viewport()->mapFromGlobal( menuEvent->globalPos() ) );
-
-
- DisplayPropertiesItem * propItem = dynamic_cast<DisplayPropertiesItem*>(it);
- if(!propItem)
- return false;
-
- QPoint globalPos = menuEvent->globalPos();
- propItem->showContextMenu(globalPos);
- return true;
- }
-
- return false;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////// Zoom ////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void BlockSliceView::scaleView(qreal scaleFactor)
-{
- qreal factor = matrix().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width();
- if (factor < 0.007 || factor > 1000)
- return;
-
- scale(scaleFactor, scaleFactor);
-}
-
-void BlockSliceView::wheelEvent(QWheelEvent *ev)
-{
- scaleView( std::pow((double)2, ev->delta() / 240.0));
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////// Drag & Drop //////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-void BlockSliceView::dragEnterEvent(QDragEnterEvent * ev)
-{
- const QMimeData * md = ev->mimeData();
- md->hasFormat(BLOCK_MIMETYPE) ? ev->accept() : ev->ignore();
-}
-
-void BlockSliceView::dragMoveEvent(QDragMoveEvent * ev)
-{
- QWidget::dragMoveEvent( ev );
-}
-
-void BlockSliceView::dropEvent(QDropEvent *ev)
-{
- if( ev->source()==this )
- return;
-
- const QMimeData * md = ev->mimeData();
- WALBERLA_ASSERT( md->hasFormat( BLOCK_MIMETYPE ) );
-
- void * ptr = getPointerFromMimeData(md,BLOCK_MIMETYPE);
- WALBERLA_ASSERT_NOT_NULLPTR( ptr );
-
- IBlock * block = static_cast<IBlock*>(ptr);
-
- ev->acceptProposedAction();
-
- setBlock(block);
-}
-
-
-
-
-} // namespace gui
-} // namespace walberla
diff --git a/src/gui/BlockSliceView/BlockSliceView.h b/src/gui/BlockSliceView/BlockSliceView.h
deleted file mode 100644
index 17a821b529618526a5ba2e1cc45409b3952833b0..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/BlockSliceView.h
+++ /dev/null
@@ -1,140 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockSliceView.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "CellView.h"
-#include "Gui.h"
-#include "ISliceChangeListener.h"
-#include "ui_BlockSliceViewProperties.h"
-
-#include "blockforest/StructuredBlockForest.h"
-#endif
-
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QPixmap>
-#include <QStackedWidget>
-
-
-namespace walberla {
-namespace gui {
-
- class BlockSliceViewProperties;
-
-
- //*******************************************************************************************************************
- /*!
- * View to display a slice of a field ( which is stored inside a block)
- *
- * \ingroup gui
- *
- * QGraphicsView based widget that can display various block data as slices.
- */
- //*******************************************************************************************************************
- class BlockSliceView : public QGraphicsView
- {
- Q_OBJECT
-
- public:
-
- /*************************************************************************************************************//**
- * Constructor
- * @param blockForest Currently only StructuredBlockForest is supported here. "Structured" since the slice
- * views show cell based data structures. BlockForest and not BlockStorage is used because
- * we query for global domain information.
- * @param gui the GUI object is used as a factory for DisplayAdaptors which encapsulate the details of
- * how to draw specific block data
- * @param propertyStack the stacked widget is used as a container for a widget where display properties can be
- * edited. The BlockSliceView makes sure that its own widget is on top, whenever the view
- * has the focus
- * @param blockView3D pointer to a 3D block view. The BlockSliceView uses the 3D view to display planes to
- * indicate the current slice
- *
- *****************************************************************************************************************/
- BlockSliceView( StructuredBlockForest & blockForest,
- const GUI & gui,
- QStackedWidget * propertyStack,
- ISliceChangeListener * blockView3D,
- QWidget * parent = 0 );
-
- ~BlockSliceView();
-
-
- void setBlock( IBlock * block );
-
- public slots:
- void redraw();
-
- protected:
- // Drag & Drop
- virtual void dropEvent( QDropEvent * ev );
- virtual void dragEnterEvent( QDragEnterEvent * ev );
- virtual void dragMoveEvent( QDragMoveEvent * ev );
-
- // Zoom
- virtual void wheelEvent( QWheelEvent *event );
- virtual void scaleView ( qreal scaleFactor );
-
- private slots:
- void paintGrid();
- void onSliceValueChange();
-
- private:
- void reset();
-
- virtual bool eventFilter( QObject * obj, QEvent * ev );
- virtual void focusInEvent ( QFocusEvent * event );
- virtual void focusOutEvent ( QFocusEvent * event );
-
- void updateSliceIndicatorIn3DView();
-
- //Slice Display
- ISliceChangeListener * sliceChangeListener_;
- ISliceChangeListener::SliceID sliceId_;
- bool sliceIdValid_;
-
-
- // View Properties
- QStackedWidget * propertyStack_;
- QWidget * propertyWidget_;
- Ui::BlockSliceViewProperties propertyUi_;
-
-
- QGraphicsScene * scene;
- QVector<QVector<CellView*> > cells;
- int nrOfGhostLayers_;
-
-
- StructuredBlockForest & blockForest_;
- IBlock * block_;
-
- QGraphicsRectItem * ghostLayerIndicator_;
- std::vector<DisplayAdaptor*> displayItems_;
- };
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
diff --git a/src/gui/BlockSliceView/BlockSliceViewProperties.ui b/src/gui/BlockSliceView/BlockSliceViewProperties.ui
deleted file mode 100644
index 8a5e41c67e02bd17b28e88ea2e068e15db8669d6..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/BlockSliceViewProperties.ui
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BlockSliceViewProperties</class>
- <widget class="QWidget" name="BlockSliceViewProperties">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>294</width>
- <height>563</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>GridViewProperties</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTreeWidget" name="optionsTree">
- <property name="columnCount">
- <number>2</number>
- </property>
- <attribute name="headerVisible">
- <bool>true</bool>
- </attribute>
- <attribute name="headerDefaultSectionSize">
- <number>180</number>
- </attribute>
- <attribute name="headerMinimumSectionSize">
- <number>40</number>
- </attribute>
- <attribute name="headerStretchLastSection">
- <bool>true</bool>
- </attribute>
- <column>
- <property name="text">
- <string notr="true">Data</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Style</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Slice:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cmbSlice">
- <item>
- <property name="text">
- <string>X</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Y</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Z</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>at</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spnSlice">
- <property name="maximum">
- <number>999</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/gui/BlockSliceView/CMakeLists.txt b/src/gui/BlockSliceView/CMakeLists.txt
deleted file mode 100644
index db4cf97e443c2dfdb525f0323a3f695c08bbd69e..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-target_sources( gui
- PRIVATE
- FieldDisplayAdaptor.h
- CellView.h
- ScalarField3DisplayAdaptor.h
- BlockSliceView.h
- DisplayPropertiesItem.h
- ScalarFieldDisplayAdaptor.impl.h
- VectorFieldDisplayAdaptor.impl.h
- ScalarField3DisplayAdaptor.impl.h
- ISliceChangeListener.h
- ScalarFieldDisplayAdaptor.h
- FlagFieldDisplayAdaptor.impl.h
- BlockSliceView.cpp
- FlagFieldDisplayAdaptor.h
- DisplayAdaptor.h
- CellView.cpp
- VectorFieldDisplayAdaptor.h
- DisplayPropertiesItem.cpp
- )
diff --git a/src/gui/BlockSliceView/CellView.cpp b/src/gui/BlockSliceView/CellView.cpp
deleted file mode 100644
index 077f91022236dea6a05dc71f647cc735be2604dc..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/CellView.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file CellView.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "CellView.h"
-#include "stencil/D2Q9.h"
-
-#include <QPainter>
-#include <QPen>
-
-
-namespace walberla {
-namespace gui {
-
- static const double Pi = 3.14159265358979323846264338327950288419717;
- static const double TwoPi = 2.0 * Pi;
-
- const double CellView::BLOCK_PIXEL_SIZE = 100;
-
- CellView::CellView( QGraphicsItem * par )
- : QGraphicsRectItem(0,0,BLOCK_PIXEL_SIZE,BLOCK_PIXEL_SIZE,par),
- pdfsEnabled_(false),
- arrowEnabled_(false),
- arrowX_( 0.0 ),
- arrowY_( 0.0 ),
- vectorArrowSize(20),
- pdfArrowSize(3)
- {
- setPen( QPen(Qt::black) );
-
- for(int i=0; i<9; ++i)
- pdfs_[i] = 0;
- }
-
- void CellView::setPDF( stencil::Direction dir, const double & val)
- {
- pdfsEnabled_ = true;
- pdfs_ [ stencil::D2Q9::idx[dir] ] = val;
- update();
- }
-
-
-
- void CellView::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *widget)
- {
- QGraphicsRectItem::paint( p, option, widget );
-
- p->save();
- p->setRenderHint( QPainter::TextAntialiasing );
-
- p->setPen(Qt::black);
- p->setBrush(Qt::black);
- QFont f = p->font();
- f.setPixelSize(12);
- p->setFont(f);
- QFontMetrics fontMetrics = p->fontMetrics();
-
- QRectF textRect( QPointF(0,0), fontMetrics.size(0,text_) );
- textRect.moveCenter( QPointF(50,50) );
- p->drawText(textRect,text_);
-
-
- if(arrowEnabled_)
- paintVector(p);
-
- if(pdfsEnabled_)
- paintPDFs(p);
-
- paintTexts( p );
-
- p->restore();
- }
-
-
- void CellView::paintPDFs (QPainter * p)
- {
- const double halfCellSize = BLOCK_PIXEL_SIZE * 0.5;
-
- // Paint arrows
- p->save();
- p->setPen(QPen(QColor(145,192,255), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
- p->setBrush(QColor(145,192,255));
- for ( auto d = stencil::D2Q9::begin(); d != stencil::D2Q9::end(); ++d )
- {
- const double dx = d.cx() * 0.9;
- const double dy = d.cy() * 0.9;
-
- QPointF cellMidPoint = QPointF(halfCellSize, halfCellSize);
- QPointF dst = cellMidPoint + QPointF( dx * halfCellSize, - dy * halfCellSize);
- paintArrow( p, cellMidPoint, dst, pdfArrowSize );
-
- }
- p->restore();
-
-
- // Paint text ( separate loop, to paint text over arrows )
- p->save();
- p->setRenderHint( QPainter::TextAntialiasing );
-
- for ( auto d = stencil::D2Q9::begin(); d != stencil::D2Q9::end(); ++d )
- {
- const double val = pdfs_[ d.toIdx() ];
- const double dx = d.cx() * 0.9;
- const double dy = d.cy() * 0.9;
-
- QPointF cellMidPoint = QPointF(halfCellSize, halfCellSize);
- QPointF dst = QPointF( dx * halfCellSize, - dy * halfCellSize);
-
- QFont f = p->font();
- f.setPixelSize(5);
- p->setFont(f);
- QFontMetrics fontMetrics = p->fontMetrics();
-
- QPointF textPos = cellMidPoint + 0.8 * dst;
- QString s = QString("%1").arg(val);
- textPos.setX(textPos.x() - 0.5 * fontMetrics.width(s));
- p->drawText(textPos,s);
- }
- p->restore();
-
- }
-
-
- void CellView::paintArrow(QPainter * p, const QPointF & src, const QPointF & dst, double arrowSize)
- {
- QLineF line(src, dst);
- if (qFuzzyCompare(line.length(), qreal(0.)))
- return;
-
- // Draw the line itself
- p->drawLine(line);
-
- // Draw the arrows
- double angle = ::acos(line.dx() / line.length());
- if (line.dy() >= 0)
- angle = TwoPi - angle;
-
- QPointF destArrowP1 = dst + QPointF(sin(angle - Pi / 3) * arrowSize,
- cos(angle - Pi / 3) * arrowSize);
- QPointF destArrowP2 = dst + QPointF(sin(angle - Pi + Pi / 3) * arrowSize,
- cos(angle - Pi + Pi / 3) * arrowSize);
-
-
- p->drawPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2);
- }
-
-
- void CellView::paintVector(QPainter * p)
- {
- p->setRenderHint( QPainter::Antialiasing );
- const double halfCellSize = BLOCK_PIXEL_SIZE * 0.5;
- QPointF cellMidPoint = QPointF(halfCellSize, halfCellSize);
-
- QPointF sourcePoint = cellMidPoint + QPointF(-arrowX_* halfCellSize, arrowY_ * halfCellSize);
- QPointF destPoint = cellMidPoint + QPointF( arrowX_ *halfCellSize, -arrowY_ * halfCellSize);
-
- paintArrow(p,sourcePoint,destPoint, vectorArrowSize);
- }
-
- void CellView::paintTexts(QPainter * p)
- {
- const int TEXT_DIST = 8;
-
- QFont f = p->font();
- f.setPixelSize(7);
- p->setFont(f);
- p->setRenderHint( QPainter::TextAntialiasing );
-
- QFontMetrics fontMetrics = p->fontMetrics();
-
- QPoint curPos (5,fontMetrics.height()+5);
-
- foreach(const QString & s, texts)
- {
- p->drawText(curPos,s);
- curPos.setX( curPos.x() + fontMetrics.size(0,s).width() + TEXT_DIST);
- }
- }
-
- void CellView::reset()
- {
- texts.clear();
- //icons.clear();
-
- pdfsEnabled_ = false;
-
- text_="";
- arrowEnabled_ = false;
- setBrush(QBrush(QColor(255,255,255)));
- update();
- }
-
-
- void CellView::setArrow(double xVal, double yVal)
- {
- arrowEnabled_ = true;
- arrowX_ = xVal;
- arrowY_ = yVal;
- }
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/CellView.h b/src/gui/BlockSliceView/CellView.h
deleted file mode 100644
index 721f3d98a9619a1c875ee24bc60f297cc7fca12c..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/CellView.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file CellView.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "stencil/Directions.h"
-
-#include <QGraphicsRectItem>
-
-
-class QPainter;
-class QStyleOptionGraphicsItem;
-class QPointF;
-
-namespace walberla {
-namespace gui {
-
-
-
-
- //*******************************************************************************************************************
- /*! Class for drawing a single cell of a grid slice
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- class CellView : public QGraphicsRectItem
- {
- public:
- static const double BLOCK_PIXEL_SIZE;
-
- CellView(QGraphicsItem * par =0);
-
- void setText(const QString & text) { text_ = text; update(); }
-
- /// Enables arrow display and sets x and y value
- /// xVal and yVal should not form a vector with length > 1
- void setArrow(double xVal, double yVal);
-
- void reset();
-
- void addText(const QString & s) { texts.push_back(s); }
-
- void setPDF( stencil::Direction dir, const double & val);
-
- protected:
- void paintVector( QPainter * p );
- void paintTexts( QPainter * p );
-
- void paintPDFs( QPainter * p );
-
- void paintArrow( QPainter * p, const QPointF & src, const QPointF & dst, double arrowSize );
-
- virtual void paint( QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *widget );
-
- QVector<QString> texts;
-
- bool pdfsEnabled_;
- double pdfs_[9];
-
- bool arrowEnabled_;
- double arrowX_;
- double arrowY_;
-
- double vectorArrowSize;
- double pdfArrowSize;
- QString text_;
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/DisplayAdaptor.h b/src/gui/BlockSliceView/DisplayAdaptor.h
deleted file mode 100644
index 0f5d0592e54c4558291e840c0f71256a0c4476a5..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/DisplayAdaptor.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file DisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "core/math/Vector3.h"
-#include "domain_decomposition/IBlock.h"
-#include "field/Field.h"
-#include "field/GhostLayerField.h"
-#endif
-
-#include <QPoint>
-#include <QSize>
-#include <QTreeWidgetItem>
-#include <QVector>
-
-
-namespace walberla {
-namespace gui {
-
- class CellView;
-
- //*******************************************************************************************************************
- /*! Abstract base class for display adaptors.
- *
- * A display adaptor describes how to display some structured grid like data structure in a BlockSliceView.
- *
- * The DisplayAdaptor can use a QTreeWidget branch for configuration of display properties.
- * Here the convenience class DisplayPropertiesItem can be used.
- *
- * Using this options the DisplayAdaptor draws the data structure, in a BlockSliceView.
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- class DisplayAdaptor : public QObject
- {
- Q_OBJECT
-
- public:
-
- /**
- * Configures the DisplayAdaptor by passing in a block and slice information
- *
- * @param [in] block the block that should be displayed
- * @param [in] sliceDim The coordinate value of this dimension is kept constant. Defines the slice direction
- * 0 means x, 1 means y, 2 means z
- * @param [in] sliceValue The fixed value of the sliceDim coordinate. If the value is not in the allowed range
- * nothing is displayed
- * @param [out] innerSize size of the field, without ghost layer.
- * innerSize[0] is the horizontal extent and will be the first coordinate in the grid array of draw()
- * innerSize[1] is the vertical extend and will be the second coordinate in the grid array
- * innerSize[2] is used for limiting the allowed sliceValues
- * @param [out] ghostLayers number of ghost layers for all three dimensions of innerSize
- */
- virtual void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers ) = 0;
-
- /**
- * Draws data structure represented by this Adaptor to a grid of cells
- * Block has to be set first!
- *
- * @param [in,out] grid Grid of cells. Use functions of CellView to draw
- * The Grid has dimension of innerSize + ghostLayers
- * @param [in] nrOfGhostLayers the number of ghost layers in each direction. This value may be bigger
- * than the returned value of configure() since other fields might have more ghost layers.
- * The cell at grid[0][0] lies at the outermost ghost layer
- */
- virtual void draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers ) = 0;
-
-
-
- /**
- * Optionally adds a QTreeWidgetItem to a tree, containing configuration options
- */
- virtual void addConfigurationItem( QTreeWidgetItem * ) {}
-
-
- signals:
-
- /// This signal requests a redraw, for example after a configuration change
- void requestRedraw();
-
- };
-
-
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/DisplayPropertiesItem.cpp b/src/gui/BlockSliceView/DisplayPropertiesItem.cpp
deleted file mode 100644
index 158198be1325e8219441810941620f7431faec0b..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/DisplayPropertiesItem.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file DisplayPropertiesItem.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "DisplayPropertiesItem.h"
-#include "qtgradientdialog.h"
-
-#include "core/debug/Debug.h"
-
-#include <QColorDialog>
-#include <QDebug>
-#include <QInputDialog>
-#include <QMenu>
-#include <QPainter>
-#include <cassert>
-
-
-namespace walberla {
-namespace gui {
-
-
-
-//======================================================================================================================
-//
-// FieldTreeWidget Implementation
-//
-//======================================================================================================================
-
-
-DisplayPropertiesItem::DisplayPropertiesItem( const QStringList & options, QTreeWidgetItem * parItem, bool checkbox)
- : QTreeWidgetItem(parItem),
- gradientSelectEnabled_(false),
- colorSelectEnabled_ (false),
- colorMapGradient_(0,0,100,0),
- colorMap_( 100, 1, QImage::Format_ARGB32 )
-{
- WALBERLA_ASSERT( parItem );
- // the parent has to be already added to a treeWidget
- // because the ComboBox has to be set as itemWidget which is a method of the treeWidget
- WALBERLA_ASSERT( parItem->treeWidget() );
-
- // By default the item is not selected
- if ( checkbox )
- setCheckState( 0, Qt::Unchecked );
-
- // Specify a default colormap
- colorMapGradient_.setColorAt( 1.0, QColor(0, 0, 255) );
- colorMapGradient_.setColorAt( 0.5, QColor(0, 255, 0) );
- colorMapGradient_.setColorAt( 0, QColor(255,255, 255) );
- updateColormapFromGradient();
-
- dispColor_ = QColor::fromHsvF( 1.0* qrand() / RAND_MAX, 1.0, 0.9 );
- dispColor_.setAlphaF( 0.6 );
-
- if ( ! options.empty() )
- {
- // fill combobox
- ComboBoxItem * cmb = new ComboBoxItem( this, 1 );
- for( auto i = options.begin(); i != options.end(); ++i )
- cmb->addItem( *i );
-
- connect( cmb, SIGNAL(currentIndexChanged(int)), this, SIGNAL( comboBoxSelectionChanged(int) ) );
- connect( cmb, SIGNAL(currentIndexChanged(int)), this, SIGNAL( optionChanged() ) );
-
-
- treeWidget()->setItemWidget( this, 1, cmb );
- }
-}
-
-
-
-void DisplayPropertiesItem::updateColormapFromGradient()
-{
- QPainter painter( &colorMap_ );
- painter.eraseRect( 0, 0, colorMap_.width(), colorMap_.height() );
- painter.fillRect ( 0, 0, colorMap_.width(), colorMap_.height(), QBrush( colorMapGradient_ ) );
-}
-
-
-void DisplayPropertiesItem::showContextMenu( QPoint globalPos )
-{
- QMenu * contextMenu = new QMenu();
- QAction * actSelectColor = NULL;
- QAction * actSelectGradient = NULL;
-
- if( colorSelectEnabled_ )
- actSelectColor = contextMenu->addAction(tr("Select Color"));
- if( gradientSelectEnabled_ )
- actSelectGradient = contextMenu->addAction(tr("Select ColorMap"));
-
- QAction * chosenOption = contextMenu->exec(globalPos);
-
- if( chosenOption == actSelectColor )
- showColorSelect();
- else if ( chosenOption == actSelectGradient )
- showGradientSelect();
-}
-
-QColor DisplayPropertiesItem::getColorFromColormap(double val)
-{
- WALBERLA_ASSERT_GREATER_EQUAL( val, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( val, 1 );
- QColor result( colorMap_.pixel( (int)(val * 99), 0 ) );
- return result;
-}
-
-bool DisplayPropertiesItem::isEnabled() const
-{
- return (checkState(0) == Qt::Checked );
-}
-
-
-
-int DisplayPropertiesItem::getComboBoxSelection()
-{
- return dynamic_cast<ComboBoxItem* > ( treeWidget()->itemWidget(this,1) )->currentIndex();
-}
-
-
-void DisplayPropertiesItem::showGradientSelect()
-{
- bool ok = false;
-
- QGradient newColorMap = QtGradientDialog::getGradient(&ok,colorMapGradient_,0,"Select Color Map" );
- if( ok )
- {
- QLinearGradient lastGrad;
- colorMapGradient_ = QLinearGradient(0,0,100,0);
- for(int i=0; i< newColorMap.stops().size(); ++i)
- colorMapGradient_.setColorAt(newColorMap.stops()[i].first, newColorMap.stops()[i].second );
-
- updateColormapFromGradient();
-
- emit colormapSelected();
- emit optionChanged();
- }
-}
-
-void DisplayPropertiesItem::showColorSelect()
-{
- QColor selectedColor = QColorDialog::getColor( dispColor_, NULL, "Select Color", QColorDialog::ShowAlphaChannel );
- if ( selectedColor.isValid() ) {
- setColor( selectedColor );
- emit colorSelected( dispColor_ );
- emit optionChanged();
- }
-}
-
-void DisplayPropertiesItem::setColor( QColor c )
-{
- dispColor_ = c;
-}
-
-} // namespace gui
-} // namespace walberla
-
diff --git a/src/gui/BlockSliceView/DisplayPropertiesItem.h b/src/gui/BlockSliceView/DisplayPropertiesItem.h
deleted file mode 100644
index abd308556eb065abfbb312bf03d65535d384ed92..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/DisplayPropertiesItem.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file DisplayPropertiesItem.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include <QColor>
-#include <QComboBox>
-#include <QImage>
-#include <QLinearGradient>
-#include <QTreeWidgetItem>
-
-
-namespace walberla {
-namespace gui {
-
-
- //*******************************************************************************************************************
- /*! Represents on line in a QTreeWidget. Provides a combobox, and optional color/gradient selection.
- *
- * A FieldTreeWidgetItem can be added to a QTreeWidget. In its first column text can be displayed,
- * in the second column a combobox is shown with user defined entries.
- * The context menu (right click) of the item provides color and colormap selection ( if enabled )
- *
- * This class is used to configure the display options of a waLBerla::field
- * - combobox is used to select display style ( color, arrow ... )
- * - the color selectors are used to select the colormap for a color coding of the field values, or
- * the color for a specific flag in a FlagField
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- class DisplayPropertiesItem : public QObject, public QTreeWidgetItem
- {
- Q_OBJECT
-
- public:
- /// Constructs the item with the given combobox entries
- /// \param parent the parent item, must not be NULL
- DisplayPropertiesItem( const QStringList & comboBoxEntries, QTreeWidgetItem * parent, bool checkbox=true );
- virtual ~DisplayPropertiesItem() {}
-
- void enableColorSelect ( bool enable = true ) { colorSelectEnabled_ = enable; }
- void enableGradientSelect( bool enable = true ) { gradientSelectEnabled_ = enable; }
-
- /// Returns currently selected color
- QColor getSelectedColor() const { return dispColor_; }
-
- /// Returns a color for value between 0 and 1, according to current colormap
- QColor getColorFromColormap ( double value );
-
- /// Sets the display color
- void setColor( QColor c );
-
- /// Returns index of selected combobox item (as passed in constructor)
- int getComboBoxSelection();
-
- /// True if checkbox before text is selected
- bool isEnabled() const;
-
- virtual void showContextMenu( QPoint globalPos );
-
- signals:
- /// Called whenever a option has changed (combobox, color, colormap)
- void optionChanged();
-
- /// Called when user selected a new color
- void colorSelected ( const QColor & newColor );
-
- /// Called when user selected a new colormap, use getColorFromColormap()
- /// to retrieve colormap entries
- void colormapSelected ();
-
- /// Called when a new combobox item was selected
- void comboBoxSelectionChanged ( int selectedOption );
-
-
- protected:
-
- virtual void showGradientSelect();
- virtual void showColorSelect();
-
-
- bool gradientSelectEnabled_;
- bool colorSelectEnabled_;
-
- void updateColormapFromGradient();
-
- QColor dispColor_;
- QLinearGradient colorMapGradient_;
- QImage colorMap_;
-
- };
-
-
-
-
-
-
- /****************************************************************************************************************//**
- * Helper class for inserting a combobox into a QListWidget
- ********************************************************************************************************************/
- class ComboBoxItem : public QComboBox
- {
- Q_OBJECT
- public:
- ComboBoxItem(QTreeWidgetItem* it, int col)
- {
- this->item = it;
- this->column = col;
-
- connect(this, SIGNAL(currentIndexChanged(int)), SLOT(changeItem(int)));
- }
-
- virtual ~ComboBoxItem() {}
-
- public slots:
- void changeItem(int index)
- {
- if(index >=0)
- item->setData(this->column, Qt::UserRole, this->itemText(index));
- }
-
- private:
- QTreeWidgetItem *item;
- int column;
- };
-
-
-} // namespace gui
-} // namespace walberla
-
diff --git a/src/gui/BlockSliceView/FieldDisplayAdaptor.h b/src/gui/BlockSliceView/FieldDisplayAdaptor.h
deleted file mode 100644
index fba5dbd36378d25eab02aaa8b544bebf144e990e..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/FieldDisplayAdaptor.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file FieldDisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "DisplayAdaptor.h"
-#include "field/GhostLayerField.h"
-
-
-namespace walberla {
-namespace gui {
-
-
- //*******************************************************************************************************************
- /*!
- * Abstract class, for displaying fields.
- *
- * Handles common functionality like fetching the field, generating slices etc.
- *
- *
- * field_t has to implement the concept of a GhostLayerField
- *
- * \ingroup gui
- */
- //*******************************************************************************************************************
- template<typename field_t>
- class FieldDisplayAdaptor : public DisplayAdaptor
- {
- public:
- FieldDisplayAdaptor( ConstBlockDataID fieldId )
- : field_(NULL), sliceDim_(-1), blockDataId_ ( fieldId )
- {}
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
- protected:
- Cell permuteCoordAccordingToSlice( Cell input, int sliceCoord );
- void getFieldSizeInfo( CellInterval & ciOut, cell_idx_t & ghostLayerOut );
-
- const field_t * field_;
- CellInterval sliceInterval_;
- cell_idx_t sliceDim_;
- ConstBlockDataID blockDataId_;
-
- };
-
- template<typename field_t>
- void FieldDisplayAdaptor<field_t>::getFieldSizeInfo( CellInterval & ciOut, cell_idx_t & ghostLayerOut )
- {
- typedef GhostLayerField< typename field_t::value_type, field_t::F_SIZE > GhostField;
-
- const GhostField * glFieldPtr = dynamic_cast< const GhostField*> ( field_ );
-
- if ( glFieldPtr ) {
- ciOut = glFieldPtr->xyzSizeWithGhostLayer();
- ghostLayerOut = cell_idx_c( glFieldPtr->nrOfGhostLayers() );
- }
- else {
- ciOut = field_->xyzSize();
- ghostLayerOut = 0;
- }
- }
-
-
-
-
- template<typename field_t>
- void FieldDisplayAdaptor<field_t>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
- {
- innerSize = Vector3<uint_t>(0,0,0);
- ghostLayers = 0;
-
- sliceDim_ = sliceDim;
-
- // get field pointer from BlockID, check if it is a ghost layer field
- field_ = block->getData<field_t>( blockDataId_ );
-
- // If field is not allocated on this block
- if ( ! field_ ) {
- sliceInterval_ = CellInterval();
- innerSize = Vector3<uint_t>(0,0,0);
- ghostLayers = 0;
- return;
- }
-
- CellInterval ci;
- getFieldSizeInfo( ci, ghostLayers );
-
- // if slice value is not in the valid range nothing is displayed
- if ( sliceValue < ci.min()[ uint_c(sliceDim)] || sliceValue > ci.max()[uint_c(sliceDim)] ) {
- sliceInterval_ = CellInterval();
- return;
- }
-
- // Determine size
- Cell cSize = Cell ( field_->xSize(), field_->ySize(), field_->zSize() );
- cSize = permuteCoordAccordingToSlice( cSize, sliceDim );
- innerSize = Vector3<uint_t> ( uint_c( cSize[0u] ), uint_c( cSize[1u] ), uint_c( cSize[2u] ) );
-
- // create slice interval
- sliceInterval_ = ci;
- sliceInterval_.min()[ uint_c(sliceDim) ] = sliceValue;
- sliceInterval_.max()[ uint_c(sliceDim) ] = sliceValue;
- }
-
-
- template<typename field_t>
- Cell FieldDisplayAdaptor<field_t>::permuteCoordAccordingToSlice( Cell input, int sliceCoord )
- {
- static const int permutation[3][3] = { {1,2,0}, {0,2,1}, {0,1,2} };
-
- Cell coord;
- for( uint_t i=0; i<3; ++i )
- coord[i] = input[ uint_c( permutation[sliceCoord][i] ) ];
-
- return coord;
- }
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.h b/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.h
deleted file mode 100644
index 98bc8246a708a67b29ee8a08fbae5c0d0ebfa995..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file FlagFieldDisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "DisplayPropertiesItem.h"
-#include "FieldDisplayAdaptor.h"
-#include "field/FlagField.h"
-
-#include <QVector>
-#include <QMap>
-#include <type_traits>
-
-namespace walberla {
-namespace gui {
-
-
- //*******************************************************************************************************************
- /*!
- * Displays a slice of a flag field
- *
- * \ingroup gui
- */
- //*******************************************************************************************************************
- template< typename field_t >
- class FlagFieldDisplayAdaptor : public FieldDisplayAdaptor<field_t>
- {
- public:
-
- FlagFieldDisplayAdaptor( ConstBlockDataID flagFieldID );
- ~FlagFieldDisplayAdaptor();
-
- virtual void addConfigurationItem( QTreeWidgetItem * parentItem );
-
- virtual void draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers );
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
-
- protected:
- typedef typename field_t::value_type T;
-
- static_assert( field_t::F_SIZE == 1, "Flag fields have no F_SIZE > 1 " );
- static_assert( std::is_same<T,uint8_t >::value ||
- std::is_same<T,uint16_t>::value ||
- std::is_same<T,uint32_t>::value ||
- std::is_same<T,uint64_t>::value,
- "Flag fields have unsigned integers as value");
-
- using FieldDisplayAdaptor<field_t>::sliceDim_;
- using FieldDisplayAdaptor<field_t>::field_;
- using FieldDisplayAdaptor<field_t>::sliceInterval_;
- using FieldDisplayAdaptor<field_t>::blockDataId_;
-
- DisplayPropertiesItem * displayProperties_;
- QVector<DisplayPropertiesItem*> flagProperties_;
-
- const FlagField<T> * flagField_;
-
- const IBlock * lastBlock_;
-
- static QMap< QString, QColor > flagNameToColor;
- static QMap< QString, QColor > createFlagNameToColorMap();
-
- static QVector< QColor > defaultFlagColors;
- static QVector< QColor > createDefaultFlagColors();
- static int defaultFlagColorCounter;
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-#include "FlagFieldDisplayAdaptor.impl.h"
diff --git a/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.impl.h b/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.impl.h
deleted file mode 100644
index 50272db873afcb7a8a25ca764a8581301efaca40..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/FlagFieldDisplayAdaptor.impl.h
+++ /dev/null
@@ -1,198 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file FlagFieldDisplayAdaptor.impl.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "CellView.h"
-#include "FlagFieldDisplayAdaptor.h"
-
-#include "core/debug/Debug.h"
-
-#include <vector>
-
-
-namespace walberla {
-namespace gui {
-
- template< typename field_t>
- QMap< QString, QColor > FlagFieldDisplayAdaptor<field_t>::createFlagNameToColorMap()
- {
- QMap< QString, QColor > result;
- result["noslip" ] = QColor(0,0,0,150);
- result["liquid" ] = QColor(0,130,230,150);
- result["gas"] = QColor(0,80,130,20);
- result["interface"] = QColor(0,40,230,150);
- result["pressure0"] = QColor(210,60,0,150);
- result["pressure1"] = QColor(0,210,60,150);
- result["pressure2"] = QColor(210,60,0,150);
- result["ubb"] = QColor(230,0,210,150);
- result["velocity0"] = QColor(130,0,230,150);
- result["velocity1"] = QColor(230,0,210,150);
-
- return result;
- }
- template< typename field_t>
- QMap< QString, QColor > FlagFieldDisplayAdaptor<field_t>::flagNameToColor = createFlagNameToColorMap();
-
-
- template< typename field_t>
- QVector< QColor > FlagFieldDisplayAdaptor<field_t>::createDefaultFlagColors()
- {
- QVector< QColor > result;
- result.append( QColor(175,220,0,150) );
- result.append( QColor(220,70,70,150) );
- result.append( QColor(220,50,150) );
- result.append( QColor(170,170,170,150) );
- result.append( QColor(0,14,210,150) );
- result.append( QColor(205,102,29,150) );
- return result;
- }
- template< typename field_t>
- QVector< QColor > FlagFieldDisplayAdaptor<field_t>::defaultFlagColors = createDefaultFlagColors();
-
- template< typename field_t>
- int FlagFieldDisplayAdaptor<field_t>::defaultFlagColorCounter = 0;
-
-
-
- template< typename field_t>
- FlagFieldDisplayAdaptor<field_t>::FlagFieldDisplayAdaptor( ConstBlockDataID scalarFieldID )
- : FieldDisplayAdaptor<field_t>( scalarFieldID ),
- displayProperties_ ( NULL ),
- flagField_( NULL ),
- lastBlock_( NULL )
- {
- }
-
- template< typename field_t>
- FlagFieldDisplayAdaptor<field_t>::~FlagFieldDisplayAdaptor()
- {
- if ( displayProperties_)
- delete displayProperties_;
- }
-
- template< typename field_t>
- void FlagFieldDisplayAdaptor<field_t>::addConfigurationItem( QTreeWidgetItem * parentItem )
- {
- if ( ! displayProperties_ )
- {
- displayProperties_ = new DisplayPropertiesItem( QStringList(), parentItem, false );
- QObject::connect( displayProperties_, SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
- }
- }
-
-
- template< typename field_t>
- void FlagFieldDisplayAdaptor<field_t>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
- {
- // Set name of tree item
- WALBERLA_ASSERT( displayProperties_ );
- const std::string & name = block->getBlockStorage().getBlockDataIdentifier( blockDataId_ );
- displayProperties_->setText( 0, QString::fromStdString(name) );
-
- FieldDisplayAdaptor<field_t>::configure( block, sliceDim, sliceValue, innerSize, ghostLayers );
-
- if ( block == lastBlock_ ) {
- return;
- }
-
- lastBlock_ = block;
-
- qDeleteAll( flagProperties_ );
- flagProperties_.clear();
-
- flagField_ = dynamic_cast<const FlagField<T> *> ( field_ );
- if ( flagField_ )
- {
- std::vector<FlagUID> allFlags;
- flagField_->getAllRegisteredFlags( allFlags );
-
- QStringList options;
- options << "Color" << "Text";
- for( auto i = allFlags.begin(); i != allFlags.end(); ++i )
- {
- flagProperties_.push_back( new DisplayPropertiesItem( options, displayProperties_ ) );
- QObject::connect( flagProperties_.back(), SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
-
- flagProperties_.back()->enableColorSelect();
- QString flagName = QString::fromStdString( i->getIdentifier() );
- QColor flagColor;
- if( flagNameToColor.contains(flagName.toLower()) )
- {
- flagColor = flagNameToColor[flagName.toLower()];
- }
- else
- {
- flagColor = defaultFlagColors[ defaultFlagColorCounter ];
- defaultFlagColorCounter = ( defaultFlagColorCounter + 1 ) % defaultFlagColors.size();
- }
- flagProperties_.back()->setText( 0, flagName );
- flagProperties_.back()->setColor( flagColor );
- }
- }
-
- }
-
- template< typename field_t>
- void FlagFieldDisplayAdaptor<field_t>::draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers )
- {
-
- using namespace stencil;
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim_, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim_, 2);
- WALBERLA_ASSERT( displayProperties_ ); // call addConfigurationItem first!
-
- for( auto flagIt = flagProperties_.begin(); flagIt != flagProperties_.end(); ++flagIt )
- {
- if ( !(*flagIt)->isEnabled() )
- continue;
-
- const FlagUID flagUID( ( *flagIt )->text( 0 ).toAscii().constData() );
- const T flag = flagField_->getFlag( flagUID );
- const int displayType = (*flagIt)->getComboBoxSelection();
- assert ( displayType >=0 && displayType <2 );
-
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- Cell permutedCell = FieldDisplayAdaptor<field_t>::permuteCoordAccordingToSlice( it.cell(), sliceDim_ );
- CellView * cell = grid[ permutedCell.x() + nrOfGhostLayers ] [ permutedCell.y() + nrOfGhostLayers ];
-
- if ( !isFlagSet(*it,flag) )
- continue;
-
- if ( displayType == 0 )
- cell->setBrush( (*flagIt)->getSelectedColor() );
- else if ( displayType == 1 )
- cell->addText( ( *flagIt )->text( 0 ).at( 0 ) );
- }
- }
- }
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
diff --git a/src/gui/BlockSliceView/ISliceChangeListener.h b/src/gui/BlockSliceView/ISliceChangeListener.h
deleted file mode 100644
index b78e490a5ff91cbd2367a888e803910a68d1891c..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/ISliceChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ISliceChangeListener.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "domain_decomposition/IBlock.h"
-
-
-namespace walberla {
-namespace gui {
-
- class ISliceChangeListener
- {
- public:
- virtual ~ISliceChangeListener() {}
- typedef int SliceID;
- virtual SliceID addSlice ( IBlock * block, int sliceDim, double position ) = 0;
- virtual void removeSlice ( SliceID id ) = 0;
- virtual void setSliceActive ( SliceID id, bool active = true ) = 0;
- };
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.h b/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.h
deleted file mode 100644
index f24346fe8580ca1a3d188291ede75cfe0ed4974e..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ScalarField3DisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "DisplayPropertiesItem.h"
-#include "FieldDisplayAdaptor.h"
-#include "core/math/Vector3.h"
-
-#include <type_traits>
-
-
-namespace walberla {
-namespace gui {
-
-
-
- //*******************************************************************************************************************
- /*!
- * Class for drawing slices of vector fields
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- template < typename field_t >
- class ScalarField3DisplayAdaptor : public FieldDisplayAdaptor< field_t >
- {
- public:
- typedef typename field_t::value_type T;
- typedef FieldDisplayAdaptor< field_t > base_t;
- typedef real_t length_t;
-
- ScalarField3DisplayAdaptor( ConstBlockDataID vectorFieldID );
- ~ScalarField3DisplayAdaptor();
-
-
- virtual void addConfigurationItem( QTreeWidgetItem * parentItem );
-
- virtual void draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers );
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
-
- protected:
- // first value_type for field, second for Vector3
- static_assert( field_t::F_SIZE == 3, "Can only display fields with 3 components ( vector )" );
-
- void drawVectorFieldNumeric ( CellView * cell, const typename field_t::const_iterator & it );
- void drawVectorFieldColormap( CellView * cell, const typename field_t::const_iterator & it, length_t min, length_t max );
- void drawVectorFieldArrow ( CellView * cell, const typename field_t::const_iterator & it, length_t max );
-
- using base_t::blockDataId_;
- using base_t::sliceDim_;
- using base_t::sliceInterval_;
- using base_t::field_;
-
-
- DisplayPropertiesItem * displayProperties_;
-
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-#include "ScalarField3DisplayAdaptor.impl.h"
-
-
diff --git a/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.impl.h b/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.impl.h
deleted file mode 100644
index 72a0d2ca439df252949915ef85ff5fced96f1bbb..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/ScalarField3DisplayAdaptor.impl.h
+++ /dev/null
@@ -1,166 +0,0 @@
- //======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ScalarField3DisplayAdaptor.impl.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "CellView.h"
-#include "ScalarField3DisplayAdaptor.h"
-
-#include "core/debug/Debug.h"
-
-#include "field/GhostLayerField.h"
-
-#include <cassert>
-#include <cmath>
-#include <type_traits>
-
-namespace walberla {
- namespace gui {
-
-
- template< typename field_t>
- ScalarField3DisplayAdaptor<field_t>::ScalarField3DisplayAdaptor( ConstBlockDataID scalarFieldID )
- : FieldDisplayAdaptor< field_t >( scalarFieldID ),
- displayProperties_ ( NULL )
- {
- }
-
- template< typename field_t>
- ScalarField3DisplayAdaptor<field_t>::~ScalarField3DisplayAdaptor()
- {
- if ( displayProperties_)
- delete displayProperties_;
- }
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
- {
- // Set name of tree item
- WALBERLA_ASSERT( displayProperties_ );
- const std::string & name = block->getBlockStorage().getBlockDataIdentifier( blockDataId_ );
- displayProperties_->setText(0, QString::fromStdString(name) );
-
- base_t::configure( block, sliceDim, sliceValue, innerSize, ghostLayers );
- }
-
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::addConfigurationItem( QTreeWidgetItem * parentItem )
- {
- if ( ! displayProperties_ )
- {
- QStringList options;
- options << "Numeric" << "Color Map" << "Arrow";
-
- displayProperties_ = new DisplayPropertiesItem( options, parentItem );
- displayProperties_->enableGradientSelect();
-
- QObject::connect( displayProperties_, SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
- }
- }
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers )
- {
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim_, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim_, 2);
- WALBERLA_ASSERT( displayProperties_ ); // call addConfigurationItem first!
- if ( ! displayProperties_->isEnabled() )
- return;
-
- // displayType is option index in the QStringList passed to the constructor of displayProperties
- int displayType = displayProperties_->getComboBoxSelection();
- assert ( displayType >=0 && displayType <3 );
-
- length_t min = std::numeric_limits<length_t>::max();
- length_t max = std::numeric_limits<length_t>::min();
- if ( displayType == 1 || displayType == 2) // for colormap and numeric, min & max are needed
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- length_t val = std::sqrt( it[0]*it[0] + it[1]*it[1] + it[2]*it[2] );
- if (val < min ) min = val;
- if (val > max ) max = val;
- }
-
-
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- Cell c = base_t::permuteCoordAccordingToSlice( it.cell(), sliceDim_ );
- CellView * cell = grid[ c.x() + nrOfGhostLayers ] [ c.y() + nrOfGhostLayers ];
-
- if ( displayType == 0 )
- drawVectorFieldNumeric( cell, it );
- else if( displayType == 1 )
- drawVectorFieldColormap( cell, it, min ,max );
- else if( displayType == 2 )
- drawVectorFieldArrow( cell, it, max );
- }
-
- }
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::drawVectorFieldNumeric( CellView * cell, const typename field_t::const_iterator & it )
- {
- if( std::is_same<T,float>::value || std::is_same<T,double>::value )
- cell->setText( QString("%1\n%2\n%3").arg( real_c( it[0]), 0,'g',6)
- .arg( real_c( it[1]), 0,'g',6)
- .arg( real_c( it[2]), 0,'g',6) );
- else
- cell->setText( QString("%1\n%2\n%3").arg( it[0])
- .arg( it[1])
- .arg( it[2]) );
- }
-
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::drawVectorFieldColormap( CellView * cell, const typename field_t::const_iterator & it,
- typename ScalarField3DisplayAdaptor<field_t>::length_t min,
- typename ScalarField3DisplayAdaptor<field_t>::length_t max )
- {
- real_t length = std::sqrt( it[0]*it[0] + it[1]*it[1] + it[2]*it[2] );
- real_t normVal = real_c( length - min ) / real_c ( max-min );
- if ( math::finite( normVal ) )
- cell->setBrush( displayProperties_->getColorFromColormap( normVal ) );
- }
-
- template< typename field_t>
- void ScalarField3DisplayAdaptor<field_t>::drawVectorFieldArrow(CellView * cell, const typename field_t::const_iterator & it,
- typename ScalarField3DisplayAdaptor<field_t>::length_t max )
- {
- WALBERLA_ASSERT( sliceDim_ <= 2 && sliceDim_ >=0 );
-
- uint_t firstDim, secondDim;
- if ( sliceDim_ == 0 ) firstDim = 1, secondDim = 2;
- else if ( sliceDim_ == 1 ) firstDim = 0, secondDim = 2;
- else firstDim = 0, secondDim = 1;
-
- cell->setArrow( real_c( it[ firstDim ] ) / max,
- real_c( it[ secondDim ] ) / max );
- }
-
-
-
- } // namespace gui
-} // namespace walberla
-
-
-
-
diff --git a/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.h b/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.h
deleted file mode 100644
index da8c89f11d3a36c30174e800e389bf9879d99498..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ScalarFieldDisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "DisplayPropertiesItem.h"
-#include "FieldDisplayAdaptor.h"
-
-
-namespace walberla {
-namespace gui {
-
-
- //*******************************************************************************************************************
- /*! Class for drawing a slice of a scalar field
- *
- * Scalar fields can be displayed either by showing the numeric values as text, or by using a colormap.
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- template< typename field_t>
- class ScalarFieldDisplayAdaptor : public FieldDisplayAdaptor<field_t>
- {
- public:
- ScalarFieldDisplayAdaptor( ConstBlockDataID scalarFieldID );
- ~ScalarFieldDisplayAdaptor();
-
- virtual void addConfigurationItem( QTreeWidgetItem * parentItem );
-
- virtual void draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers );
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
- private:
- typedef typename field_t::value_type T;
-
- static const uint_t F_SIZE = field_t::F_SIZE;
-
- void drawScalarFieldNumeric( CellView * cell, const typename field_t::const_iterator & it );
- void drawScalarFieldColormap( CellView * cell, const typename field_t::const_iterator & it, T min, T max );
-
- using FieldDisplayAdaptor<field_t>::sliceDim_;
- using FieldDisplayAdaptor<field_t>::field_;
- using FieldDisplayAdaptor<field_t>::sliceInterval_;
- using FieldDisplayAdaptor<field_t>::blockDataId_;
- cell_idx_t f;
- DisplayPropertiesItem * displayProperties_;
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-#include "ScalarFieldDisplayAdaptor.impl.h"
diff --git a/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.impl.h b/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.impl.h
deleted file mode 100644
index 1eeaf26e92b23d3921cd42b13266fcb34ab4fac7..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/ScalarFieldDisplayAdaptor.impl.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ScalarFieldDisplayAdaptor.impl.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "CellView.h"
-#include "ScalarFieldDisplayAdaptor.h"
-
-#include "core/debug/Debug.h"
-
-#include "field/GhostLayerField.h"
-
-#include <cassert>
-#include <limits>
-#include <type_traits>
-
-
-namespace walberla {
-namespace gui {
-
-
-template< typename field_t>
-ScalarFieldDisplayAdaptor<field_t>::ScalarFieldDisplayAdaptor( ConstBlockDataID scalarFieldID )
- : FieldDisplayAdaptor<field_t>( scalarFieldID ),
- f(0),
- displayProperties_ ( NULL )
-{
-}
-
-template< typename field_t>
-ScalarFieldDisplayAdaptor<field_t>::~ScalarFieldDisplayAdaptor()
-{
- if ( displayProperties_)
- delete displayProperties_;
-}
-
-template< typename field_t>
-void ScalarFieldDisplayAdaptor<field_t>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
-{
- // Set name of tree item
- WALBERLA_ASSERT( displayProperties_ );
- const std::string & name = block->getBlockStorage().getBlockDataIdentifier( blockDataId_ );
- displayProperties_->setText(0, QString::fromStdString(name) );
-
- FieldDisplayAdaptor<field_t>::configure( block, sliceDim, sliceValue, innerSize, ghostLayers );
-}
-
-
-template< typename field_t>
-void ScalarFieldDisplayAdaptor<field_t>::addConfigurationItem( QTreeWidgetItem * parentItem )
-{
- if ( ! displayProperties_ )
- {
- QStringList options;
-
- if( field_t::F_SIZE == 1) {
- options << "Numeric" << "Color Map";
- }
- else
- {
- for( uint_t i=0; i < field_t::F_SIZE; ++i ) {
- options << QString("%1 Numeric").arg(i);
- options << QString("%1 Color Map").arg(i);
- }
- }
-
- displayProperties_ = new DisplayPropertiesItem( options, parentItem );
- displayProperties_->enableGradientSelect();
-
- QObject::connect( displayProperties_, SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
- }
-}
-
-template< typename field_t>
-void ScalarFieldDisplayAdaptor<field_t>::draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers )
-{
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim_, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim_, 2);
- WALBERLA_ASSERT( displayProperties_ ); // call addConfigurationItem first!
- if ( ! displayProperties_->isEnabled() )
- return;
-
- // displayType is option index in the QStringList passed to the constructor of displayProperties
- int comboSelection = displayProperties_->getComboBoxSelection();
- int displayType = comboSelection % 2;
- f = comboSelection / 2;
- assert ( displayType >=0 && displayType <2 );
-
- T min = std::numeric_limits<T>::max();
- T max = std::numeric_limits<T>::min();
- if ( displayType == 1 )
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- if ( *it >= std::numeric_limits<T>::max() ) continue;
-
- if (*it < min ) min = *it;
- if (*it > max ) max = *it;
- }
-
-
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- Cell c = FieldDisplayAdaptor<field_t>::permuteCoordAccordingToSlice( it.cell(), sliceDim_ );
- CellView * cell = grid[ c.x() + nrOfGhostLayers ] [ c.y() + nrOfGhostLayers ];
-
- if ( displayType == 0 )
- drawScalarFieldNumeric( cell, it );
- else if( displayType == 1 )
- drawScalarFieldColormap( cell, it , min ,max );
- }
-
-}
-
-template< typename field_t>
-void ScalarFieldDisplayAdaptor<field_t>::drawScalarFieldNumeric( CellView * cell,
- const typename field_t::const_iterator & it)
-{
- if( std::is_same<T,float>::value || std::is_same<T,double>::value )
- cell->setText(QString("%1").arg(real_c(it.getF(f)), 0, 'g', 6));
- else if ( it.getF(f) < std::numeric_limits<T>::max() )
- cell->setText( QString("%1").arg(it.getF(f)) );
- else
- cell->setText("");
-}
-
-
-template< typename field_t>
-void ScalarFieldDisplayAdaptor<field_t>::drawScalarFieldColormap( CellView * cell,
- const typename field_t::const_iterator & it,
- T min, T max )
-{
- real_t normVal = 0;
- if ( fabs( real_c(max) - real_c(min) ) > 1e-7 )
- normVal = real_c(it.getF(f) - min) / real_c(max - min);
-
- if ( it.getF(f) < std::numeric_limits<T>::max() )
- cell->setBrush( displayProperties_->getColorFromColormap( normVal ) );
- else
- cell->setBrush( QBrush(Qt::red) );
-}
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.h b/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.h
deleted file mode 100644
index 9ac42d5ab9709e47ef632d563d7503b46f9dbc1e..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file VectorFieldDisplayAdaptor.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "DisplayPropertiesItem.h"
-#include "FieldDisplayAdaptor.h"
-#include "core/math/Vector3.h"
-
-#include <type_traits>
-
-
-namespace walberla {
-namespace gui {
-
-
-
- //*******************************************************************************************************************
- /*!
- * Class for drawing slices of vector fields
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- template < typename field_t >
- class VectorFieldDisplayAdaptor : public FieldDisplayAdaptor< field_t >
- {
- public:
- typedef typename field_t::value_type::value_type T;
- typedef FieldDisplayAdaptor< field_t > base_t;
- typedef typename Vector3<T>::Length length_t;
-
- VectorFieldDisplayAdaptor( ConstBlockDataID vectorFieldID );
- ~VectorFieldDisplayAdaptor();
-
-
- virtual void addConfigurationItem( QTreeWidgetItem * parentItem );
-
- virtual void draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers );
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
-
- protected:
- // first value_type for field, second for Vector3
- static_assert( (std::is_same<typename field_t::value_type, Vector3<T> >::value), "Can only display Vector3" );
-
- void drawVectorFieldNumeric ( CellView * cell, const typename field_t::const_iterator & it );
- void drawVectorFieldColormap( CellView * cell, const typename field_t::const_iterator & it, length_t min, length_t max );
- void drawVectorFieldArrow ( CellView * cell, const typename field_t::const_iterator & it, length_t max );
-
- using base_t::blockDataId_;
- using base_t::sliceDim_;
- using base_t::sliceInterval_;
- using base_t::field_;
-
-
- DisplayPropertiesItem * displayProperties_;
-
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-#include "VectorFieldDisplayAdaptor.impl.h"
-
diff --git a/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.impl.h b/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.impl.h
deleted file mode 100644
index c3dde812135ea909e4ea41cb4c605da31285fdbb..0000000000000000000000000000000000000000
--- a/src/gui/BlockSliceView/VectorFieldDisplayAdaptor.impl.h
+++ /dev/null
@@ -1,166 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file VectorFieldDisplayAdaptor.impl.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "CellView.h"
-#include "VectorFieldDisplayAdaptor.h"
-
-#include "core/debug/Debug.h"
-
-#include "field/GhostLayerField.h"
-
-#include <cassert>
-#include <cmath>
-#include <type_traits>
-
-
-namespace walberla {
-namespace gui {
-
-
- template< typename field_t>
- VectorFieldDisplayAdaptor<field_t>::VectorFieldDisplayAdaptor( ConstBlockDataID scalarFieldID )
- : FieldDisplayAdaptor< field_t >( scalarFieldID ),
- displayProperties_ ( NULL )
- {
- }
-
- template< typename field_t>
- VectorFieldDisplayAdaptor<field_t>::~VectorFieldDisplayAdaptor()
- {
- if ( displayProperties_)
- delete displayProperties_;
- }
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
- {
- // Set name of tree item
- WALBERLA_ASSERT( displayProperties_ );
- const std::string & name = block->getBlockStorage().getBlockDataIdentifier( blockDataId_ );
- displayProperties_->setText(0, QString::fromStdString(name) );
-
- base_t::configure( block, sliceDim, sliceValue, innerSize, ghostLayers );
- }
-
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::addConfigurationItem( QTreeWidgetItem * parentItem )
- {
- if ( ! displayProperties_ )
- {
- QStringList options;
- options << "Numeric" << "Color Map" << "Arrow";
-
- displayProperties_ = new DisplayPropertiesItem( options, parentItem );
- displayProperties_->enableGradientSelect();
-
- QObject::connect( displayProperties_, SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
- }
- }
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::draw( QVector<QVector<CellView*> > & grid, int nrOfGhostLayers )
- {
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim_, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim_, 2);
- WALBERLA_ASSERT( displayProperties_ ); // call addConfigurationItem first!
- if ( ! displayProperties_->isEnabled() )
- return;
-
- // displayType is option index in the QStringList passed to the constructor of displayProperties
- int displayType = displayProperties_->getComboBoxSelection();
- assert ( displayType >=0 && displayType <3 );
-
- length_t min = std::numeric_limits<length_t>::max();
- length_t max = std::numeric_limits<length_t>::min();
- if ( displayType == 1 || displayType == 2) // for colormap and numeric, min & max are needed
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- length_t val = (*it).length();
- if (val < min ) min = val;
- if (val > max ) max = val;
- }
-
-
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_->end(); ++it )
- {
- Cell c = base_t::permuteCoordAccordingToSlice( it.cell(), sliceDim_ );
- CellView * cell = grid[ c.x() + nrOfGhostLayers ] [ c.y() + nrOfGhostLayers ];
-
- if ( displayType == 0 )
- drawVectorFieldNumeric( cell, it );
- else if( displayType == 1 )
- drawVectorFieldColormap( cell, it, min ,max );
- else if( displayType == 2 )
- drawVectorFieldArrow( cell, it, max );
- }
-
- }
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::drawVectorFieldNumeric( CellView * cell, const typename field_t::const_iterator & it )
- {
- if( std::is_same<T,float>::value || std::is_same<T,double>::value )
- cell->setText( QString("%1\n%2\n%3").arg( real_c( (*it)[0]), 0,'g',6)
- .arg( real_c( (*it)[1]), 0,'g',6)
- .arg( real_c( (*it)[2]), 0,'g',6) );
- else
- cell->setText( QString("%1\n%2\n%3").arg( (*it)[0])
- .arg( (*it)[1])
- .arg( (*it)[2]) );
-
- }
-
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::drawVectorFieldColormap( CellView * cell, const typename field_t::const_iterator & it,
- typename VectorFieldDisplayAdaptor<field_t>::length_t min,
- typename VectorFieldDisplayAdaptor<field_t>::length_t max )
- {
- real_t normVal = real_c( (*it).length() - min ) / real_c ( max-min );
- if ( math::finite( normVal ) )
- cell->setBrush( displayProperties_->getColorFromColormap( normVal ) );
- }
-
- template< typename field_t>
- void VectorFieldDisplayAdaptor<field_t>::drawVectorFieldArrow(CellView * cell, const typename field_t::const_iterator & it,
- typename VectorFieldDisplayAdaptor<field_t>::length_t max )
- {
- WALBERLA_ASSERT( sliceDim_ <= 2 && sliceDim_ >=0 );
-
- uint_t firstDim, secondDim;
- if ( sliceDim_ == 0 ) firstDim = 1, secondDim = 2;
- else if ( sliceDim_ == 1 ) firstDim = 0, secondDim = 2;
- else firstDim = 0, secondDim = 1;
-
- cell->setArrow( real_c( (*it)[ firstDim ] ) / max,
- real_c( (*it)[ secondDim ] ) / max );
- }
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
diff --git a/src/gui/BlockView3D/BlockDisplayObject.cpp b/src/gui/BlockView3D/BlockDisplayObject.cpp
deleted file mode 100644
index 9d2a3cb2eb0afc9ea74c912f30a7ecbce83f260e..0000000000000000000000000000000000000000
--- a/src/gui/BlockView3D/BlockDisplayObject.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockDisplayObject.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockDisplayObject.h"
-#include "qglbuilder.h"
-#include "qglcube.h"
-#include "qglview.h"
-
-#include "blockforest/BlockForest.h"
-
-#include "core/math/Vector3.h"
-
-
-namespace walberla {
-namespace gui {
-
- int BlockDisplayObject::colorId = 0;
- int BlockDisplayObject::nextSliceId = 0;
-
-
- BlockDisplayObject::BlockDisplayObject( BlockForest * blockForest,
- const shared_ptr<blockforest::BlockID> & id ,
- QObject * par )
- : QObject(par),
- blockForest_(blockForest),
- blockId_(id),
- blockMaterial_(NULL),
- hoverMaterial_(NULL),
- hovering_(false)
- {
- QGLBuilder builder;
- builder << QGL::Faceted;
- builder << QGLCube();
-
- objectId_ = colorId++;
-
- mesh_ = builder.finalizedSceneNode();
-
- blockMaterial_ = new QGLMaterial(this);
- blockMaterial_->setAmbientColor(QColor(0, 174, 255,210));
- blockMaterial_->setDiffuseColor(QColor(0, 174, 255,210));
- blockMaterial_->setSpecularColor(QColor(255, 255, 255,210));
- blockMaterial_->setShininess(128);
-
- inactiveMaterial_ = new QGLMaterial(this);
- inactiveMaterial_->setAmbientColor(QColor(240, 100, 100, 100));
- inactiveMaterial_->setDiffuseColor(QColor(240, 100, 100, 100));
- inactiveMaterial_->setSpecularColor(QColor(255, 255, 255, 120));
- inactiveMaterial_->setShininess(200);
-
- hoverMaterial_ = new QGLMaterial(this);
- hoverMaterial_->setAmbientColor(QColor(200, 200, 200));
- hoverMaterial_->setDiffuseColor(QColor(255, 255, 255));
- hoverMaterial_->setSpecularColor(QColor(255, 255, 255));
- hoverMaterial_->setShininess(128);
-
- activeSliceMaterial_ = new QGLMaterial(this);
- activeSliceMaterial_->setAmbientColor(QColor(255, 0, 0,240));
- activeSliceMaterial_->setDiffuseColor(QColor(255, 0, 0));
- activeSliceMaterial_->setSpecularColor(QColor(255, 0, 0));
- activeSliceMaterial_->setShininess(128);
-
- inactiveSliceMaterial_ = new QGLMaterial(this);
- inactiveSliceMaterial_->setAmbientColor(QColor(1, 255, 43, 200 ));
- inactiveSliceMaterial_->setDiffuseColor(QColor(255, 255, 255));
- inactiveSliceMaterial_->setSpecularColor(QColor(255, 255, 255));
- inactiveSliceMaterial_->setShininess(128);
- }
-
- BlockDisplayObject::~BlockDisplayObject()
- {
- delete mesh_;
- }
-
-
- BlockDisplayObject::SliceID BlockDisplayObject::addSlice( int sliceDim, double position )
- {
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim, 2 );
-
- int sliceID = nextSliceId++;
- slices[ sliceID ].active= true;
- slices[ sliceID ].sliceDimension = sliceDim;
- slices[ sliceID ].position = position ;
-
- return sliceID;
- }
-
-
-
- void BlockDisplayObject::setShrinkingFactor(qreal factor)
- {
- AABB bb;
- blockForest_->getAABB( bb, *blockId_ );
-
- const qreal bbSize []= { bb.max(0) - bb.min(0),
- bb.max(1) - bb.min(1),
- bb.max(2) - bb.min(2) };
-
- modelViewMat_ = QMatrix4x4(); // reset to identity
- modelViewMat_.translate( bb.min(0) + factor/2 * bbSize[0],
- bb.min(1) + factor/2 * bbSize[1],
- bb.min(2) + factor/2 * bbSize[2]);
-
- modelViewMat_.scale( factor );
- modelViewMat_.scale( bbSize[0],bbSize[1],bbSize[2] );
- }
-
-
-
- void BlockDisplayObject::draw( QGLPainter *painter )
- {
- bool localBlock = blockForest_->blockExistsLocally( * blockId_ );
-
- QGLMaterial *curMat = 0;
- if (hovering_ )
- curMat = hoverMaterial_;
- else if ( !hovering_ && localBlock )
- curMat = blockMaterial_;
- else if ( !hovering_ && ! localBlock )
- curMat = inactiveMaterial_;
-
- WALBERLA_ASSERT( curMat );
-
-
- painter->setStandardEffect( QGL::LitMaterial );
-
- // Mark the object for object picking purposes.
- int prevObjectId = painter->objectPickId();
- painter->setObjectPickId(objectId_);
-
- painter->modelViewMatrix().push();
- (painter->modelViewMatrix() ) *= modelViewMat_;
-
- // Draw slices
- for( auto i = slices.begin(); i != slices.end(); ++i )
- {
- painter->modelViewMatrix().push();
-
- Slice & slice = i.value();
- QGLMaterial * sliceMat = slice.active ? activeSliceMaterial_ : inactiveSliceMaterial_;
- painter->setColor( sliceMat->diffuseColor() );
- painter->setFaceMaterial( QGL::AllFaces, sliceMat );
-
- Vector3<double> translateVec (0, 0, 0 );
- translateVec[ uint_c(slice.sliceDimension) ] = slice.position - 0.5;
- painter->modelViewMatrix().translate( translateVec[0], translateVec[1], translateVec[2] );
-
- Vector3<double> scaleVec ( 1.35, 1.35, 1.35 );
- scaleVec[ uint_c(slice.sliceDimension) ] = 0.01;
- painter->modelViewMatrix().scale( scaleVec[0], scaleVec[1], scaleVec[2] );
- mesh_->draw( painter );
- painter->modelViewMatrix().pop();
- }
-
- painter->setColor(curMat->diffuseColor());
- painter->setFaceMaterial(QGL::AllFaces, curMat);
-
- // Draw the block
- mesh_->draw(painter);
-
- // Revert to the previous object identifier.
- painter->setObjectPickId(prevObjectId);
-
- painter->modelViewMatrix().pop();
- }
-
-
- bool BlockDisplayObject::event( QEvent *e )
- {
- // Convert the raw event into a signal representing the user's action.
- if (e->type() == QEvent::Enter)
- {
- hovering_ = true;
- emit hoverChanged();
- }
- if (e->type() == QEvent::Leave )
- {
- hovering_ = false;
- emit hoverChanged();
- }
-
- return QObject::event(e);
- }
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockView3D/BlockDisplayObject.h b/src/gui/BlockView3D/BlockDisplayObject.h
deleted file mode 100644
index fc3e25abbe4e0fc1856bc67d1de56c464ce4affb..0000000000000000000000000000000000000000
--- a/src/gui/BlockView3D/BlockDisplayObject.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockDisplayObject.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "blockforest/BlockForest.h"
-#include "ISliceChangeListener.h"
-#endif
-
-#include "qglabstractscene.h"
-#include "qglpainter.h"
-#include "qmatrix4x4stack.h"
-
-#include <QEvent>
-#include <QObject>
-
-
-class QGLView;
-class QGLSceneNode;
-
-namespace walberla {
-namespace gui {
-
- //******************************************************************************************************************
- /*! BlockDisplayObject renders one Block as a Cube
- *
- * \ingroup gui
- *
- * Features: - Picking is enabled - connect to signal clicked()
- * - three different materials: hoverMaterial is used on mouseOver,
- * inactiveMaterial is used for not allocated blocks
- */
- //*******************************************************************************************************************
- class BlockDisplayObject: public QObject
- {
-
- Q_OBJECT
-
- public:
-
- explicit BlockDisplayObject( BlockForest * blockForest, const shared_ptr<blockforest::BlockID> & id , QObject * parent = 0 );
- virtual ~BlockDisplayObject();
-
- void draw( QGLPainter *painter );
-
- shared_ptr<blockforest::BlockID> blockId() { return blockId_; }
-
- void setShrinkingFactor(qreal factor);
-
-
- //** Slice Indicators *************************************************************************************
- /*! \name Slice Indicators */
- //@{
- typedef ISliceChangeListener::SliceID SliceID;
- SliceID addSlice ( int sliceDim, double position );
- void removeSlice ( SliceID id ) { slices.remove(id); }
- void setSliceActive ( SliceID id, bool active = true ) { slices[id].active = active; }
- //@}
- //****************************************************************************************************************
-
- signals:
- void hoverChanged();
-
- protected:
- bool event( QEvent *e );
-
- private:
- BlockForest * blockForest_;
- shared_ptr<blockforest::BlockID> blockId_;
-
- QGLSceneNode * mesh_;
- QGLMaterial * blockMaterial_;
- QGLMaterial * inactiveMaterial_;
- QGLMaterial * hoverMaterial_;
- QGLMaterial * activeSliceMaterial_;
- QGLMaterial * inactiveSliceMaterial_;
-
-
- int objectId_;
-
- bool hovering_;
-
- QMatrix4x4 modelViewMat_;
-
- /// Static counter, incremented for each object, is used as objectId_
- /// -> every cube gets its own objectId_ for picking
- static int colorId;
-
-
- // Slices
- struct Slice
- {
- bool active;
- int sliceDimension; // 0,1 or 2
- double position;
- };
- static int nextSliceId;
- QMap<SliceID, Slice > slices;
-
- };
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockView3D/BlockView3D.cpp b/src/gui/BlockView3D/BlockView3D.cpp
deleted file mode 100644
index dc78bdf5e776ebf9e2cd723e45db93b751dfb50c..0000000000000000000000000000000000000000
--- a/src/gui/BlockView3D/BlockView3D.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockView3D.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockView3D.h"
-#include "GuiUtil.h"
-
-#include "core/debug/Debug.h"
-
-#include <QDebug>
-#include <QWheelEvent>
-#include <qglbuilder.h>
-#include <qglcube.h>
-#include <qglteapot.h>
-
-
-namespace walberla {
-namespace gui {
-
-
-BlockView3D::BlockView3D(QWidget * par)
- : QGLView(par),shrinkingFactor_(0.9)
-{
- // Enable anti-aliasing
- QGLFormat newFormat = this->format();
- newFormat.setSampleBuffers(true);
- setFormat(newFormat);
-
- setOption(QGLView::ObjectPicking, true);
- //setOption(QGLView::ShowPicking,true);
-
- camera()->setEye( QVector3D(25,15, 90));
-}
-
-BlockView3D::~BlockView3D()
-{
- qDeleteAll(blocks_);
-}
-
-void BlockView3D::onBlockForestChange()
-{
- //for( auto it = registeredBlocks_.begin(); it != registeredBlocks_.end(); ++it )
- // deregisterObject( *it );
- //registeredBlocks_.clear();
- //qDeleteAll(blocks_);
- //this->setup( blockForest_ );
-}
-
-void BlockView3D::setup( BlockForest * blockForest)
-{
- using blockforest::Block;
- blockForest_ = blockForest;
-
- int objectId=0;
-
- std::vector< shared_ptr<IBlockID> > allBlocks;
- blockForest_->getAllBlocks( allBlocks );
-
-
- for( auto i = allBlocks.begin(); i != allBlocks.end(); ++i )
- {
- shared_ptr<blockforest::BlockID> bfBlockId = dynamic_pointer_cast< blockforest::BlockID > ( *i );
-
- BlockDisplayObject * displ = new BlockDisplayObject( blockForest_, bfBlockId, this );
- displ->setShrinkingFactor( shrinkingFactor_ );
- displ->setParent(this);
- blocks_.append(displ);
-
- if ( blockForest_->blockExistsLocally( **i ) )
- {
- registerObject(objectId,displ);
- registeredBlocks_.append( objectId );
- connect(displ, SIGNAL(hoverChanged()), this,SLOT(updateGL()));
- connect(displ, SIGNAL(hoverChanged()),this,SLOT(update()));
- }
- objectId++;
- }
-
- updateGL();
-}
-
-
-
-void BlockView3D::initializeGL(QGLPainter * painter)
-{
- painter->setStandardEffect(QGL::LitMaterial);
-}
-
-void BlockView3D::paintGL(QGLPainter * painter)
-{
- glEnable(GL_BLEND);
-
- const AABB & bb = blockForest_->getDomain();
- QVector3D bbMid ( 0.5 * (bb.max(0) + bb.min(0)),
- 0.5 * (bb.max(1) + bb.min(1)),
- 0.5 * (bb.max(2) + bb.min(2)));
-
- double maxExtend = std::max( std::max( bbMid.x(), bbMid.y() ), bbMid.z() );
-
- painter->modelViewMatrix().push();
- painter->modelViewMatrix().scale( 15.0 / maxExtend );
- painter->modelViewMatrix().translate(-bbMid);
-
- foreach(BlockDisplayObject * blkDisp, blocks_)
- blkDisp->draw(painter);
-
- painter->modelViewMatrix().pop();
-}
-
-
-void BlockView3D::wheelEvent (QWheelEvent * we)
-{
- if (we->modifiers() & Qt::ControlModifier )
- {
-
- shrinkingFactor_ += we->delta() / 5000.0;
- if (shrinkingFactor_ > 1 )
- shrinkingFactor_ = 1;
- else if (shrinkingFactor_ < 0.01 )
- shrinkingFactor_ = 0.01;
-
- foreach(BlockDisplayObject * blkDisp, blocks_)
- blkDisp->setShrinkingFactor(shrinkingFactor_);
-
-
- updateGL();
- }
- else
- QGLView::wheelEvent(we);
-}
-
-void BlockView3D::mousePressEvent(QMouseEvent * me)
-{
- QObject * pickedObj = objectForPoint(me->pos());
- BlockDisplayObject * bdo = dynamic_cast<BlockDisplayObject*> (pickedObj );
-
- if(!bdo)
- return QGLView::mousePressEvent(me);
-
- QMimeData * md = NULL;
-
- md = createMimeDataFromPointer( blockForest_->getBlock( * bdo->blockId() ) , BLOCK_MIMETYPE );
- QDrag *drag = new QDrag(this);
-
- drag->setMimeData(md);
- drag->exec();
-}
-
-
-
-
-BlockView3D::SliceID BlockView3D::addSlice ( IBlock * block, int sliceDim, double position )
-{
- for( auto i = blocks_.begin(); i != blocks_.end(); ++i )
- if( * (*i)->blockId() == block->getId() )
- {
- BlockDisplayObject * bdi = *i;
- SliceID sId = bdi->addSlice(sliceDim, position );
- sliceToDisplayObject[sId] = (*i);
- updateGL();
- return sId;
- }
-
- WALBERLA_ASSERT( false ); //block not found
- updateGL();
- return -1;
-}
-
-void BlockView3D::removeSlice ( SliceID id )
-{
- sliceToDisplayObject[id]->removeSlice(id);
- updateGL();
-}
-
-void BlockView3D::setSliceActive ( SliceID id, bool active )
-{
- sliceToDisplayObject[id]->setSliceActive(id, active);
- updateGL();
-}
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockView3D/BlockView3D.h b/src/gui/BlockView3D/BlockView3D.h
deleted file mode 100644
index e356c9d8cc67e3302b53785c3176f7ee73735c17..0000000000000000000000000000000000000000
--- a/src/gui/BlockView3D/BlockView3D.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockView3D.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//! \brief Header file for 3D Block View
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "BlockDisplayObject.h"
-#include "ISliceChangeListener.h"
-#include "blockforest/BlockForest.h"
-#endif
-
-#include <QMainWindow>
-#include <qbox3d.h>
-#include <qglview.h>
-
-
-namespace walberla {
-namespace gui {
-
-
- /********************************************************************************************************************
- * Shows a 3D view of the blocks contained in a BlockForest
- *
- * \ingroup gui
- *
- * - the user can drag single blocks out of the view
- * - the dragged MIME data carries a blockforest::Block pointer
- * - the distance of the Blocks can be modified by Ctrl+MouseWheel
- *
- * Usage: - call setup() with a BlockForest pointer
- * - accept drop events, for MIME data type BLOCK_MIMETYPE
- *
- *******************************************************************************************************************/
- class BlockView3D : public QGLView, public ISliceChangeListener
- {
- Q_OBJECT
-
- public:
- BlockView3D(QWidget * parent =0);
- virtual ~BlockView3D();
-
- /// Shows the contents of a BlockField
- /// use this as initialization function of the widget
- void setup( BlockForest * blockForest);
-
- //** Slice Indicators *************************************************************************************
- /*! \name Slice Indicators */
- //@{
- typedef BlockDisplayObject::SliceID SliceID;
- virtual SliceID addSlice ( IBlock * block, int sliceDim, double position );
- virtual void removeSlice ( SliceID id );
- virtual void setSliceActive ( SliceID id, bool active = true );
- //@}
- //****************************************************************************************************************
-
- public slots:
- void onBlockForestChange();
-
- protected:
- void paintGL(QGLPainter * painter);
- void initializeGL(QGLPainter * painter);
-
- // Event handling
- virtual void wheelEvent (QWheelEvent * we);
- virtual void mousePressEvent(QMouseEvent * me);
-
- private:
- /// The bounding box of the blocks is scaled down to generated
- /// free space between blocks, which makes picking easier
- /// the factor can be changed dynamically by using Ctrl+MouseWheel
- double shrinkingFactor_;
-
- BlockForest * blockForest_;
-
- QList<BlockDisplayObject*> blocks_;
- QList<int> registeredBlocks_;
- QMap<SliceID, BlockDisplayObject*> sliceToDisplayObject;
- };
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockView3D/CMakeLists.txt b/src/gui/BlockView3D/CMakeLists.txt
deleted file mode 100644
index 6806b213412d2d4586134d0d0b3c6ed67f556a5a..0000000000000000000000000000000000000000
--- a/src/gui/BlockView3D/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-target_sources( gui
- PRIVATE
- BlockDisplayObject.h
- BlockDisplayObject.cpp
- BlockView3D.h
- BlockView3D.cpp
- )
diff --git a/src/gui/BlockViewText/BlockViewText.cpp b/src/gui/BlockViewText/BlockViewText.cpp
deleted file mode 100644
index 5942776d420017d33400da3ac31f3244a26a1734..0000000000000000000000000000000000000000
--- a/src/gui/BlockViewText/BlockViewText.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockViewText.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockViewText.h"
-#include "GuiUtil.h"
-
-#include <QDrag>
-#include <QMouseEvent>
-
-#include "blockforest/BlockForest.h"
-
-namespace walberla {
-namespace gui {
-
-BlockViewText::BlockViewText( QWidget * par )
- : QListWidget( par ), blockForest_( NULL )
-{
-
-}
-
-void BlockViewText::onBlockForestChange()
-{
- this->setup( blockForest_ );
-}
-
-void BlockViewText::setup( BlockForest * blockForest)
-{
- using blockforest::Block;
- blockForest_ = blockForest;
-
- std::vector< shared_ptr<IBlockID> > allBlocks;
- blockForest_->getAllBlocks( allBlocks );
-
- this->clear();
-
- for( auto i = allBlocks.begin(); i != allBlocks.end(); ++i )
- {
- shared_ptr<blockforest::BlockID> bfBlockId = dynamic_pointer_cast< blockforest::BlockID > ( *i );
-
- if ( blockForest_->blockExistsLocally( **i ) )
- {
- Block * blockPtr = blockForest->getBlock( *bfBlockId );
- auto blockState = blockPtr->getState();
- QString stateStr;
- for( auto stateIt = blockState.begin(); stateIt != blockState.end(); ++stateIt ) {
- stateStr += QString("/") + QString::fromStdString( stateIt->getIdentifier() );
- }
-
- uint_t bx,by,bz;
- blockForest_->getRootBlockCoordinates( bx,by,bz, *bfBlockId );
- auto listItem = new QListWidgetItem( QString("%1, %2, %3 ").arg(bx).arg(by).arg(bz) + stateStr, this );
- listItem->setData( Qt::UserRole, VPtr<Block>::asQVariant( blockPtr) );
- }
- }
-
-}
-
-void BlockViewText::mousePressEvent(QMouseEvent * me)
-{
- QListWidgetItem * curItem = itemAt( me->pos() );
- if ( curItem )
- {
- Block * blockPtr = VPtr<Block>::asPtr(curItem->data( Qt::UserRole ) );
- QMimeData * md = NULL;
-
- md = createMimeDataFromPointer( blockPtr , BLOCK_MIMETYPE );
- QDrag *drag = new QDrag(this);
-
- drag->setMimeData(md);
- drag->exec();
-
- }
- else
- return QListWidget::mousePressEvent( me );
-
-}
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/BlockViewText/BlockViewText.h b/src/gui/BlockViewText/BlockViewText.h
deleted file mode 100644
index a2488b78990bb9e8d71295e2a865ec5b7f12a0c3..0000000000000000000000000000000000000000
--- a/src/gui/BlockViewText/BlockViewText.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockViewText.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "Gui.h"
-#endif
-
-#include <QListWidget>
-
-
-namespace walberla {
-namespace blockforest {
- class BlockForest;
-}
-}
-
-namespace walberla {
-namespace gui {
-
-
- /********************************************************************************************************************
- * Shows a list view of the blocks contained in a BlockForest
- *
- * Analog to BlockView3D, but uglier :) however with to QGl dependency
- *
- * \ingroup gui
- *
- * - the user can drag single blocks out of the view
- * - the dragged MIME data carries a blockforest::Block pointer
- * - the distance of the Blocks can be modified by Ctrl+MouseWheel
- *
- * Usage: - call setup() with a BlockForest pointer
- * - accept drop events, for MIME data type BLOCK_MIMETYPE
- *
- *******************************************************************************************************************/
- class BlockViewText : public QListWidget
- {
- Q_OBJECT
-
- public:
- BlockViewText( QWidget * parent = 0 );
-
- /// Shows the contents of a BlockField
- /// use this a initialization function of the widget
- void setup( BlockForest * blockForest);
-
- public slots:
- void onBlockForestChange();
-
- protected:
- virtual void mousePressEvent(QMouseEvent * me);
-
- blockforest::BlockForest * blockForest_;
-
- };
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
diff --git a/src/gui/BlockViewText/CMakeLists.txt b/src/gui/BlockViewText/CMakeLists.txt
deleted file mode 100644
index 5625b3c5307ab8fcbcd106a2106fdcd9233529ff..0000000000000000000000000000000000000000
--- a/src/gui/BlockViewText/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-target_sources( gui
- PRIVATE
- BlockViewText.h
- BlockViewText.cpp
- )
diff --git a/src/gui/CMakeDefs.in.h b/src/gui/CMakeDefs.in.h
deleted file mode 100644
index 6d603fbe72d855cc1b35af23cc7ce0395a83e39a..0000000000000000000000000000000000000000
--- a/src/gui/CMakeDefs.in.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//======================================================================================================================
-/*!
- * \file CMakeDefs.in.h
- * \brief Definitions for blockforest module configured by cmake
- */
-//======================================================================================================================
-
-#pragma once
-
-#cmakedefine WALBERLA_GUI_USE_3D_BLOCKVIEW
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
deleted file mode 100644
index 35765ef1b6d5b927cbea550671d016c03243f330..0000000000000000000000000000000000000000
--- a/src/gui/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-
-# ---------------------------- GUI Module -----------------------------------------
-#
-# Directory Structure
-# / Module base directory contains all files that can always be compiled
-# regardless if Qt was found - Qt dependend regions are marked with
-# ifdef WALBERLA_ENABLE_GUI which is set from CMakeLists.txt
-# /BlockSliceView
-# /BlockView3D
-# /MainWindow
-# these 3 folders contain own code
-#
-# /extern/Qt3D
-# source of Qt3D library, is needed until Qt 5 is released, which will
-# contain the 3D library; until then, the needed parts of Qt3D are compiled
-# as part of the the gui module
-# /extern/QtGradientEditor
-# Widget taken from Qt Designer - is needed for editing colormaps
-#----------------------------------------------------------------------------------
-
-
-# Sources from the gui base directory are always added, the parts including Qt Libs
-# are marked with ifdefs
-file( GLOB gui_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp )
-file( GLOB header RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h )
-file( GLOB cmake_rules RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cmake )
-list( APPEND gui_SOURCES ${header} )
-list( APPEND gui_SOURCES ${cmake_rules} )
-
-if( WIN32 )
- SET ( WALBERLA_GUI_USE_3D_BLOCKVIEW OFF CACHE INTERNAL "GUI: Use 3D BlockView - not supported on Windows!" FORCE )
-else()
- OPTION( WALBERLA_GUI_USE_3D_BLOCKVIEW "GUI: Use 3D BlockView - not supported on Windows!" ON )
-endif()
-
-
-configure_file ( CMakeDefs.in.h CMakeDefs.h )
-
-
-
-# All other source files are only added if gui was activated
-if( WALBERLA_ENABLE_GUI )
- include( ${CMAKE_CURRENT_SOURCE_DIR}/AddFilesQt.cmake )
-
- # ----------- Add Subfolders --------------------------------------------
-
- include_directories (${CMAKE_CURRENT_BINARY_DIR} )
- set ( SUBFOLDERS ${CMAKE_CURRENT_SOURCE_DIR}/BlockSliceView
- ${CMAKE_CURRENT_SOURCE_DIR}/BlockDataDisplay
- ${CMAKE_CURRENT_SOURCE_DIR}/BlockViewText
- ${CMAKE_CURRENT_SOURCE_DIR}/MainWindow )
-
- if ( WALBERLA_GUI_USE_3D_BLOCKVIEW )
- list( APPEND SUBFOLDERS ${CMAKE_CURRENT_SOURCE_DIR}/BlockView3D )
- endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${SUBFOLDERS} )
- add_files_qt(gui_SOURCES ${SUBFOLDERS} )
-
-
- # --------------- Extern GUI Packages---------------------------------------
-
- # Qt3D
- if ( WALBERLA_GUI_USE_3D_BLOCKVIEW )
- list_subdirectories (QT3D_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/extern/Qt3D )
- include_directories( SYSTEM ${QT3D_FOLDER} )
- add_files_qt(externSourceFiles ${QT3D_FOLDER} SOURCE_GROUP "extern\\\\Qt3D" )
- endif()
-
-
- # QtGradientEditor
- include_directories( SYSTEM ${QT3D_INCLUDE}
- ${CMAKE_CURRENT_SOURCE_DIR}/extern/QtGradientEditor )
-
- add_files_qt(externSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/extern/QtGradientEditor SOURCE_GROUP "extern\\\\QtGradientEditor" )
-
- # Prevent warnings from extern files
- if ( WALBERLA_CXX_COMPILER_IS_MSVC )
- set_source_files_properties( ${externSourceFiles} PROPERTIES COMPILE_FLAGS "-W0" )
- else()
- set_source_files_properties( ${externSourceFiles} PROPERTIES COMPILE_FLAGS "-w" )
- endif()
- # add the extern files to module sources
- list(APPEND gui_SOURCES ${externSourceFiles})
-
-endif(WALBERLA_ENABLE_GUI)
-
-
-add_library( gui )
-target_link_libraries( gui PUBLIC core domain_decomposition blockforest field timeloop stencil )
-target_sources( gui
- PRIVATE
- PropertyTree.h
- PropertyTree.impl.h
- PropertyTree.cpp
- Gui.h
- CMakeDefs.in.h
- Gui.cpp
- )
-
-#TODO: this needs some additional refactoring. Does not resamble the mechanism from above!
-if( WALBERLA_ENABLE_GUI )
- add_subdirectory( MainWindow )
- add_subdirectory( BlockViewText )
- add_subdirectory( BlockView3D )
- add_subdirectory( BlockSliceView )
-endif()
diff --git a/src/gui/Gui.cpp b/src/gui/Gui.cpp
deleted file mode 100644
index d8c06a3cab1f58479b704b783dc333e17158437b..0000000000000000000000000000000000000000
--- a/src/gui/Gui.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Gui.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "Gui.h"
-#include "waLBerlaDefinitions.h"
-
-
-#ifdef WALBERLA_ENABLE_GUI
-
-#include "MainWindow.h"
-#include "ScalarFieldDisplayAdaptor.h"
-#include "FlagFieldDisplayAdaptor.h"
-#include "VectorFieldDisplayAdaptor.h"
-#include "ScalarField3DisplayAdaptor.h"
-
-#include "core/Abort.h"
-#include "core/logging/Logging.h"
-
-#include <QApplication>
-#include <stdexcept>
-
-
-namespace walberla {
-namespace gui {
-
-void throwOnAbort( const std::string & message )
-{
- throw std::runtime_error( message );
-}
-
-
-// last instance pointer -> points to GUI that handles breakpoints
-GUI * GUI::lastInstance_ = NULL;
-
-struct GuiImpl
-{
- QApplication * app;
- MainWindow * mainWindow;
- std::vector< shared_ptr<PropertyTree> > propertyTrees_;
-};
-
-
-
-GUI::GUI(timeloop::ITimeloop & timeloop, const shared_ptr<StructuredBlockForest> & blockForest, int& argc, char ** argv)
- : timeloop_( timeloop ),
- blockForest_( *blockForest )
-{
- QCoreApplication::setOrganizationName( "FAU" );
- QCoreApplication::setApplicationName ( "waLBerla" );
-
- pImpl = new GuiImpl();
- pImpl->app = new QApplication( argc, argv );
- pImpl->mainWindow = new MainWindow( timeloop_, blockForest_, *this );
-
- if ( lastInstance_ != NULL ) {
- WALBERLA_LOG_WARNING( "More than one GUI may lead to problems!");
- }
- lastInstance_ = this;
-
- walberla::Abort::instance()->resetAbortFunction( &walberla::Abort::exceptionAbort );
-}
-
-GUI::~GUI()
-{
- if ( lastInstance_ == this )
- lastInstance_ = NULL;
-
- delete pImpl->mainWindow;
- delete pImpl->app;
- delete pImpl;
-}
-
-
-void GUI::registerDisplayAdaptorCreator( const DisplayAdaptorCreatorFunc & creatorFunc )
-{
- displayAdaptorCreatorFuncs_.push_back( creatorFunc );
-}
-
-
-DisplayAdaptor * GUI::findDisplayAdaptorForBlockID ( ConstBlockDataID bdId ) const
-{
- for( auto blockIt = blockForest_.begin(); blockIt != blockForest_.end(); ++blockIt )
- {
- IBlock & block = *blockIt;
- if( ! block.isBlockDataAllocated(bdId) )
- continue;
-
-
- // User registered Adaptors
- for( auto it = displayAdaptorCreatorFuncs_.begin(); it != displayAdaptorCreatorFuncs_.end(); ++it )
- {
- DisplayAdaptor * result = (*it)( block, bdId);
- if ( result )
- return result;
- }
-
- // Flag fields
- if ( block.isDataOfType< FlagField< uint8_t> >( bdId) ) return new FlagFieldDisplayAdaptor<FlagField< uint8_t> >( bdId );
- if ( block.isDataOfType< FlagField<uint16_t> >( bdId) ) return new FlagFieldDisplayAdaptor<FlagField<uint16_t> >( bdId );
- if ( block.isDataOfType< FlagField<uint32_t> >( bdId) ) return new FlagFieldDisplayAdaptor<FlagField<uint32_t> >( bdId );
- if ( block.isDataOfType< FlagField<uint64_t> >( bdId) ) return new FlagFieldDisplayAdaptor<FlagField<uint64_t> >( bdId );
-
- // Ghost Layer fields
- if ( block.isDataOfType< GhostLayerField<uint8_t ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<uint8_t ,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<uint16_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<uint16_t,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<uint32_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<uint32_t,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<uint64_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<uint64_t,1> >( bdId );
-
- if ( block.isDataOfType< GhostLayerField<int8_t ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<int8_t ,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<int16_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<int16_t,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<int32_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<int32_t,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<int64_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<int64_t,1> >( bdId );
-
- if ( block.isDataOfType< GhostLayerField<float ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<float, 1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<double,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<double,1> >( bdId );
-
- if ( block.isDataOfType< GhostLayerField<Vector3<real_t>,1> >( bdId) ) return new VectorFieldDisplayAdaptor<GhostLayerField<Vector3<real_t>,1> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,3> > ( bdId) ) return new ScalarField3DisplayAdaptor<GhostLayerField<real_t,3> > ( bdId );
-
-
- if ( block.isDataOfType< GhostLayerField<real_t,2> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 2> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,3> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 3> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,4> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 4> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,5> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 5> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,6> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 6> >( bdId );
- if ( block.isDataOfType< GhostLayerField<real_t,7> >( bdId) ) return new ScalarFieldDisplayAdaptor<GhostLayerField<real_t, 7> >( bdId );
-
-
- // Fields
- if ( block.isDataOfType< Field<uint8_t ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<uint8_t ,1> >( bdId );
- if ( block.isDataOfType< Field<uint16_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<uint16_t,1> >( bdId );
- if ( block.isDataOfType< Field<uint32_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<uint32_t,1> >( bdId );
- if ( block.isDataOfType< Field<uint64_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<uint64_t,1> >( bdId );
-
- if ( block.isDataOfType< Field<int8_t ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<int8_t ,1> >( bdId );
- if ( block.isDataOfType< Field<int16_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<int16_t,1> >( bdId );
- if ( block.isDataOfType< Field<int32_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<int32_t,1> >( bdId );
- if ( block.isDataOfType< Field<int64_t,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<int64_t,1> >( bdId );
-
- if ( block.isDataOfType< Field<float ,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<float, 1> >( bdId );
- if ( block.isDataOfType< Field<double,1> >( bdId) ) return new ScalarFieldDisplayAdaptor<Field<double,1> >( bdId );
-
- if ( block.isDataOfType< Field<Vector3<real_t>,1> >( bdId) ) return new VectorFieldDisplayAdaptor< Field<Vector3<real_t>,1> >( bdId );
-
- }
-
- return NULL;
-}
-
-
-void GUI::registerPropertyTree( const shared_ptr<PropertyTree>& propertyTree ) {
- pImpl->propertyTrees_.push_back( propertyTree );
-}
-
-
-const std::vector<shared_ptr<PropertyTree> > & GUI::getPropertyTrees() const {
- return pImpl->propertyTrees_;
-}
-
-
-void GUI::createAdaptors( std::vector<DisplayAdaptor*> & out ) const
-{
- for( uint_t i = 0; i< blockForest_.numberOfBlockDataItems(); ++i )
- {
- DisplayAdaptor * da = findDisplayAdaptorForBlockID( ConstBlockDataID(i) );
- if( da )
- out.push_back( da );
- }
-}
-
-
-void GUI::run()
-{
-
- pImpl->mainWindow->showMaximized();
- pImpl->app->exec();
-}
-
-
-
-
-void GUI::breakpoint( const std::string & comment, const std::string & file, int line )
-{
- if ( GUI::lastInstance_ == NULL )
- return;
-
- GUI::lastInstance_->pImpl->mainWindow->breakpoint( QString::fromStdString(comment),
- QString::fromStdString( file ),
- line );
-}
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
-#else //WALBERLA_ENABLE_GUI
-
-
-namespace walberla {
-namespace gui {
-
-GUI * GUI::lastInstance_ = nullptr;
-
-GUI::GUI(timeloop::ITimeloop & timeloop, const shared_ptr<StructuredBlockForest> & blockForest, int& , char ** )
- : timeloop_(timeloop),
- blockForest_( *blockForest )
-{
-}
-
-GUI::~GUI() = default;
-
-void GUI::run() {
- timeloop_.run();
-}
-
-void GUI::registerPropertyTree( const shared_ptr<PropertyTree>& ) {}
-
-const std::vector<shared_ptr<PropertyTree> > & GUI::getPropertyTrees() const {
- throw( "Should not happen!" );
-
-}
-
-void breakpoint( const std::string & , const std::string & , int ){}
-
-
-void GUI::registerDisplayAdaptorCreator( const DisplayAdaptorCreatorFunc & )
-{
-
-}
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-#endif //WALBERLA_ENABLE_GUI
-
-
-
-
-
-
-
-
diff --git a/src/gui/Gui.dox b/src/gui/Gui.dox
deleted file mode 100644
index 33a64439a692df373d99e91c7da1ab32d8ce8bad..0000000000000000000000000000000000000000
--- a/src/gui/Gui.dox
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- \page guiPage GUI Documentation
-
- \brief Page describing how to use the graphical user interface.
-
- \image html gui/screenshot.png "waLBerla GUI"
-
- \section usage Usage:
-
- \subsection buildSettings Build Settings
- When waLBerla is built with the default settings, the GUI is not included
- due to additional dependency on the Qt Library. Use the cmake switch \c WALBERLA_ENABLE_GUI
- to use the GUI and Qt.
- If you disable this switch in cmake, all dependencies to Qt are removed, the GUI::run() method
- then only executes timeloop.run()
-
- \subsection timeloop Use GUI in your application
- The graphical user interface needs a StructuredBlockForest and a Timeloop to work.
- Create a gui object, pass the required arguments, and call GUI::run() instead of
- timeloop::run()
-
- Example:
-
- \code
-// Create BlockForest
-auto blocks = createUniformBlockGrid(3,4,5, //blocks
- 6,3,2, //cells
- 1, //dx
- false, //one block per process
- true,true,true); //periodicity
-// Register Block Data
-BlockDataID pdfField = addGhostLayerField<real_t,19>( blocks, 1, 0.0, field::zyxf, "PdfField" );
-BlockDataID scalarField = addGhostLayerField<real_t,1>( blocks, 1, 0.0, field::zyxf, "ScalarField" );
-BlockDataID flagField = addFlagField<uint32_t> ( blocks, 1, "FlagField" );
-
-SweepTimeloop timeloop (blocks->getBlockStorage(), nrOfTimeSteps);
-
-GUI gui(timeloop, *blocks, argc, argv);
-gui.run();
-
- \endcode
-
- \warning The main purpose of the GUI is to debug and inspect internal waLBerla data structures.
- It is not suited for production runs. It is also not suitable for debugging parallel
- simulations, since every process opens another window!
-
-
-\section design Design:
-
- No registration of the blockdata at the GUI is required. All fields that are supported are
- automatically shown in the GUI. To display custom blockdata look at walberla::gui::GUI::createAdaptors()
- and the class walberla::gui::DisplayAdaptor .
-
-
- \image html gui/componentsOverview.png "Overview over GUI Components"
-
- In the screenshot above, the GUI components are annotated with their class names.
- The walberla::gui::BlockView3D shows all local blocks in a 3D view. The blocks can be dragged out, and
- dropped on other elements. The drag&drop message contains an walberla::IBlock pointer.
- The BlockView3D uses a walberla::gui::BlockDisplayObject to draw the single blocks, but is otherwise
- independent of the other components.
- The BlockView3D offers the possibility to display slice indicators (planes that cut through blocks).
- These can be added/removed/recolored by using a public interface.
-
-
- The most important widget is the walberla::gui::BlockSliceView.
- Multiple such views can be opened in a QMdiArea, which is managed by the walberla::gui::MainWindow.
- The BlockSliceView holds a pointer to the globally unique BlockView3D to display slice indicators.
-
- Additionally it holds a pointer to a QStackedWidget (lower left in the screenshot). It adds a widget
- to the QStackedWidget where the user can edit the display properties. When the BlockSliceView has the focus
- it makes sure that its own property widget is displayed on top in the QStackedWidget.
-
- To display different blockdata the walberla::gui::DisplayAdaptor is used. A display adaptor knows how
- to get blockdata out of the block and how to draw it. Each display adaptor may also holds its own state,
- for storing display options.
- Each display adaptor usually adds an item ( walberla::gui::DisplayPropertiesItem ) to a tree view in the properties
- widget.
-
-
-
- \image html gui/collaborationDiagram.png "Collaboration of GUI Components"
-
-
- For common blockdata DisplayAdaptors exists:
-
-
- \image html gui/adaptors.png "Display Adaptors"
-
-*/
diff --git a/src/gui/Gui.h b/src/gui/Gui.h
deleted file mode 100644
index 799060b7a2f0c7021c9ec4dca5f8930d14074097..0000000000000000000000000000000000000000
--- a/src/gui/Gui.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Gui.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "PropertyTree.h"
-#include "blockforest/StructuredBlockForest.h"
-#include "timeloop/ITimeloop.h"
-
-#include <functional>
-#include <vector>
-
-
-namespace walberla {
-namespace gui {
-
-
- struct GuiImpl; // pimpl pattern, to avoid the ifdef ENABLE_GUI in the header
- class DisplayAdaptor;
-
- class GUI
- {
- public:
-
- GUI(timeloop::ITimeloop & timeloop, const shared_ptr<StructuredBlockForest> & blockForest, int& argc, char ** argv);
- ~GUI();
-
-
- //** Interface to User ************************************************************************************
- /*! \name Interface to User */
- //@{
-
- void run();
-
- void registerPropertyTree( const shared_ptr<PropertyTree>& propertyTree );
-
- using DisplayAdaptorCreatorFunc = std::function<DisplayAdaptor *(const IBlock &, ConstBlockDataID)>;
- void registerDisplayAdaptorCreator( const DisplayAdaptorCreatorFunc & creatorFunc );
-
- static void breakpoint( const std::string & comment, const std::string & file, int line );
-
- //@}
- //****************************************************************************************************************
-
-
- //** Interface to GUI *************************************************************************************
- /*! \name Interface to GUI */
- //@{
-
- void createAdaptors( std::vector<DisplayAdaptor*> & out ) const;
-
- const std::vector<shared_ptr<PropertyTree> > & getPropertyTrees() const;
-
- //@}
- //****************************************************************************************************************
-
-
- private:
- DisplayAdaptor * findDisplayAdaptorForBlockID ( ConstBlockDataID bdId ) const;
-
- std::vector<DisplayAdaptorCreatorFunc> displayAdaptorCreatorFuncs_;
-
- timeloop::ITimeloop & timeloop_;
- StructuredBlockForest & blockForest_;
-
- GuiImpl * pImpl;
-
- static GUI * lastInstance_;
- };
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
-
-
-#ifdef WALBERLA_ENABLE_GUI
-
-#define WALBERLA_GUI_BREAKPOINT(msg) {\
- std::ostringstream stringStream;\
- stringStream << msg;\
- ::walberla::gui::GUI::breakpoint(stringStream.str(), __FILE__, __LINE__ ); \
-}
-#else
-
-#define WALBERLA_GUI_BREAKPOINT(msg)
-
-#endif
-
-
-
-//======================================================================================================================
-//
-// EXPORTS
-//
-//======================================================================================================================
-
-namespace walberla {
- using gui::GUI;
-}
diff --git a/src/gui/MainWindow/BlockTreeView.cpp b/src/gui/MainWindow/BlockTreeView.cpp
deleted file mode 100644
index 126cb55dff1a4e387f91d4afc91fe7b96ef1b54f..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/BlockTreeView.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockTreeView.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockTreeView.h"
-#include "GuiUtil.h"
-
-#include "core/debug/Debug.h"
-
-#include <QAction>
-#include <QDebug>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QHeaderView>
-#include <QMenu>
-#include <QMessageBox>
-
-
-namespace walberla {
-namespace gui {
-
-
-
-BlockTreeView::BlockTreeView( const GUI & gui, QWidget * par )
- : QTreeView(par), gui_(gui), block_(0)
-{
- setAcceptDrops(true);
- setAlternatingRowColors(true);
-}
-
-void BlockTreeView::setBlock( IBlock * b )
-{
- block_ = b;
- onDataChange();
-}
-
-void BlockTreeView::setPropTreeModel( shared_ptr<PropertyTree> p )
-{
- propTreeModel_ = p;
- setModel(propTreeModel_->getModel());
- header()->resizeSections(QHeaderView::ResizeToContents);
- onDataChange();
-}
-
-
-void BlockTreeView::onDataChange()
-{
- if(!block_ || !propTreeModel_ )
- return;
-
- propTreeModel_->setBlock(block_);
-}
-
-void BlockTreeView::dragEnterEvent( QDragEnterEvent * ev )
-{
- const QMimeData * md = ev->mimeData();
- md->hasFormat( BLOCK_MIMETYPE ) ? ev->accept() : ev->ignore();
-}
-
-void BlockTreeView::dragMoveEvent( QDragMoveEvent * ev )
-{
- QWidget::dragMoveEvent(ev);
-}
-
-void BlockTreeView::dropEvent( QDropEvent * ev )
-{
- if(ev->source()==this )
- return;
-
- const QMimeData * md = ev->mimeData();
- WALBERLA_ASSERT( md->hasFormat(BLOCK_MIMETYPE) );
-
- QMenu * contextMenu = new QMenu();
-
- uint_t chosenTreeModel=0;
- if( gui_.getPropertyTrees().size() == 0)
- {
- // report that no model was registered
- QMessageBox::warning(this,"Cannot Display Block Information",
- "Cannot Display Block Information - No PropertyTree View registered at GuiManager");
- return;
- }
- else if ( gui_.getPropertyTrees().size() == 1)
- {
- // when there is only one registered model, use it
- chosenTreeModel=0;
- }
- else
- {
- // when more than one model is registered, display a context menu
- for( uint_t i = 0; i < gui_.getPropertyTrees().size(); ++i )
- {
- QAction * a = contextMenu->addAction(QString::fromStdString( gui_.getPropertyTrees()[i]->getName() ) );
- a->setData( QVariant::fromValue(i) );
- }
-
- QAction * chosenOption = contextMenu->exec(mapToGlobal(ev->pos()));
-
- if(!chosenOption)
- return;
-
- bool ok = false;
- chosenTreeModel = chosenOption->data().toUInt(&ok);
- WALBERLA_ASSERT( ok );
- }
-
- void * ptr = getPointerFromMimeData(md,BLOCK_MIMETYPE);
- WALBERLA_ASSERT_NOT_NULLPTR( ptr );
- Block * block = static_cast<Block*>(ptr);
- ev->acceptProposedAction();
- setBlock(block);
-
- // set property tree, create a new copy for this widget
- setPropTreeModel( gui_.getPropertyTrees()[chosenTreeModel]->create() );
-}
-
-
-
-} //namespace gui
-} //namespace walberla
diff --git a/src/gui/MainWindow/BlockTreeView.h b/src/gui/MainWindow/BlockTreeView.h
deleted file mode 100644
index 578e1ae5b18ad596fcac1899df702e5f70db927a..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/BlockTreeView.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file BlockTreeView.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-#include "Gui.h"
-#include "PropertyTree.h"
-#include "domain_decomposition/IBlock.h"
-#endif
-
-#include <QTreeView>
-
-
-namespace walberla {
-namespace gui {
-
-
- class BlockTreeView : public QTreeView
- {
- Q_OBJECT
- public:
- BlockTreeView( const GUI & gui, QWidget * parent = 0 );
- virtual ~BlockTreeView() {}
-
- void setBlock( IBlock * b );
- void setPropTreeModel( shared_ptr<PropertyTree> propTreeModel );
-
- public slots:
- void onDataChange();
-
- protected:
- virtual void dragEnterEvent(QDragEnterEvent * ev);
- virtual void dragMoveEvent(QDragMoveEvent * ev);
- virtual void dropEvent(QDropEvent *ev);
-
- const GUI & gui_;
-
- IBlock * block_;
- shared_ptr<PropertyTree> propTreeModel_;
-
- };
-
-} // namespace gui
-} // namespace walberla
-
diff --git a/src/gui/MainWindow/CMakeLists.txt b/src/gui/MainWindow/CMakeLists.txt
deleted file mode 100644
index 738fda509bde9c6e06b0fce6eafbf18fd96d5e07..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-target_sources( gui
- PRIVATE
- GuiUtil.h
- BlockTreeView.cpp
- BlockTreeView.h
- MainWindow.h
- MainWindow.cpp
- GuiUtil.cpp
- )
diff --git a/src/gui/MainWindow/GuiUtil.cpp b/src/gui/MainWindow/GuiUtil.cpp
deleted file mode 100644
index 9d1306798bc9af408bc4ceca574e22e64c60009c..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/GuiUtil.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file GuiUtil.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "GuiUtil.h"
-#include "qtgradientdialog.h"
-
-#include "core/DataTypes.h"
-#include "core/debug/Debug.h"
-
-#include <QLinearGradient>
-#include <QMimeData>
-#include <QPainter>
-#include <QTreeWidgetItem>
-#include <cassert>
-
-
-namespace walberla {
-namespace gui {
-
-//======================================================================================================================
-//
-// MIME DATA PACKING/UNPACKING USED FOR DRAG & DROP
-//
-//======================================================================================================================
-
-
-
-QMimeData * createMimeDataFromPointer(void * p, const QString & role)
-{
- QMimeData * data = new QMimeData();
-
- QByteArray d;
- QDataStream s( &d, QIODevice::Unbuffered | QIODevice::ReadWrite );
-
-
- int bytesWritten = s.writeRawData( ( const char * ) & p, int_c( sizeof( void * ) ) );
- WALBERLA_ASSERT_EQUAL( bytesWritten, sizeof( void*) );
- WALBERLA_UNUSED(bytesWritten);
-
- data->setData( role, d );
-
- return data;
-}
-
-void * getPointerFromMimeData(const QMimeData *data, const QString& type)
-{
- if( !data || !data->hasFormat( type ) )
- return 0;
-
- QByteArray d( data->data( type ) );
- QDataStream s (d);
-
- void * ptr = 0;
-
-
- int bytesRead = s.readRawData( (char*)&ptr, int_c( sizeof( void * ) ) );
- WALBERLA_ASSERT_EQUAL( bytesRead, sizeof(void*) );
- WALBERLA_UNUSED(bytesRead);
-
- return ptr;
-}
-
-
-
-
-//======================================================================================================================
-//
-// GRADIENT SELECTION
-//
-//======================================================================================================================
-
-const QLinearGradient & getDefaultColormap()
-{
- static bool firstRun=true;
- static QLinearGradient ret;
- if(!firstRun)
- return ret;
-
-
- firstRun = false;
- ret.setColorAt(1.0,QColor(0,0,255));
- ret.setColorAt(0.5,QColor(0,255,0));
- ret.setColorAt(0,QColor(255,255,255));
-
- return ret;
-}
-
-bool showColormapSelect(QLinearGradient & grad)
-{
- bool ok=false;
-
- QGradient newColorMap = QtGradientDialog::getGradient(&ok,grad,0,"Select Color Map" );
- if(!ok)
- return false;
-
- QLinearGradient lastGrad;
- QLinearGradient colorMapGradient(0,0,100,0);
- for(int i=0; i< newColorMap.stops().size(); ++i)
- colorMapGradient.setColorAt(newColorMap.stops()[i].first, newColorMap.stops()[i].second );
-
- grad = colorMapGradient;
-
-
- return true;
-}
-
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
diff --git a/src/gui/MainWindow/GuiUtil.h b/src/gui/MainWindow/GuiUtil.h
deleted file mode 100644
index b71064ef8316e7948bc36070eb93c1dd27ea1958..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/GuiUtil.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file GuiUtil.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//! \brief Utility functions for Qt GUI
-//
-//======================================================================================================================
-
-#pragma once
-
-#include <QComboBox>
-#include <QString>
-#include <QVariant>
-
-
-//Forward Declarations
-class QMimeData;
-class QLinearGradient;
-class QTreeWidgetItem;
-
-
-namespace walberla {
-namespace gui {
-
-
-
- //===================================================================================================================
- //
- // MIME DATA PACKING/UNPACKING USED FOR DRAG & DROP
- //
- //===================================================================================================================
-
- /// Application specific MIME type, encoding a blockforest::Block pointer
- const QString BLOCK_MIMETYPE = "application/BlockPointer";
-
- /// Packs an arbitrary pointer in a QMimeData object
- QMimeData * createMimeDataFromPointer(void * p, const QString & role);
-
- /// Retrieves pointer from QMimeData, which was packed using createMimeDataFromPointer()
- void * getPointerFromMimeData (const QMimeData *data, const QString& type);
-
-
-
- template<class T>
- class VPtr
- {
- public:
- static T* asPtr( QVariant v ) {
- return (T *) v.value<void *> ();
- }
-
- static QVariant asQVariant( T* ptr ) {
- return qVariantFromValue ( (void *) ptr );
- }
- };
-
-
-
- //===================================================================================================================
- //
- // GRADIENT SELECTION
- //
- //===================================================================================================================
-
-
- //*******************************************************************************************************************
- /*!\brief Shows a gradient selection dialog
- *
- * \ingroup gui
- *
- * \param[out] grad The selected gradient
- * \return false if the user canceled the selection
- *******************************************************************************************************************/
- bool showColormapSelect(QLinearGradient & grad);
- const QLinearGradient & getDefaultColormap();
-
-
-
-
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
diff --git a/src/gui/MainWindow/MainWindow.cpp b/src/gui/MainWindow/MainWindow.cpp
deleted file mode 100644
index ef257f20977f0be7af586fd52bc568515213ab01..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/MainWindow.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file MainWindow.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "BlockSliceView.h"
-#include "BlockTreeView.h"
-#include "BlockViewText.h"
-#include "CMakeDefs.h"
-#include "MainWindow.h"
-
-#include "core/DataTypes.h"
-
-#include <QDebug>
-#include <QMdiSubWindow>
-#include <QMessageBox>
-#include <QSettings>
-
-
-#ifdef WALBERLA_GUI_USE_3D_BLOCKVIEW
-#include "BlockView3D.h"
-#endif
-
-
-extern int qInitResources_icons();
-
-namespace walberla {
-namespace gui {
-
-
-MainWindow::MainWindow(timeloop::ITimeloop & timeloop, StructuredBlockForest & blockForest, const GUI & gui)
- : timeloop_(timeloop), blockForest_(blockForest), gui_(gui)
-{
- // loading resources that are placed in library
- ::qInitResources_icons();
-
- ui.setupUi(this);
-
- ui.cmdContinue->setDefaultAction( ui.actionContinue );
- connect( &timer, SIGNAL(timeout()), this, SLOT(simulationTimerEvent()));
-
-
-#ifdef WALBERLA_GUI_USE_3D_BLOCKVIEW
- // Block View 3D
- BlockView3D * blockView3D = new BlockView3D();
- sliceChangeListener_ = blockView3D;
- ui.dockBlocks3D->setWidget( blockView3D );
- blockView3D->setup( &blockForest.getBlockForest() );
- connect( this, SIGNAL( blockforestChanged() ), blockView3D, SLOT(onBlockForestChange() ) );
-#else
- delete ui.dockBlocks3D;
- sliceChangeListener_ = NULL;
-#endif
-
-
- // Block View Text
- BlockViewText * blockViewText = new BlockViewText();
- ui.dockBlocksText->setWidget( blockViewText );
- blockViewText->setup ( &blockForest.getBlockForest() );
- connect( this, SIGNAL( blockforestChanged() ), blockViewText, SLOT(onBlockForestChange() ) );
-
-
- QSettings settings;
- settings.beginGroup("MainWindowState");
- QByteArray d = settings.value("mainwindow").toByteArray();
- if(d.size() > 0)
- restoreState(d);
- settings.endGroup();
-
- blockForestModificationStamp_ = blockForest_.getBlockForest().getModificationStamp();
-}
-
-
-void MainWindow::checkForBlockforestChange()
-{
- uint_t currentBfStamp = blockForest_.getBlockForest().getModificationStamp();
- if ( blockForestModificationStamp_ != currentBfStamp ) {
- blockForestModificationStamp_ = currentBfStamp;
- emit blockforestChanged();
- }
-}
-
-
-void MainWindow::closeEvent(QCloseEvent * e)
-{
- // Destroy BlockSliceView before the BlockView3D
- // -> make sure slice indicators are unregistered before BlockView3D is destroyed
- ui.mdiArea->closeAllSubWindows();
-
- QSettings settings;
- settings.beginGroup("MainWindowState");
- settings.setValue("mainwindow", saveState());
- settings.endGroup();
-
- QMainWindow::closeEvent(e);
-}
-
-
-void MainWindow::on_actionNewGridView_triggered()
-{
- QWidget *par = new QWidget();
-
- BlockSliceView * widget = new BlockSliceView( blockForest_, gui_, ui.propertyStack, sliceChangeListener_ );
-
- connect(this, SIGNAL(dataChanged()),
- widget, SLOT( redraw()) );
-
- QVBoxLayout * boxLayout = new QVBoxLayout(par);
- boxLayout->addWidget( widget );
-
- QMdiSubWindow *win = ui.mdiArea->addSubWindow( par );
- win->setWindowTitle("Grid View");
-
- win->resize( QSize(1200,600) );
-
- par->show();
- widget->show();
-}
-
-
-
-void MainWindow::on_actionNewTreeView_triggered()
-{
-
- QWidget *par = new QWidget();
-
- BlockTreeView * widget = new BlockTreeView( gui_ );
-
- connect(this, SIGNAL(dataChanged()),
- widget, SLOT(onDataChange()) );
-
-
- QVBoxLayout * boxLayout = new QVBoxLayout(par);
- boxLayout->addWidget(widget);
-
- QMdiSubWindow *win = ui.mdiArea->addSubWindow(par);
- win->setWindowTitle("Tree View");
-
- win->resize(QSize(600,800));
-
- par->show();
- widget->show();
-}
-
-void MainWindow::on_inpTimerInterval_valueChanged(int newValue)
-{
- timer.stop();
- timer.start(newValue);
-}
-
-
-void MainWindow::simulationTimerEvent()
-{
- simulate(1);
-}
-
-void MainWindow::on_actionRun_triggered(bool newState)
-{
- if(newState)
- {
- timer.start(ui.inpTimerInterval->value());
- ui.actionPause->setChecked(false);
- }
- else
- ui.actionRun->setChecked(true); //displayed with Pause-action
-}
-
-void MainWindow::on_actionPause_triggered(bool newState)
-{
- if(newState)
- {
- ui.actionRun->setChecked(false);
- timer.stop();
- }
- else
- ui.actionPause->setChecked(true);
-}
-
-void MainWindow::on_actionForward_triggered()
-{
- simulate( uint_c( ui.spnTimeStepsForward->value() ) );
-}
-
-void MainWindow::on_actionFastForward_triggered()
-{
- simulate( uint_c( ui.spnTimeStepsFastForward->value() ) );
-}
-
-
-
-void MainWindow::simulate(uint_t numTimeSteps)
-{
- try
- {
- for(uint_t i=0; i<numTimeSteps; ++i) {
- timeloop_.singleStep();
- ui.lblTimestepsExecuted->setText( QString("%1").arg( timeloop_.getCurrentTimeStep() ) );
- QApplication::instance()->processEvents();
- if ( ui.chkUpdateView->checkState() == Qt::Checked ) {
- emit dataChanged();
- checkForBlockforestChange();
- }
- }
- if ( ui.chkUpdateView->checkState() != Qt::Checked ) {
- emit dataChanged();
- checkForBlockforestChange();
- }
- }
- catch ( std::exception & e )
- {
- QMessageBox::critical( NULL, "Runtime Error", QString::fromStdString( e.what() ) );
- timer.stop();
- }
- checkForBlockforestChange();
-}
-
-
-
-
-void MainWindow::breakpoint( const QString & message, const QString & file, int lineNr )
-{
- // Check if breakpoint is activated
- if ( ui.chkOnlyTimestep->isChecked() )
- {
- if ( int_c( timeloop_.getCurrentTimeStep() ) != ui.spnOnlyTimestep->value() )
- return;
- }
- if ( ui.chkOnlyLocation->isChecked() )
- {
- if ( ! ui.txtOnlyLocation->text().isEmpty() &&
- file.contains( ui.txtOnlyLocation->text(), Qt::CaseInsensitive ) )
- return;
- }
-
- ui.actionForward->setEnabled( false );
- ui.actionFastForward->setEnabled( false );
- ui.actionRun->setEnabled( false );
- ui.actionPause->setEnabled( false );
-
- QPalette pal = ui.dockBreakpoints->palette();
- pal.setColor(ui.dockBreakpoints->backgroundRole(), Qt::red);
- ui.dockBreakpoints->setPalette(pal);
- ui.dockBreakpoints->raise();
-
-
- ui.actionContinue->setEnabled( true );
-
-
- ui.lblBreakpointMsg->setText( message );
- ui.lblLocation->setText( QString("%1 : %2").arg(file).arg(lineNr) );
-
-
- QEventLoop eventLoop;
- QObject::connect( ui.actionContinue, SIGNAL( triggered() ), &eventLoop, SLOT(quit()) );
- emit dataChanged();
- eventLoop.exec();
-
- pal = ui.dockBreakpoints->palette();
- pal.setColor(ui.dockBreakpoints->backgroundRole(), Qt::gray);
- ui.dockBreakpoints->setPalette(pal);
-
-
- ui.lblBreakpointMsg->setText( "" );
- ui.lblLocation->setText( "" );
- ui.actionContinue->setEnabled( false );
-
- ui.actionForward->setEnabled( true );
- ui.actionFastForward->setEnabled( true );
- ui.actionRun->setEnabled( true );
- ui.actionPause->setEnabled( true );
-}
-
-
-
-
-} // namespace gui
-} // namespace walberla
-
diff --git a/src/gui/MainWindow/MainWindow.h b/src/gui/MainWindow/MainWindow.h
deleted file mode 100644
index 41595aaf290f09af036e1afc33932ea164f640c4..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/MainWindow.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file MainWindow.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#ifndef Q_MOC_RUN
-
-#include "Gui.h"
-#include "ISliceChangeListener.h"
-#include "ui_MainWindow.h"
-
-#include "blockforest/StructuredBlockForest.h"
-
-#include "field/GhostLayerField.h"
-#include "timeloop/ITimeloop.h"
-#endif
-
-#include <QListWidget>
-#include <QMainWindow>
-#include <QMdiSubWindow>
-#include <QTimer>
-
-
-namespace walberla {
-namespace gui {
-
-
- //*******************************************************************************************************************
- /*!
- * The main window of the GUI
- *
- * \ingroup gui
- *
- * To setup the window the MainWindow.ui file is used.
- */
- //*******************************************************************************************************************
- class MainWindow : public QMainWindow
- {
- Q_OBJECT
-
- public:
- MainWindow(timeloop::ITimeloop & timeloop, StructuredBlockForest & blockForest, const GUI & gui );
-
- virtual ~MainWindow() {}
-
- signals:
- /// Emitted after simulation progressed and updated data are available
- void dataChanged();
- void blockforestChanged();
-
- public slots:
- void simulate( uint_t numTimeSteps );
-
- void breakpoint( const QString & message, const QString & file, int lineNr );
-
- private slots:
-
- void simulationTimerEvent();
-
- // The following slots have "magic" names so that they are automatically connected
- // by the "ui.setupUi(this)" call
- void on_actionNewGridView_triggered();
- void on_actionNewTreeView_triggered();
- void on_actionRun_triggered(bool);
- void on_actionPause_triggered(bool);
- void on_actionForward_triggered();
- void on_actionFastForward_triggered();
- void on_inpTimerInterval_valueChanged(int);
-
- protected:
- virtual void closeEvent( QCloseEvent * e);
-
- private:
- void checkForBlockforestChange();
-
- Ui::MainWindow ui;
- ISliceChangeListener * sliceChangeListener_;
-
- QTimer timer;
-
- timeloop::ITimeloop & timeloop_;
- StructuredBlockForest & blockForest_;
- uint_t blockForestModificationStamp_;
- const GUI & gui_;
- };
-
-} // namespace gui
-} // namespace walberla
-
-
diff --git a/src/gui/MainWindow/MainWindow.ui b/src/gui/MainWindow/MainWindow.ui
deleted file mode 100644
index 1dd340b6b2d358ccc75ebb67f7b68fac4d7707bf..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/MainWindow.ui
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>1432</width>
- <height>923</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>walberla GUI</string>
- </property>
- <property name="windowIcon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/MolecularDynamics.png</normaloff>:/icons/resources/MolecularDynamics.png</iconset>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QMdiArea" name="mdiArea"/>
- </item>
- </layout>
- </widget>
- <widget class="QMenuBar" name="menubar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>1432</width>
- <height>21</height>
- </rect>
- </property>
- <widget class="QMenu" name="menuFile">
- <property name="title">
- <string>File</string>
- </property>
- <widget class="QMenu" name="menuOtherConfigs">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="title">
- <string>Other Configs</string>
- </property>
- <addaction name="actionExample_Entry"/>
- </widget>
- <addaction name="actionOpenTestcase"/>
- <addaction name="actionSaveConfig"/>
- <addaction name="actionSaveConfigAs"/>
- <addaction name="menuOtherConfigs"/>
- <addaction name="separator"/>
- <addaction name="actionSaveVTKFile"/>
- <addaction name="separator"/>
- <addaction name="actionExit"/>
- </widget>
- <widget class="QMenu" name="menuControl">
- <property name="title">
- <string>Control</string>
- </property>
- <addaction name="actionForward"/>
- <addaction name="actionFastForward"/>
- <addaction name="separator"/>
- <addaction name="separator"/>
- <addaction name="actionRun"/>
- <addaction name="actionPause"/>
- <addaction name="separator"/>
- </widget>
- <widget class="QMenu" name="menuViews">
- <property name="title">
- <string>Views</string>
- </property>
- <addaction name="actionNewGridView"/>
- <addaction name="separator"/>
- <addaction name="actionTile"/>
- <addaction name="actionCascade"/>
- <addaction name="actionFullscreen"/>
- </widget>
- <addaction name="menuFile"/>
- <addaction name="menuControl"/>
- <addaction name="menuViews"/>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- <widget class="QToolBar" name="controlBar">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="windowTitle">
- <string>toolBar</string>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="toolBarArea">
- <enum>TopToolBarArea</enum>
- </attribute>
- <attribute name="toolBarBreak">
- <bool>false</bool>
- </attribute>
- <addaction name="actionRun"/>
- <addaction name="actionPause"/>
- <addaction name="actionForward"/>
- <addaction name="actionFastForward"/>
- <addaction name="separator"/>
- <addaction name="actionNewGridView"/>
- <addaction name="actionNewTreeView"/>
- <addaction name="actionContinue"/>
- </widget>
- <widget class="QDockWidget" name="dockBlocks3D">
- <property name="windowTitle">
- <string>Blocks (3D View)</string>
- </property>
- <attribute name="dockWidgetArea">
- <number>2</number>
- </attribute>
- <widget class="QWidget" name="dockWidgetContents_3">
- <layout class="QVBoxLayout" name="verticalLayout_4"/>
- </widget>
- </widget>
- <widget class="QDockWidget" name="dockControl">
- <property name="windowTitle">
- <string>Control</string>
- </property>
- <attribute name="dockWidgetArea">
- <number>2</number>
- </attribute>
- <widget class="QWidget" name="dockWidgetContents_2">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="4" column="1">
- <widget class="QLabel" name="lblTimestepsExecuted">
- <property name="text">
- <string>0</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spnTimeStepsForward">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>9999999</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Timesteps executed:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="inpTimerInterval">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>999999999</number>
- </property>
- <property name="singleStep">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Timer Interval</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Forward Time-Steps:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spnTimeStepsFastForward">
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>9999999</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Fast Forward Time-Steps:</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0" colspan="2">
- <widget class="QCheckBox" name="chkUpdateView">
- <property name="text">
- <string>Update View after each timestep</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QDockWidget" name="dockSliceProperties">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="windowTitle">
- <string>Grid View Properties</string>
- </property>
- <attribute name="dockWidgetArea">
- <number>2</number>
- </attribute>
- <widget class="QWidget" name="dockWidgetContents">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QStackedWidget" name="propertyStack">
- <widget class="QWidget" name="page"/>
- <widget class="QWidget" name="page_2"/>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QDockWidget" name="dockBreakpoints">
- <property name="floating">
- <bool>false</bool>
- </property>
- <property name="windowTitle">
- <string>Breakpoints</string>
- </property>
- <attribute name="dockWidgetArea">
- <number>2</number>
- </attribute>
- <widget class="QWidget" name="dockWidgetContents_4">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QCheckBox" name="chkOnlyTimestep">
- <property name="text">
- <string>Only in Timestep</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spnOnlyTimestep">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>999999</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="chkOnlyLocation">
- <property name="text">
- <string>File has to contain:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="txtOnlyLocation">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Location:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="lblLocation">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Messsage</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="lblBreakpointMsg">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QToolButton" name="cmdContinue">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>35</height>
- </size>
- </property>
- <property name="text">
- <string>Continue</string>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/start-here.png</normaloff>:/icons/resources/start-here.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>24</width>
- <height>243</height>
- </size>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QDockWidget" name="dockBlocksText">
- <property name="windowTitle">
- <string>Blocks (Text)</string>
- </property>
- <attribute name="dockWidgetArea">
- <number>2</number>
- </attribute>
- <widget class="QWidget" name="dockWidgetContents_5"/>
- </widget>
- <action name="actionSaveParticleFile">
- <property name="icon">
- <iconset>
- <normaloff>:/qwt3d_images/scattered.png</normaloff>:/qwt3d_images/scattered.png</iconset>
- </property>
- <property name="text">
- <string>Save Particle File...</string>
- </property>
- </action>
- <action name="actionSaveVTKFile">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/paraview.png</normaloff>:/icons/resources/paraview.png</iconset>
- </property>
- <property name="text">
- <string>Save VTK File...</string>
- </property>
- </action>
- <action name="actionExit">
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/application-exit.png</normaloff>:/icons/resources/application-exit.png</iconset>
- </property>
- <property name="text">
- <string>Exit</string>
- </property>
- </action>
- <action name="actionOpenTestcase">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/document-open.png</normaloff>:/icons/resources/document-open.png</iconset>
- </property>
- <property name="text">
- <string>Open Testcase...</string>
- </property>
- </action>
- <action name="actionForward">
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/1rightarrow.png</normaloff>:/icons/resources/1rightarrow.png</iconset>
- </property>
- <property name="text">
- <string>Forward</string>
- </property>
- </action>
- <action name="actionFastForward">
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/2rightarrow.png</normaloff>:/icons/resources/2rightarrow.png</iconset>
- </property>
- <property name="text">
- <string>Fast Forward</string>
- </property>
- <property name="toolTip">
- <string>Do Multiple TimeSteps</string>
- </property>
- </action>
- <action name="actionRun">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/media-playback-start.png</normaloff>:/icons/resources/media-playback-start.png</iconset>
- </property>
- <property name="text">
- <string>Run</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+R</string>
- </property>
- </action>
- <action name="actionPause">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/media-playback-pause.png</normaloff>:/icons/resources/media-playback-pause.png</iconset>
- </property>
- <property name="text">
- <string>Pause</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+P</string>
- </property>
- </action>
- <action name="actionTile">
- <property name="text">
- <string>Tile</string>
- </property>
- </action>
- <action name="actionCascade">
- <property name="text">
- <string>Cascade</string>
- </property>
- </action>
- <action name="actionNewGridView">
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/media_playlist.png</normaloff>:/icons/resources/media_playlist.png</iconset>
- </property>
- <property name="text">
- <string>New Grid View</string>
- </property>
- </action>
- <action name="actionSaveConfigAs">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/document-save-as.png</normaloff>:/icons/resources/document-save-as.png</iconset>
- </property>
- <property name="text">
- <string>Save Config As</string>
- </property>
- </action>
- <action name="actionSaveConfig">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/document-save.png</normaloff>:/icons/resources/document-save.png</iconset>
- </property>
- <property name="text">
- <string>Save Config</string>
- </property>
- </action>
- <action name="actionFullscreen">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/media_playlist.png</normaloff>:/icons/resources/media_playlist.png</iconset>
- </property>
- <property name="text">
- <string>Fullscreen</string>
- </property>
- <property name="shortcut">
- <string>Ctrl+F</string>
- </property>
- </action>
- <action name="actionExample_Entry">
- <property name="text">
- <string>Example Entry</string>
- </property>
- </action>
- <action name="actionNewTreeView">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/messagebox_info.png</normaloff>:/icons/resources/messagebox_info.png</iconset>
- </property>
- <property name="text">
- <string>New Tree View</string>
- </property>
- </action>
- <action name="actionContinue">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="icon">
- <iconset resource="icons.qrc">
- <normaloff>:/icons/resources/start-here.png</normaloff>:/icons/resources/start-here.png</iconset>
- </property>
- <property name="text">
- <string>Continue</string>
- </property>
- <property name="shortcut">
- <string>F5</string>
- </property>
- </action>
- </widget>
- <resources>
- <include location="icons.qrc"/>
- <include location="icons.qrc"/>
- </resources>
- <connections>
- <connection>
- <sender>actionExit</sender>
- <signal>triggered()</signal>
- <receiver>MainWindow</receiver>
- <slot>close()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>-1</x>
- <y>-1</y>
- </hint>
- <hint type="destinationlabel">
- <x>399</x>
- <y>299</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>chkOnlyLocation</sender>
- <signal>toggled(bool)</signal>
- <receiver>txtOnlyLocation</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>1078</x>
- <y>583</y>
- </hint>
- <hint type="destinationlabel">
- <x>1291</x>
- <y>583</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>chkOnlyTimestep</sender>
- <signal>toggled(bool)</signal>
- <receiver>spnOnlyTimestep</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>1078</x>
- <y>556</y>
- </hint>
- <hint type="destinationlabel">
- <x>1291</x>
- <y>556</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/src/gui/MainWindow/icons.qrc b/src/gui/MainWindow/icons.qrc
deleted file mode 100644
index d8803c4c222412f0be8d66eecdedf47db018c5dd..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/icons.qrc
+++ /dev/null
@@ -1,22 +0,0 @@
-<RCC>
- <qresource prefix="icons">
- <file>resources/paraview.png</file>
- <file>resources/1rightarrow.png</file>
- <file>resources/2rightarrow.png</file>
- <file>resources/application-exit.png</file>
- <file>resources/dialog_cancel.png</file>
- <file>resources/dialog_close.png</file>
- <file>resources/document-open.png</file>
- <file>resources/document-properties.png</file>
- <file>resources/document-save-as.png</file>
- <file>resources/document-save.png</file>
- <file>resources/info.png</file>
- <file>resources/media-playback-pause.png</file>
- <file>resources/media-playback-start.png</file>
- <file>resources/media_playlist.png</file>
- <file>resources/messagebox_info.png</file>
- <file>resources/MolecularDynamics.png</file>
- <file>resources/start-here.png</file>
- <file>resources/view-refresh.png</file>
- </qresource>
-</RCC>
diff --git a/src/gui/MainWindow/icons.qrc.depends b/src/gui/MainWindow/icons.qrc.depends
deleted file mode 100644
index d8803c4c222412f0be8d66eecdedf47db018c5dd..0000000000000000000000000000000000000000
--- a/src/gui/MainWindow/icons.qrc.depends
+++ /dev/null
@@ -1,22 +0,0 @@
-<RCC>
- <qresource prefix="icons">
- <file>resources/paraview.png</file>
- <file>resources/1rightarrow.png</file>
- <file>resources/2rightarrow.png</file>
- <file>resources/application-exit.png</file>
- <file>resources/dialog_cancel.png</file>
- <file>resources/dialog_close.png</file>
- <file>resources/document-open.png</file>
- <file>resources/document-properties.png</file>
- <file>resources/document-save-as.png</file>
- <file>resources/document-save.png</file>
- <file>resources/info.png</file>
- <file>resources/media-playback-pause.png</file>
- <file>resources/media-playback-start.png</file>
- <file>resources/media_playlist.png</file>
- <file>resources/messagebox_info.png</file>
- <file>resources/MolecularDynamics.png</file>
- <file>resources/start-here.png</file>
- <file>resources/view-refresh.png</file>
- </qresource>
-</RCC>
diff --git a/src/gui/MainWindow/resources/1rightarrow.png b/src/gui/MainWindow/resources/1rightarrow.png
deleted file mode 100755
index 87517051fd83b81ebfc48201631bec5b5f436557..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/1rightarrow.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/2rightarrow.png b/src/gui/MainWindow/resources/2rightarrow.png
deleted file mode 100755
index aec5aded8a6bac50984c3ec0782f90c13e8c4a89..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/2rightarrow.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/MolecularDynamics.png b/src/gui/MainWindow/resources/MolecularDynamics.png
deleted file mode 100644
index 624850629b83a5f961e8365aa4debdee622a26a6..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/MolecularDynamics.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/application-exit.png b/src/gui/MainWindow/resources/application-exit.png
deleted file mode 100644
index dd76354c4a49d07e81d9e701164cdc2caa439a47..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/application-exit.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/dialog_cancel.png b/src/gui/MainWindow/resources/dialog_cancel.png
deleted file mode 100755
index fd285bc5c0b0342ebbac2dd5339e191d1ef18ef0..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/dialog_cancel.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/dialog_close.png b/src/gui/MainWindow/resources/dialog_close.png
deleted file mode 100755
index 8d7f19f2bfaeebc8e3b7d043f7cf9a4996a927e2..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/dialog_close.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/document-open.png b/src/gui/MainWindow/resources/document-open.png
deleted file mode 100644
index 7422ad3338bb73f8a30502c3eb830be527c06c98..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/document-open.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/document-properties.png b/src/gui/MainWindow/resources/document-properties.png
deleted file mode 100644
index 5b43ef7eea9927afbe3c6c2feebece02b39267df..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/document-properties.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/document-save-as.png b/src/gui/MainWindow/resources/document-save-as.png
deleted file mode 100644
index 9695a56424eda300496caf56addc00657abfbc75..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/document-save-as.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/document-save.png b/src/gui/MainWindow/resources/document-save.png
deleted file mode 100644
index 7fa489c0fe615ddfa1d1f8dae1de37c8ed858dcd..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/document-save.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/flagIcons/fluid.png b/src/gui/MainWindow/resources/flagIcons/fluid.png
deleted file mode 100644
index 0c964da1c010a194e90f62dd622da2495ff911e2..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/flagIcons/fluid.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/info.png b/src/gui/MainWindow/resources/info.png
deleted file mode 100644
index 2658ccad17c3fb88f459a85f912644bc5c6404e8..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/info.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/media-playback-pause.png b/src/gui/MainWindow/resources/media-playback-pause.png
deleted file mode 100644
index 5c7d128ee8728707a6193eb41af32b4e28890533..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/media-playback-pause.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/media-playback-start.png b/src/gui/MainWindow/resources/media-playback-start.png
deleted file mode 100644
index 71906857cf42f082c70e96737cd9f80ec35bd43f..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/media-playback-start.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/media_playlist.png b/src/gui/MainWindow/resources/media_playlist.png
deleted file mode 100755
index 99a4d2aaeab1916c68ea12e1e401e3dd0565517d..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/media_playlist.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/messagebox_info.png b/src/gui/MainWindow/resources/messagebox_info.png
deleted file mode 100755
index 9b730e31c5cef3e732349b399b7c04f6ff9224f7..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/messagebox_info.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/paraview.png b/src/gui/MainWindow/resources/paraview.png
deleted file mode 100644
index f6698ed5c5d705d685be839b85c7af94f3e2450c..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/paraview.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/start-here.png b/src/gui/MainWindow/resources/start-here.png
deleted file mode 100644
index a5f62af1f67410f59ccbd4ba61e74b29e5e8d498..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/start-here.png and /dev/null differ
diff --git a/src/gui/MainWindow/resources/view-refresh.png b/src/gui/MainWindow/resources/view-refresh.png
deleted file mode 100644
index afa2a9d77403a12cf6808fd4e551f8582e2599d6..0000000000000000000000000000000000000000
Binary files a/src/gui/MainWindow/resources/view-refresh.png and /dev/null differ
diff --git a/src/gui/PropertyTree.cpp b/src/gui/PropertyTree.cpp
deleted file mode 100644
index a6dd79d5c01650e95c2c7803edb1ff3a79203ad4..0000000000000000000000000000000000000000
--- a/src/gui/PropertyTree.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PropertyTree.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "PropertyTree.h"
-#include "core/debug/Debug.h"
-
-
-#ifdef WALBERLA_ENABLE_GUI
-
-namespace walberla {
-namespace gui {
-
-
- PropertyTree::PropertyTree()
- : model_(0),lastBlock_(0)
- {
- model_ = new QStandardItemModel();
- model_->setColumnCount(2);
- }
-
-
- PropertyTree::~PropertyTree()
- {
- delete model_;
- }
-
-
- void PropertyTree::setBlock( IBlock * b)
- {
- if(b != lastBlock_)
- {
- model_->clear();
- this->clear();
- }
- lastBlock_ = b;
- fillTree(b);
- }
-
- PropertyTree::ItemID PropertyTree::addItem(const std::string & name, ItemID parent)
- {
- if(!parent)
- parent = model_->invisibleRootItem();
-
- WALBERLA_ASSERT_NOT_NULLPTR( parent );
-
- QStandardItem * firstCol = new QStandardItem(QString::fromStdString(name) );
- QStandardItem * secondCol = new QStandardItem("");
- firstCol->setEditable(false);
- secondCol->setEditable(false);
-
- parent->appendRow(QList<ItemID>() << firstCol << secondCol);
-
- return firstCol;
- }
-
- template <>
- PropertyTree::ItemID PropertyTree::addItem(const std::string & name,const std::string & val, ItemID parent)
- {
- if(!parent)
- parent = model_->invisibleRootItem();
-
- QStandardItem * firstCol = new QStandardItem(QString::fromStdString(name));
- QStandardItem * secondCol = new QStandardItem(QString::fromStdString(val));
- firstCol->setEditable(false);
- secondCol->setEditable(false);
- parent->appendRow(QList<ItemID>() << firstCol << secondCol );
-
- return firstCol;
- }
-
-
- template <>
- void PropertyTree::modifyItem(const std::string & name, const std::string & val, ItemID id)
- {
- id->setText(QString::fromStdString(name));
- model_->item(id->row(),1)->setText(QString::fromStdString(val));
- }
-
- template <>
- void PropertyTree::modifyItem(const std::string & val, ItemID id)
- {
- model_->item(id->row(),1)->setText(QString::fromStdString(val));
- }
-
-
- void PropertyTree::removeItem(ItemID id)
- {
- QStandardItem * parent = id->parent();
- // due to a Qt Bug or (feature?!) parent is null when it should be invisibleRootItem
- if ( ! parent )
- parent = model_->invisibleRootItem();
-
- parent->removeRow(id->row() );
- }
-} // namespace gui
-} // namespace walberla
-
-#else
-
-namespace walberla {
-namespace gui {
- PropertyTree::PropertyTree()
- : model_(nullptr), lastBlock_(nullptr)
- {}
-
-
- PropertyTree::~PropertyTree()
- = default;
-
-
- void PropertyTree::setBlock( IBlock * a)
- {
- //dummy to prevent lastBlock_ not used
- lastBlock_ = a;
- }
-
- void PropertyTree::removeItem(ItemID )
- {
- }
-
- PropertyTree::ItemID PropertyTree::addItem(const std::string & , ItemID )
- {
- return nullptr;
- }
-} // namespace gui
-} // namespace walberla
-
-#endif
-
-
-
-
diff --git a/src/gui/PropertyTree.h b/src/gui/PropertyTree.h
deleted file mode 100644
index 30bb247e3ccbe156e0b87e452daf9c8d2f1fa3eb..0000000000000000000000000000000000000000
--- a/src/gui/PropertyTree.h
+++ /dev/null
@@ -1,193 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PropertyTree.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//! \brief Interface for displaying tree based key-value information
-//
-//======================================================================================================================
-
-#pragma once
-
-
-
-class QStandardItemModel;
-class QStandardItem;
-
-#include "domain_decomposition/IBlock.h"
-#include <string>
-
-namespace walberla {
-namespace gui {
-
- /**
- * Interface for providing Key-Value pairs for Qt Tree/List Views
- *
- * \ingroup gui
- *
- * Usage:
- * - Subclass from PropertyTree and implement abstract methods
- * - use fillTree() method to provide data using the protected methods addItem
- * - the returned ItemID's can be used to modify, remove and add children to the item
- * (modifyItem(), removeItem(), addItem() )
- * - PropertyTree's can be registered in the gui::Manager for display
- */
- class PropertyTree
- {
- public:
-
-# ifdef WALBERLA_ENABLE_GUI
- typedef QStandardItem* ItemID;
-# else
- using ItemID = void *;
-# endif
-
- PropertyTree();
- virtual ~PropertyTree();
-
- /************** @name Methods used by gui to retrieve data ********************************/
- //@{
-
- /**
- * Updates Model, using given block
- *
- * This method is called by gui when a different block should be displayed,
- * or the data inside a block has changed.
- * Should not be changed by subclasses
- */
- void setBlock( IBlock * b);
-
- /**
- * Retrieves the Qt Model Data structure
- *
- * used by gui, do not change in subclass
- */
- QStandardItemModel * getModel() { return model_; }
-
- /**
- * Returns name/type of data of this model
- *
- * When multiple PropertyTrees have been registered
- * the user can choose which data to display using this name
- */
- virtual const std::string getName() = 0;
-
- /**
- * Virtual constructor
- *
- * a new object has to be instantiated for each opened treeView
- * that displays this model
- * In the implementation just return "make_shared<YourDerivedClass>()"
- */
- virtual shared_ptr<PropertyTree> create() const = 0;
-
- //@}
- protected:
-
- /************** @name Abstract Methods **************************************************/
- //@{
-
- /**
- * Method to fill the tree
- *
- * This method is called whenever the data in the block may have changed
- * or the block itself has changed. The first time fillTree is called add
- * your display data using addItem and store the ItemIDs.
- * On the next call, change the value of the items using modifyItem
- * If the block is not the same as on the last call, clear() is called
- * between the two fillTree invocations. In the clear method the saved ItemID's
- * can be deleted
- */
- virtual void fillTree( IBlock * b ) = 0;
-
- /**
- * Removes all data from the Property Tree
- *
- * This method should restore the object to its initial state
- * i.e. delete all stored data, usually the ItemID's
- * see also fillTree()
- */
- virtual void clear() = 0;
-
- //@}
-
-
- /************** @name Methods to add Data ********************************************/
- //@{
- /**
- * Adds property value pair to the tree
- * @param name the string that appears in the first column of the treeView
- * @param val value that appears in the second column
- * T can be every type that QString.arg() accepts
- * i.e. all native data types and std::string;
- * @param parent key-value pairs can be organized hierarchically, here an ItemID
- * of another item can be specified, which is used as parent
- * @return identifier for this item which can be used to modify/remove this item or
- * to add children
- */
- template <typename T>
- ItemID addItem(const std::string & name, const T & val, ItemID parent=nullptr);
-
- /**
- * Convenience method, behaves like addItem above with no value -> empty second column
- */
- ItemID addItem(const std::string & name, ItemID parent=nullptr);
-
- /**
- * Changes an existing item
- *
- * Store the ItemID's between fillTree calls, to modify items instead of
- * clearing and new adding, since otherwise the TreeView is reset after each timestep
- * and expansion states etc. are lost
- *
- * @param name new first column string for the item
- * @param val new value for second column
- * @param id id returned by addItem to specify which item is modified
- */
- template <typename T>
- void modifyItem(const std::string & name, const T & val, ItemID id );
-
- /**
- * Convenience method, behaves like modifyItem(string,T,ItemID) but does not change
- * the first column
- */
- template <typename T>
- void modifyItem(const T & val, ItemID id );
-
-
- /**
- * Removes an item from the tree
- *
- * To remove all items, call clear() instead of this method
- *
- * @param id item to remove
- *
- */
- void removeItem(ItemID id);
-
- //@}
-
- private:
- QStandardItemModel * model_;
- IBlock * lastBlock_;
- };
-
-
-} // namespace gui
-} // namespace walberla
-
-#include "PropertyTree.impl.h"
-
diff --git a/src/gui/PropertyTree.impl.h b/src/gui/PropertyTree.impl.h
deleted file mode 100644
index f7d6dae8d38196abb7207d26ed28188787b9b28b..0000000000000000000000000000000000000000
--- a/src/gui/PropertyTree.impl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PropertyTree.impl.h
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-
-
-#ifdef WALBERLA_ENABLE_GUI
-
-#include <QStandardItemModel>
-
-namespace walberla {
-namespace gui {
-
- template <typename T>
- PropertyTree::ItemID PropertyTree::addItem(const std::string & name, const T & val, ItemID parent)
- {
- if(!parent)
- parent = model_->invisibleRootItem();
-
- QStandardItem * firstCol = new QStandardItem(QString::fromStdString(name));
- QStandardItem * secondCol = new QStandardItem(QString("%1").arg(val));
-
- parent->appendRow(QList<ItemID>() << firstCol << secondCol);
-
- return firstCol;
- }
- template <>
- PropertyTree::ItemID PropertyTree::addItem(const std::string & name,const std::string & val, ItemID parent);
-
-
- template <typename T>
- void PropertyTree::modifyItem(const std::string & name, const T & val, ItemID id)
- {
- id->setText(QString::fromStdString(name));
- id->parent()->child(id->row(),1)->setText(QString("%1").arg(val));
- }
- template <>
- void PropertyTree::modifyItem(const std::string & name, const std::string & val, ItemID id);
-
-
- template <typename T>
- void PropertyTree::modifyItem(const T & val, ItemID id)
- {
- id->parent()->child(id->row(),1)->setText(QString("%1").arg(val));
- }
- template <>
- void PropertyTree::modifyItem(const std::string & val, ItemID id);
-
-
-} // namespace gui
-} // namespace walberla
-
-#else
-
-namespace walberla {
-namespace gui {
-
- struct QStandardItem {};
- struct QStandardItemModel {};
-
- template <typename T>
- PropertyTree::ItemID PropertyTree::addItem(const std::string &, const T &, ItemID)
- {
- return nullptr;
- }
-
- template <typename T>
- void PropertyTree::modifyItem(const std::string &, const T &, ItemID)
- {
- }
-
- template <typename T>
- void PropertyTree::modifyItem(const T &, ItemID)
- {
- }
-
-} // namespace gui
-} // namespace walberla
-
-
-
-#endif
-
-
-
-
diff --git a/src/gui/adaptors.png b/src/gui/adaptors.png
deleted file mode 100644
index f733fea24b68c4b2f2d71566929de5a8880cb735..0000000000000000000000000000000000000000
Binary files a/src/gui/adaptors.png and /dev/null differ
diff --git a/src/gui/all.h b/src/gui/all.h
deleted file mode 100644
index 245ba8f976de772a7d50ab4ce19a0cc12e21c245..0000000000000000000000000000000000000000
--- a/src/gui/all.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file all.h
-//! \ingroup geometry
-//! \author Christian Godenschwager <christian.godenschwager@fau.de>
-//! \brief Collective header file for module geometry
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "waLBerlaDefinitions.h"
-
-#include "Gui.h"
diff --git a/src/gui/collaborationDiagram.png b/src/gui/collaborationDiagram.png
deleted file mode 100644
index f16fb044c0e7ad8f254ce0386c2f9fefd6bae792..0000000000000000000000000000000000000000
Binary files a/src/gui/collaborationDiagram.png and /dev/null differ
diff --git a/src/gui/componentsOverview.png b/src/gui/componentsOverview.png
deleted file mode 100644
index 37c49006631de3243a54c4ad9e29ec6275b05353..0000000000000000000000000000000000000000
Binary files a/src/gui/componentsOverview.png and /dev/null differ
diff --git a/src/gui/extern/Qt3D/api/CMakeLists.txt b/src/gui/extern/Qt3D/api/CMakeLists.txt
deleted file mode 100644
index a73e66e354560f433471853830d06d55c3f6f13e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/api/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-target_sources( gui
- PRIVATE
- qopenglfunctions.h
- qopenglfunctions.cpp
- )
diff --git a/src/gui/extern/Qt3D/api/gl-funcs.txt b/src/gui/extern/Qt3D/api/gl-funcs.txt
deleted file mode 100644
index 6bef6ce4e5344afa5fdaad580a8906648694097f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/api/gl-funcs.txt
+++ /dev/null
@@ -1,858 +0,0 @@
-void glActiveTexture(GLenum texture);
- inline es1, es2
- alt_name glActiveTextureARB
-
-void glAttachShader(GLuint program, GLuint shader);
- shader_only yes
- inline es2
- alt_name glAttachObjectARB
-
-void glBindAttribLocation(GLuint program, GLuint index, const char* name);
- shader_only yes
- inline es2
- alt_name glBindAttribLocationARB
-
-void glBindBuffer(GLenum target, GLuint buffer);
- inline es1, es2
-
-void glBindFramebuffer(GLenum target, GLuint framebuffer);
- inline es2
-
-void glBindRenderbuffer(GLenum target, GLuint renderbuffer);
- inline es2
-
-void glBindTexture(GLenum target, GLuint texture);
- inline all
-
-void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
- inline es2
-
-void glBlendEquation( GLenum mode );
- inline es2
-
-void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
- inline es2
-
-void glBlendFunc(GLenum sfactor, GLenum dfactor);
- inline all
-
-void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
- inline es2
-
-void glBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage);
- inline es1, es2
-
-void glBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data);
- inline es1, es2
-
-GLenum glCheckFramebufferStatus(GLenum target);
- inline es2
-
-void glClear(GLbitfield mask);
- inline all
-
-void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
- inline all
-
-void glClearDepth(GLclampf depth);
- inline all_diff
- es_name glClearDepthf
-
-void glClearStencil(GLint s);
- inline all
-
-void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
- inline all
-
-void glCompileShader(GLuint shader);
- shader_only yes
- inline es2
- alt_name glCompileShader
-
-void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
- inline es1, es2
-
-void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
- inline es1, es2
-
-void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
- inline all
-
-void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
- inline all
-
-GLuint glCreateProgram(void);
- shader_only yes
- inline es2
- alt_name glCreateProgramObjectARB
-
-GLuint glCreateShader(GLenum type);
- shader_only yes
- inline es2
- alt_name glCreateShaderObjectARB
-
-void glCullFace(GLenum mode);
- inline all
-
-void glDeleteBuffers(GLsizei n, const GLuint* buffers);
- inline es1, es2
-
-void glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers);
- inline es2
-
-void glDeleteProgram(GLuint program);
- shader_only yes
- inline es2
- alt_name glDeleteObjectARB
-
-void glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers);
- inline es2
-
-void glDeleteShader(GLuint shader);
- shader_only yes
- inline es2
- alt_name glDeleteObjectARB
-
-void glDeleteTextures(GLsizei n, const GLuint* textures);
- inline all
-
-void glDepthFunc(GLenum func);
- inline all
-
-void glDepthMask(GLboolean flag);
- inline all
-
-void glDepthRange(GLclampf zNear, GLclampf zFar);
- inline all_diff
- es_name glDepthRangef
-
-void glDetachShader(GLuint program, GLuint shader);
- shader_only yes
- inline es2
- alt_name glDetachObjectARB
-
-void glDisable(GLenum cap);
- inline all
-
-void glDisableVertexAttribArray(GLuint index);
- shader_only yes
- inline es2
- alt_name glDisableVertexAttribArrayARB
-
-void glDrawArrays(GLenum mode, GLint first, GLsizei count);
- inline all
-
-void glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices);
- inline all
-
-void glEnable(GLenum cap);
- inline all
-
-void glEnableVertexAttribArray(GLuint index);
- shader_only yes
- inline es2
- alt_name glEnableVertexAttribArrayARB
-
-void glFinish(void);
- inline all
-
-void glFlush(void);
- inline all
-
-void glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
- inline es2
-
-void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
- inline es2
-
-void glFrontFace(GLenum mode);
- inline all
-
-void glGenBuffers(GLsizei n, GLuint* buffers);
- inline es1, es2
-
-void glGenerateMipmap(GLenum target);
- inline es2
-
-void glGenFramebuffers(GLsizei n, GLuint* framebuffers);
- inline es2
-
-void glGenRenderbuffers(GLsizei n, GLuint* renderbuffers);
- inline es2
-
-void glGenTextures(GLsizei n, GLuint* textures);
- inline all
-
-void glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- shader_only yes
- inline es2
- alt_name glGetActiveAttribARB
-
-void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- shader_only yes
- inline es2
- alt_name glGetActiveUniformARB
-
-void glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
- shader_only yes
- inline es2
- alt_name glGetAttachedObjectsARB
-
-int glGetAttribLocation(GLuint program, const char* name);
- shader_only yes
- inline es2
- alt_name glGetAttribLocationARB
-
-void glGetBooleanv(GLenum pname, GLboolean* params);
- inline all
-
-void glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params);
- inline es2
-
-GLenum glGetError(void);
- inline all
-
-void glGetFloatv(GLenum pname, GLfloat* params);
- inline all
-
-void glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params);
- inline es2
-
-void glGetIntegerv(GLenum pname, GLint* params);
- inline all
-
-void glGetProgramiv(GLuint program, GLenum pname, GLint* params);
- shader_only yes
- inline es2
- alt_name glGetObjectParameterivARB
-
-void glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
- shader_only yes
- inline es2
- alt_name glGetInfoLogARB
-
-void glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params);
- inline es2
-
-void glGetShaderiv(GLuint shader, GLenum pname, GLint* params);
- shader_only yes
- inline es2
- alt_name glGetObjectParameterivARB
-
-void glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
- shader_only yes
- inline es2
- alt_name glGetInfoLogARB
-
-void glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
- shader_only yes
- inline es2
- special_handling yes
-
-void glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
- shader_only yes
- inline es2
- alt_name glGetShaderSourceARB
-
-const GLubyte* glGetString(GLenum name);
- inline all
-
-void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params);
- inline all
-
-void glGetTexParameteriv(GLenum target, GLenum pname, GLint* params);
- inline all
-
-void glGetUniformfv(GLuint program, GLint location, GLfloat* params);
- shader_only yes
- inline es2
- alt_name glGetUniformfvARB
-
-void glGetUniformiv(GLuint program, GLint location, GLint* params);
- shader_only yes
- inline es2
- alt_name glGetUniformivARB
-
-int glGetUniformLocation(GLuint program, const char* name);
- shader_only yes
- inline es2
- alt_name glGetUniformLocationARB
-
-void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);
- shader_only yes
- inline es2
- alt_name glGetVertexAttribfvARB
-
-void glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params);
- shader_only yes
- inline es2
- alt_name glGetVertexAttribivARB
-
-void glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
- shader_only yes
- inline es2
- alt_name glGetVertexAttribPointervARB
-
-void glHint(GLenum target, GLenum mode);
- inline all
-
-GLboolean glIsBuffer(GLuint buffer);
- inline es1, es2
-
-GLboolean glIsEnabled(GLenum cap);
- inline all
-
-GLboolean glIsFramebuffer(GLuint framebuffer);
- inline es2
-
-GLboolean glIsProgram(GLuint program);
- shader_only yes
- inline es2
- alt_name glIsProgramARB
- special_handling yes
-
-GLboolean glIsRenderbuffer(GLuint renderbuffer);
- inline es2
-
-GLboolean glIsShader(GLuint shader);
- shader_only yes
- inline es2
- alt_name glIsShaderARB
- special_handling yes
-
-GLboolean glIsTexture(GLuint texture);
- inline all
-
-void glLineWidth(GLfloat width);
- inline all
-
-void glLinkProgram(GLuint program);
- shader_only yes
- inline es2
- alt_name glLinkProgramARB
-
-void glPixelStorei(GLenum pname, GLint param);
- inline all
-
-void glPolygonOffset(GLfloat factor, GLfloat units);
- inline all
-
-void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels);
- inline all
-
-void glReleaseShaderCompiler(void);
- shader_only yes
- inline es2
- alt_name glReleaseShaderCompilerARB
- special_handling yes
-
-void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
- inline es2
-
-void glSampleCoverage(GLclampf value, GLboolean invert);
- inline es1, es2
-
-void glScissor(GLint x, GLint y, GLsizei width, GLsizei height);
- inline all
-
-void glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
- shader_only yes
- inline es2
- alt_name glShaderBinaryARB
-
-void glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length);
- shader_only yes
- inline es2
- alt_name glShaderSourceARB
-
-void glStencilFunc(GLenum func, GLint ref, GLuint mask);
- inline all
-
-void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
- inline es2
-
-void glStencilMask(GLuint mask);
- inline all
-
-void glStencilMaskSeparate(GLenum face, GLuint mask);
- inline es2
-
-void glStencilOp(GLenum fail, GLenum zfail, GLenum zpass);
- inline all
-
-void glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
- inline es2
-
-void glTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
- inline all
-
-void glTexParameterf(GLenum target, GLenum pname, GLfloat param);
- inline all
-
-void glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params);
- inline all
-
-void glTexParameteri(GLenum target, GLenum pname, GLint param);
- inline all
-
-void glTexParameteriv(GLenum target, GLenum pname, const GLint* params);
- inline all
-
-void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
- inline all
-
-void glUniform1f(GLint location, GLfloat x);
- shader_only yes
- inline es2
- alt_name glUniform1fARB
-
-void glUniform1fv(GLint location, GLsizei count, const GLfloat* v);
- shader_only yes
- inline es2
- alt_name glUniform1fvARB
-
-void glUniform1i(GLint location, GLint x);
- shader_only yes
- inline es2
- alt_name glUniform1iARB
-
-void glUniform1iv(GLint location, GLsizei count, const GLint* v);
- shader_only yes
- inline es2
- alt_name glUniform1ivARB
-
-void glUniform2f(GLint location, GLfloat x, GLfloat y);
- shader_only yes
- inline es2
- alt_name glUniform2fARB
-
-void glUniform2fv(GLint location, GLsizei count, const GLfloat* v);
- shader_only yes
- inline es2
- alt_name glUniform2fvARB
-
-void glUniform2i(GLint location, GLint x, GLint y);
- shader_only yes
- inline es2
- alt_name glUniform2iARB
-
-void glUniform2iv(GLint location, GLsizei count, const GLint* v);
- shader_only yes
- inline es2
- alt_name glUniform2ivARB
-
-void glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
- shader_only yes
- inline es2
- alt_name glUniform3fARB
-
-void glUniform3fv(GLint location, GLsizei count, const GLfloat* v);
- shader_only yes
- inline es2
- alt_name glUniform3fvARB
-
-void glUniform3i(GLint location, GLint x, GLint y, GLint z);
- shader_only yes
- inline es2
- alt_name glUniform3iARB
-
-void glUniform3iv(GLint location, GLsizei count, const GLint* v);
- shader_only yes
- inline es2
- alt_name glUniform3ivARB
-
-void glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- shader_only yes
- inline es2
- alt_name glUniform4fARB
-
-void glUniform4fv(GLint location, GLsizei count, const GLfloat* v);
- shader_only yes
- inline es2
- alt_name glUniform4fvARB
-
-void glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w);
- shader_only yes
- inline es2
- alt_name glUniform4iARB
-
-void glUniform4iv(GLint location, GLsizei count, const GLint* v);
- shader_only yes
- inline es2
- alt_name glUniform4ivARB
-
-void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- shader_only yes
- inline es2
- alt_name glUniformMatrix2fvARB
-
-void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- shader_only yes
- inline es2
- alt_name glUniformMatrix3fvARB
-
-void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- shader_only yes
- inline es2
- alt_name glUniformMatrix4fvARB
-
-void glUseProgram(GLuint program);
- shader_only yes
- inline es2
- alt_name glUseProgramObjectARB
-
-void glValidateProgram(GLuint program);
- shader_only yes
- inline es2
- alt_name glValidateProgramARB
-
-void glVertexAttrib1f(GLuint indx, GLfloat x);
- shader_only yes
- inline es2
- alt_name glVertexAttrib1fARB
-
-void glVertexAttrib1fv(GLuint indx, const GLfloat* values);
- shader_only yes
- inline es2
- alt_name glVertexAttrib1fvARB
-
-void glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
- shader_only yes
- inline es2
- alt_name glVertexAttrib2fARB
-
-void glVertexAttrib2fv(GLuint indx, const GLfloat* values);
- shader_only yes
- inline es2
- alt_name glVertexAttrib2fvARB
-
-void glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
- shader_only yes
- inline es2
- alt_name glVertexAttrib3fARB
-
-void glVertexAttrib3fv(GLuint indx, const GLfloat* values);
- shader_only yes
- inline es2
- alt_name glVertexAttrib3fvARB
-
-void glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- shader_only yes
- inline es2
- alt_name glVertexAttrib4fARB
-
-void glVertexAttrib4fv(GLuint indx, const GLfloat* values);
- shader_only yes
- inline es2
- alt_name glVertexAttrib4fvARB
-
-void glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
- shader_only yes
- inline es2
- alt_name glVertexAttribPointerARB
-
-void glViewport(GLint x, GLint y, GLsizei width, GLsizei height);
- inline all
-
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#define GL_ACTIVE_TEXTURE 0x84E0
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
-#define GL_ALPHA 0x1906
-#define GL_ALPHA_BITS 0x0D55
-#define GL_ALWAYS 0x0207
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_ARRAY_BUFFER_BINDING 0x8894
-#define GL_ATTACHED_SHADERS 0x8B85
-#define GL_BACK 0x0405
-#define GL_BLEND 0x0BE2
-#define GL_BLEND_COLOR 0x8005
-#define GL_BLEND_DST_ALPHA 0x80CA
-#define GL_BLEND_DST_RGB 0x80C8
-#define GL_BLEND_EQUATION 0x8009
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#define GL_BLEND_EQUATION_RGB 0x8009
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#define GL_BLEND_SRC_RGB 0x80C9
-#define GL_BLUE_BITS 0x0D54
-#define GL_BOOL 0x8B56
-#define GL_BOOL_VEC2 0x8B57
-#define GL_BOOL_VEC3 0x8B58
-#define GL_BOOL_VEC4 0x8B59
-#define GL_BUFFER_SIZE 0x8764
-#define GL_BUFFER_USAGE 0x8765
-#define GL_BYTE 0x1400
-#define GL_CCW 0x0901
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#define GL_COLOR_WRITEMASK 0x0C23
-#define GL_COMPILE_STATUS 0x8B81
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
-#define GL_CONSTANT_ALPHA 0x8003
-#define GL_CONSTANT_COLOR 0x8001
-#define GL_CULL_FACE 0x0B44
-#define GL_CULL_FACE_MODE 0x0B45
-#define GL_CURRENT_PROGRAM 0x8B8D
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#define GL_CW 0x0900
-#define GL_DECR 0x1E03
-#define GL_DECR_WRAP 0x8508
-#define GL_DELETE_STATUS 0x8B80
-#define GL_DEPTH_ATTACHMENT 0x8D00
-#define GL_DEPTH_BITS 0x0D56
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#define GL_DEPTH_COMPONENT 0x1902
-#define GL_DEPTH_COMPONENT16 0x81A5
-#define GL_DEPTH_FUNC 0x0B74
-#define GL_DEPTH_RANGE 0x0B70
-#define GL_DEPTH_TEST 0x0B71
-#define GL_DEPTH_WRITEMASK 0x0B72
-#define GL_DITHER 0x0BD0
-#define GL_DONT_CARE 0x1100
-#define GL_DST_ALPHA 0x0304
-#define GL_DST_COLOR 0x0306
-#define GL_DYNAMIC_DRAW 0x88E8
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#define GL_EQUAL 0x0202
-#define GL_EXTENSIONS 0x1F03
-#define GL_FALSE 0
-#define GL_FASTEST 0x1101
-#define GL_FIXED 0x140C
-#define GL_FLOAT 0x1406
-#define GL_FLOAT_MAT2 0x8B5A
-#define GL_FLOAT_MAT3 0x8B5B
-#define GL_FLOAT_MAT4 0x8B5C
-#define GL_FLOAT_VEC2 0x8B50
-#define GL_FLOAT_VEC3 0x8B51
-#define GL_FLOAT_VEC4 0x8B52
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_FRAMEBUFFER 0x8D40
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_BINDING 0x8CA6
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
-#define GL_FRONT 0x0404
-#define GL_FRONT_AND_BACK 0x0408
-#define GL_FRONT_FACE 0x0B46
-#define GL_FUNC_ADD 0x8006
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_GENERATE_MIPMAP_HINT 0x8192
-#define GL_GEQUAL 0x0206
-#define GL_GREATER 0x0204
-#define GL_GREEN_BITS 0x0D53
-#define GL_HIGH_FLOAT 0x8DF2
-#define GL_HIGH_INT 0x8DF5
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#define GL_INCR 0x1E02
-#define GL_INCR_WRAP 0x8507
-#define GL_INFO_LOG_LENGTH 0x8B84
-#define GL_INT 0x1404
-#define GL_INT_VEC2 0x8B53
-#define GL_INT_VEC3 0x8B54
-#define GL_INT_VEC4 0x8B55
-#define GL_INVALID_ENUM 0x0500
-#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
-#define GL_INVALID_OPERATION 0x0502
-#define GL_INVALID_VALUE 0x0501
-#define GL_INVERT 0x150A
-#define GL_KEEP 0x1E00
-#define GL_LEQUAL 0x0203
-#define GL_LESS 0x0201
-#define GL_LINEAR 0x2601
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#define GL_LINE_LOOP 0x0002
-#define GL_LINES 0x0001
-#define GL_LINE_STRIP 0x0003
-#define GL_LINE_WIDTH 0x0B21
-#define GL_LINK_STATUS 0x8B82
-#define GL_LOW_FLOAT 0x8DF0
-#define GL_LOW_INT 0x8DF3
-#define GL_LUMINANCE 0x1909
-#define GL_LUMINANCE_ALPHA 0x190A
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#define GL_MEDIUM_FLOAT 0x8DF1
-#define GL_MEDIUM_INT 0x8DF4
-#define GL_MIRRORED_REPEAT 0x8370
-#define GL_NEAREST 0x2600
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#define GL_NEVER 0x0200
-#define GL_NICEST 0x1102
-#define GL_NO_ERROR 0
-#define GL_NONE 0
-#define GL_NOTEQUAL 0x0205
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
-#define GL_ONE 1
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#define GL_OUT_OF_MEMORY 0x0505
-#define GL_PACK_ALIGNMENT 0x0D05
-#define GL_POINTS 0x0000
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#define GL_POLYGON_OFFSET_FILL 0x8037
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#define GL_RED_BITS 0x0D52
-#define GL_RENDERBUFFER 0x8D41
-#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
-#define GL_RENDERBUFFER_BINDING 0x8CA7
-#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
-#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
-#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
-#define GL_RENDERBUFFER_HEIGHT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
-#define GL_RENDERBUFFER_RED_SIZE 0x8D50
-#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
-#define GL_RENDERBUFFER_WIDTH 0x8D42
-#define GL_RENDERER 0x1F01
-#define GL_REPEAT 0x2901
-#define GL_REPLACE 0x1E01
-#define GL_RGB 0x1907
-#define GL_RGB565 0x8D62
-#define GL_RGB5_A1 0x8057
-#define GL_RGBA 0x1908
-#define GL_RGBA4 0x8056
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#define GL_SAMPLE_BUFFERS 0x80A8
-#define GL_SAMPLE_COVERAGE 0x80A0
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#define GL_SAMPLER_2D 0x8B5E
-#define GL_SAMPLER_CUBE 0x8B60
-#define GL_SAMPLES 0x80A9
-#define GL_SCISSOR_BOX 0x0C10
-#define GL_SCISSOR_TEST 0x0C11
-#define GL_SHADER_BINARY_FORMATS 0x8DF8
-#define GL_SHADER_COMPILER 0x8DFA
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#define GL_SHADER_TYPE 0x8B4F
-#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
-#define GL_SHORT 0x1402
-#define GL_SRC_ALPHA 0x0302
-#define GL_SRC_ALPHA_SATURATE 0x0308
-#define GL_SRC_COLOR 0x0300
-#define GL_STATIC_DRAW 0x88E4
-#define GL_STENCIL_ATTACHMENT 0x8D20
-#define GL_STENCIL_BACK_FAIL 0x8801
-#define GL_STENCIL_BACK_FUNC 0x8800
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
-#define GL_STENCIL_BACK_REF 0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
-#define GL_STENCIL_BITS 0x0D57
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#define GL_STENCIL_FAIL 0x0B94
-#define GL_STENCIL_FUNC 0x0B92
-#define GL_STENCIL_INDEX 0x1901
-#define GL_STENCIL_INDEX8 0x8D48
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#define GL_STENCIL_REF 0x0B97
-#define GL_STENCIL_TEST 0x0B90
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#define GL_STENCIL_WRITEMASK 0x0B98
-#define GL_STREAM_DRAW 0x88E0
-#define GL_SUBPIXEL_BITS 0x0D50
-#define GL_TEXTURE0 0x84C0
-#define GL_TEXTURE 0x1702
-#define GL_TEXTURE10 0x84CA
-#define GL_TEXTURE1 0x84C1
-#define GL_TEXTURE11 0x84CB
-#define GL_TEXTURE12 0x84CC
-#define GL_TEXTURE13 0x84CD
-#define GL_TEXTURE14 0x84CE
-#define GL_TEXTURE15 0x84CF
-#define GL_TEXTURE16 0x84D0
-#define GL_TEXTURE17 0x84D1
-#define GL_TEXTURE18 0x84D2
-#define GL_TEXTURE19 0x84D3
-#define GL_TEXTURE20 0x84D4
-#define GL_TEXTURE2 0x84C2
-#define GL_TEXTURE21 0x84D5
-#define GL_TEXTURE22 0x84D6
-#define GL_TEXTURE23 0x84D7
-#define GL_TEXTURE24 0x84D8
-#define GL_TEXTURE25 0x84D9
-#define GL_TEXTURE26 0x84DA
-#define GL_TEXTURE27 0x84DB
-#define GL_TEXTURE28 0x84DC
-#define GL_TEXTURE29 0x84DD
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_TEXTURE30 0x84DE
-#define GL_TEXTURE3 0x84C3
-#define GL_TEXTURE31 0x84DF
-#define GL_TEXTURE4 0x84C4
-#define GL_TEXTURE5 0x84C5
-#define GL_TEXTURE6 0x84C6
-#define GL_TEXTURE7 0x84C7
-#define GL_TEXTURE8 0x84C8
-#define GL_TEXTURE9 0x84C9
-#define GL_TEXTURE_BINDING_2D 0x8069
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#define GL_TEXTURE_WRAP_S 0x2802
-#define GL_TEXTURE_WRAP_T 0x2803
-#define GL_TRIANGLE_FAN 0x0006
-#define GL_TRIANGLES 0x0004
-#define GL_TRIANGLE_STRIP 0x0005
-#define GL_TRUE 1
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#define GL_UNSIGNED_BYTE 0x1401
-#define GL_UNSIGNED_INT 0x1405
-#define GL_UNSIGNED_SHORT 0x1403
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#define GL_VALIDATE_STATUS 0x8B83
-#define GL_VENDOR 0x1F00
-#define GL_VERSION 0x1F02
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_VIEWPORT 0x0BA2
-#define GL_ZERO 0
diff --git a/src/gui/extern/Qt3D/api/gl-gen-funcs.pl b/src/gui/extern/Qt3D/api/gl-gen-funcs.pl
deleted file mode 100755
index 60a713a089016dcba50d7da64e9b76419948517a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/api/gl-gen-funcs.pl
+++ /dev/null
@@ -1,484 +0,0 @@
-#!/usr/bin/perl
-#############################################################################
-##
-## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
-##
-## This file is part of the Qt3D 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$
-##
-#############################################################################
-
-
-#
-# USAGE:
-#
-# perl gl-gen-funcs.pl < gl-functs.txt > output.txt
-#
-# This will automatically generate the qopenglfunctions.h/.cpp files for Qt3D
-# based on the platform and available functions/capabilities.
-#
-# The file output.txt will contain the text for the header and implementation
-# files - it is left to the user to manually cut and paste this content into
-# their own qopenglfunctions.h and qopenglfunctions.cpp files.
-#
-# Note: this script is intended for perl version 5.10.1 or better, and has not
-# been tested on previous versions of perl.
-#
-
-use strict;
-use warnings;
-
-use Data::Dumper;
-
-# Read the function definitions from the input.
-my @functions = ();
-my @macros = ();
-my %func_info = ();
-while (<>)
-{
- my ($returnType, $name, $argstr) =
- m/^(\w+|const GLubyte\*)\s+(\w+)\s*\(([^)]*)\)/;
-
- if (!$returnType) {
- my ($macroname, $macrovalue) = m/^#define\s+(\w+)\s+(.*)$/;
- if ($macroname) {
- my %macro_info = ();
- $macro_info{'name'} = $macroname;
- $macro_info{'value'} = $macrovalue;
- push @macros, { %macro_info };
- next;
- }
- my ($tag, $value) = m/^\s+(\w+)\s+(.*)$/;
- next unless $tag;
- $func_info{$tag} = $value;
- $func_info{'funcname'} = $value if ($tag eq "es_name");
- next;
- }
-
- if ($func_info{'name'}) {
- push @functions, { %func_info };
- %func_info = ();
- }
-
- $argstr =~ s/^\s+//;
- $argstr =~ s/\s+$//;
- my @args = split /,\s*/,$argstr;
-
- my @argNames = ();
- if ($argstr ne 'void') {
- foreach (@args) {
- my ($argType, $argName) = m/^(\w+|\w+.*\*)\s+(\w+)$/;
- push @argNames, $argName;
- }
- } else {
- $argstr = "";
- }
- my $argnamestr = join(', ', @argNames);
-
- $func_info{'name'} = $name;
- $func_info{'funcname'} = $name;
- $name =~ s/^gl//;
- $func_info{'varname'} = lcfirst($name);
- $func_info{'returnType'} = $returnType;
- $func_info{'argstr'} = $argstr;
- $func_info{'argnamestr'} = $argnamestr;
-}
-if ($func_info{'name'}) {
- push @functions, { %func_info };
-}
-
-# Generate the declarations for qopenglfunctions.h.
-print "// qopenglfunctions.h\n\n";
-print "#ifdef Q_WS_WIN\n";
-print "# define QT3D_GLF_APIENTRY APIENTRY\n";
-print "#endif\n";
-print "\n";
-print "#ifndef Q_WS_MAC\n";
-print "# ifndef QT3D_GLF_APIENTRYP\n";
-print "# ifdef QT3D_GLF_APIENTRY\n";
-print "# define QT3D_GLF_APIENTRYP QT3D_GLF_APIENTRY *\n";
-print "# else\n";
-print "# define QT3D_GLF_APIENTRY\n";
-print "# define QT3D_GLF_APIENTRYP *\n";
-print "# endif\n";
-print "# endif\n";
-print "#else\n";
-print "# define QT3D_GLF_APIENTRY\n";
-print "# define QT3D_GLF_APIENTRYP *\n";
-print "#endif\n";
-print "\n";
-print "struct QOpenGLFunctionsPrivate;\n";
-print "\n";
-
-print "// Undefine any macros from GLEW, qglextensions_p.h, etc that\n";
-print "// may interfere with the definition of QOpenGLFunctions.\n";
-foreach ( @functions ) {
- my $inline = $_->{'inline'};
- next if ($inline && $inline eq 'all');
- my $name = $_->{'funcname'};
- print "#undef $name\n";
-}
-print "\n";
-
-# Output the prototypes into the QOpenGLFunctions class.
-print "class Q_QT3D_EXPORT QOpenGLFunctions\n";
-print "{\n";
-print "public:\n";
-print " QOpenGLFunctions();\n";
-print " explicit QOpenGLFunctions(const QGLContext *context);\n";
-print " ~QOpenGLFunctions() {}\n";
-print "\n";
-print " enum OpenGLFeature\n";
-print " {\n";
-print " Multitexture = 0x0001,\n";
-print " Shaders = 0x0002,\n";
-print " Buffers = 0x0004,\n";
-print " Framebuffers = 0x0008,\n";
-print " BlendColor = 0x0010,\n";
-print " BlendEquation = 0x0020,\n";
-print " BlendEquationSeparate = 0x0040,\n";
-print " BlendFuncSeparate = 0x0080,\n";
-print " BlendSubtract = 0x0100,\n";
-print " CompressedTextures = 0x0200,\n";
-print " Multisample = 0x0400,\n";
-print " StencilSeparate = 0x0800,\n";
-print " NPOTTextures = 0x1000\n";
-print " };\n";
-print " Q_DECLARE_FLAGS(OpenGLFeatures, OpenGLFeature)\n";
-print "\n";
-print " QOpenGLFunctions::OpenGLFeatures openGLFeatures() const;\n";
-print " bool hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const;\n";
-print "\n";
-print " void initializeGLFunctions(const QGLContext *context = 0);\n";
-print "\n";
-my $last_shader_only = 0;
-foreach ( @functions ) {
- my $inline = $_->{'inline'};
- next if ($inline && $inline eq 'all');
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
- my $name = $_->{'funcname'};
- #print "#ifndef QT_OPENGL_ES_1\n" if ($shader_only && !$last_shader_only);
- #print "#endif\n" if (!$shader_only && $last_shader_only);
- print " $_->{'returnType'} $name($_->{'argstr'});\n";
- $last_shader_only = $shader_only;
-}
-#print "#endif\n" if $last_shader_only;
-
-print "\n";
-print "private:\n";
-print " QOpenGLFunctionsPrivate *d_ptr;\n";
-print " static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != 0; }\n";
-print "};\n";
-print "\n";
-print "Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLFunctions::OpenGLFeatures)\n";
-print "\n";
-print "struct QOpenGLFunctionsPrivate\n";
-print "{\n";
-print " QOpenGLFunctionsPrivate(const QGLContext *context = 0);\n";
-print "\n";
-print "#ifndef QT_OPENGL_ES_2";
-print "\n";
-
-# Output the function pointers into the QOpenGLFunctionsPrivate class.
-$last_shader_only = 0;
-foreach ( @functions ) {
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
- my $inline = $_->{'inline'};
- next if ($inline && $inline eq 'all');
- next if $inline && $inline eq 'all_diff';
- my $name = $_->{'varname'};
- #print "#ifndef QT_OPENGL_ES_1\n" if ($shader_only && !$last_shader_only);
- #print "#endif\n" if (!$shader_only && $last_shader_only);
- print " $_->{'returnType'} (QT3D_GLF_APIENTRYP $name)($_->{'argstr'});\n";
- $last_shader_only = $shader_only;
-}
-#print "#endif\n" if $last_shader_only;
-
-print "#endif\n";
-print "};\n";
-print "\n";
-
-my %platform_defines = ();
-$platform_defines{'es1'} = "defined(QT_OPENGL_ES_1)";
-$platform_defines{'es2'} = "defined(QT_OPENGL_ES_2)";
-$platform_defines{'es'} = "defined(QT_OPENGL_ES)";
-$platform_defines{'desktop'} = "!defined(QT_OPENGL_ES)";
-
-# Output the inline functions that call either the raw GL function
-# or resolve via the function pointer.
-$last_shader_only = 0;
-foreach ( @functions ) {
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
- my $funcname = $_->{'funcname'};
- my $varname = $_->{'varname'};
- my $is_void = ($_->{'returnType'} eq 'void');
- my $inline = $_->{'inline'};
- next if ($inline && $inline eq 'all');
- #print "#ifndef QT_OPENGL_ES_1\n\n" if ($shader_only && !$last_shader_only);
- #print "#endif\n\n" if (!$shader_only && $last_shader_only);
- print "inline $_->{'returnType'} QOpenGLFunctions::$funcname($_->{'argstr'})\n";
- print "{\n";
- if ($_->{'es_name'}) {
- # Functions like glClearDepth() that are inline, but named differently.
- print "#ifndef QT_OPENGL_ES\n";
- print " ::$_->{'name'}($_->{'argnamestr'});\n";
- print "#else\n";
- print " ::$_->{'es_name'}($_->{'argnamestr'});\n";
- print "#endif\n";
- } elsif ($inline && $inline eq 'all') {
- # Inlined on all platforms.
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "::$_->{'name'}($_->{'argnamestr'});\n";
- } elsif ($inline) {
- # Inlined only on certain platforms.
- my @platforms = split /,\s*/,$inline;
- my @defines = ();
- foreach (@platforms) {
- push @defines, $platform_defines{$_};
- }
- print "#if ";
- print join(' || ', @defines);
- print "\n";
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "::$_->{'name'}($_->{'argnamestr'});\n";
- print "#else\n";
- print " Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));\n";
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "d_ptr->$varname($_->{'argnamestr'});\n";
- print "#endif\n";
- } else {
- # Resolve on all platforms.
- print " Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));\n";
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "d_ptr->$varname($_->{'argnamestr'});\n";
- }
- print "}\n\n";
- $last_shader_only = $shader_only;
-}
-#print "#endif\n" if $last_shader_only;
-
-# Output the macro definitions.
-foreach ( @macros ) {
- my $name = $_->{'name'};
- my $value = $_->{'value'};
- print "#ifndef $name\n";
- print "#define $name $value\n";
- print "#endif\n";
-}
-print "\n";
-
-print "// qopenglfunctions.cpp\n\n";
-
-# Generate qdoc documentation for all of the functions.
-foreach ( @functions ) {
- my $inline = $_->{'inline'};
- next if $inline && $inline eq 'all';
-
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
-
- my $name = $_->{'funcname'};
-
- my $docargs = $_->{'argnamestr'};
- if (length($docargs) > 0) {
- $docargs =~ s/,/, \\a/g;
- $docargs =~ s/^/\\a /;
- }
-
- my $khronos_name = $_->{'es_name'};
- if (!$khronos_name) {
- $khronos_name = $_->{'name'};
- }
-
- print "/*!\n";
- print " \\fn $_->{'returnType'} QOpenGLFunctions::$name($_->{'argstr'})\n";
- print "\n";
- if ($khronos_name eq $_->{'name'}) {
- print " Convenience function that calls $khronos_name($docargs).\n";
- } else {
- print " Convenience function that calls $_->{'name'}($docargs) on\n";
- print " desktop OpenGL systems and $khronos_name($docargs) on\n";
- print " embedded OpenGL/ES systems.\n";
- }
- print "\n";
- print " For more information, see the OpenGL/ES 2.0 documentation for\n";
- print " \\l{http://www.khronos.org/opengles/sdk/docs/man/$khronos_name.xml}{$khronos_name()}.\n";
- if ($shader_only) {
- print "\n";
- print " This convenience function will do nothing on OpenGL/ES 1.x systems.\n";
- }
- print "*/\n\n";
-}
-
-# Generate the resolver functions.
-print "#ifndef QT_OPENGL_ES_2\n\n";
-$last_shader_only = 0;
-foreach ( @functions ) {
- my $inline = $_->{'inline'};
- next if $inline && $inline eq 'all';
- next if $inline && $inline eq 'all_diff';
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
- my $name = $_->{'varname'};
- my $resolver_name = $_->{'name'};
- $resolver_name =~ s/^gl/qglfResolve/;
- my $special_name = $_->{'name'};
- $special_name =~ s/^gl/qglfSpecial/;
- my @platforms = split /,\s*/,$inline;
- $shader_only = 1 if @platforms ~~ 'es1';
- my $is_void = ($_->{'returnType'} eq 'void');
- my $special_handling = ($_->{'special_handling'} && $_->{'special_handling'} eq 'yes');
- #print "#ifndef QT_OPENGL_ES_1\n\n" if ($shader_only && !$last_shader_only);
- #print "#endif\n\n" if (!$shader_only && $last_shader_only);
-
- if ($special_handling) {
- # Output special fallback implementations for certain functions.
- if ($name eq "getShaderPrecisionFormat") {
- print "static $_->{'returnType'} QT3D_GLF_APIENTRY $special_name($_->{'argstr'})\n";
- print "{\n";
- print " Q_UNUSED(shadertype);\n";
- print " Q_UNUSED(precisiontype);\n";
- print " range[0] = range[1] = precision[0] = 0;\n";
- print "}\n\n";
- } elsif ($name eq "isProgram" || $name eq "isShader") {
- print "static $_->{'returnType'} QT3D_GLF_APIENTRY $special_name($_->{'argstr'})\n";
- print "{\n";
- print " return $_->{'argnamestr'} != 0;\n";
- print "}\n\n";
- } elsif ($name eq "releaseShaderCompiler") {
- print "static $_->{'returnType'} QT3D_GLF_APIENTRY $special_name($_->{'argstr'})\n";
- print "{\n";
- print "}\n\n";
- }
- }
-
- print "static $_->{'returnType'} QT3D_GLF_APIENTRY $resolver_name($_->{'argstr'})\n";
- print "{\n";
- my $type_name = "type_$_->{'name'}";
- print " typedef $_->{'returnType'} (QT3D_GLF_APIENTRYP $type_name)($_->{'argstr'});\n\n";
- print " const QGLContext *context = QGLContext::currentContext();\n";
- print " QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);\n";
- print "\n";
- print " funcs->$name = ($type_name)\n";
- print " context->getProcAddress(QLatin1String(\"$_->{'name'}\"));\n";
- my @alt_names = ();
- if ($_->{'alt_name'}) {
- push @alt_names, $_->{'alt_name'};
- } else {
- push @alt_names, "$_->{'name'}OES";
- push @alt_names, "$_->{'name'}EXT";
- push @alt_names, "$_->{'name'}ARB";
- }
- foreach (@alt_names) {
- print "#ifdef QT_OPENGL_ES\n" if /OES/;
- print " if (!funcs->$name) {\n";
- print " funcs->$name = ($type_name)\n";
- print " context->getProcAddress(QLatin1String(\"$_\"));\n";
- print " }\n";
- print "#endif\n" if /OES/;
- }
- if ($special_handling) {
- print "\n";
- print " if (!funcs->$name)\n";
- print " funcs->$name = $special_name;\n\n";
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "funcs->$name($_->{'argnamestr'});\n";
- } else {
- print "\n";
- print " if (funcs->$name)\n";
- if ($is_void) {
- print (" ");
- } else {
- print (" return ");
- }
- print "funcs->$name($_->{'argnamestr'});\n";
- if ($is_void) {
- print " else\n";
- print " funcs->$name = $resolver_name;\n";
- } else {
- print " funcs->$name = $resolver_name;\n";
- print " return $_->{'returnType'}(0);\n";
- }
- }
- print "}\n\n";
-
- $last_shader_only = $shader_only;
-}
-#print "#endif\n" if $last_shader_only;
-print "#endif // !QT_OPENGL_ES_2\n\n";
-
-# Generate the initialization code for QOpenGLFunctionsPrivate.
-print "QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(const QGLContext *)\n";
-print "{\n";
-print "#ifndef QT_OPENGL_ES_2\n";
-$last_shader_only = 0;
-foreach ( @functions ) {
- my $inline = $_->{'inline'};
- next if $inline && $inline eq 'all';
- next if $inline && $inline eq 'all_diff';
- my $shader_only = ($_->{'shader_only'} && $_->{'shader_only'} eq 'yes');
- my $name = $_->{'varname'};
- my $resolver_name = $_->{'name'};
- $resolver_name =~ s/^gl/qglfResolve/;
- my @platforms = split /,\s*/,$inline;
- $shader_only = 1 if @platforms ~~ 'es1';
- #print "#ifndef QT_OPENGL_ES_1\n" if ($shader_only && !$last_shader_only);
- #print "#endif\n" if (!$shader_only && $last_shader_only);
- print " $name = $resolver_name;\n";
- $last_shader_only = $shader_only;
-}
-#print "#endif\n" if $last_shader_only;
-print "#endif // !QT_OPENGL_ES_2\n";
-print "}\n\n";
-
-#print Dumper(\@functions);
diff --git a/src/gui/extern/Qt3D/api/qopenglfunctions.cpp b/src/gui/extern/Qt3D/api/qopenglfunctions.cpp
deleted file mode 100644
index e3a0f28e203a942705275ddd80a0ddfd28833814..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/api/qopenglfunctions.cpp
+++ /dev/null
@@ -1,3690 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qopenglfunctions.h"
-#include "qglext_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QOpenGLFunctions
- \brief The QOpenGLFunctions class provides cross-platform access to the OpenGL/ES 2.0 API.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::enablers
-
- OpenGL/ES 2.0 defines a subset of the OpenGL specification that is
- common across many desktop and embedded OpenGL implementations.
- However, it can be difficult to use the functions from that subset
- because they need to be resolved manually on desktop systems.
-
- QOpenGLFunctions provides a guaranteed API that is available on all
- OpenGL systems and takes care of function resolution on systems
- that need it. The recommended way to use QOpenGLFunctions is by
- direct inheritance:
-
- \code
- class MyGLWidget : public QGLWidget, protected QOpenGLFunctions
- {
- Q_OBJECT
- public:
- MyGLWidget(QWidget *parent = 0) : QGLWidget(parent) {}
-
- protected:
- void initializeGL();
- void paintGL();
- };
-
- void MyGLWidget::initializeGL()
- {
- initializeGLFunctions();
- }
- \endcode
-
- The \c{paintGL()} function can then use any of the OpenGL/ES 2.0
- functions without explicit resolution, such as glActiveTexture()
- in the following example:
-
- \code
- void MyGLWidget::paintGL()
- {
- glActiveTexture(GL_TEXTURE1);
- glBindTexture(GL_TEXTURE_2D, textureId);
- ...
- }
- \endcode
-
- QOpenGLFunctions can also be used directly for ad-hoc invocation
- of OpenGL/ES 2.0 functions on all platforms:
-
- \code
- QOpenGLFunctions glFuncs(QGLContext::currentContext());
- glFuncs.glActiveTexture(GL_TEXTURE1);
- \endcode
-
- QOpenGLFunctions provides wrappers for all OpenGL/ES 2.0 functions,
- except those like \c{glDrawArrays()}, \c{glViewport()}, and
- \c{glBindTexture()} that don't have portability issues.
-
- Including the header for QOpenGLFunctions will also define all of
- the OpenGL/ES 2.0 macro constants that are not already defined by
- the system's OpenGL headers, such as \c{GL_TEXTURE1} above.
-
- The hasOpenGLFeature() and openGLFeatures() functions can be used
- to determine if the OpenGL implementation has a major OpenGL/ES 2.0
- feature. For example, the following checks if non power of two
- textures are available:
-
- \code
- QOpenGLFunctions funcs(QGLContext::currentContext());
- bool npot = funcs.hasOpenGLFeature(QOpenGLFunctions::NPOTTextures);
- \endcode
-*/
-
-/*!
- \enum QOpenGLFunctions::OpenGLFeature
- This enum defines OpenGL/ES 2.0 features that may be optional
- on other platforms.
-
- \value Multitexture glActiveTexture() function is available.
- \value Shaders Shader functions are available.
- \value Buffers Vertex and index buffer functions are available.
- \value Framebuffers Framebuffer object functions are available.
- \value BlendColor glBlendColor() is available.
- \value BlendEquation glBlendEquation() is available.
- \value BlendEquationSeparate glBlendEquationSeparate() is available.
- \value BlendFuncSeparate glBlendFuncSeparate() is available.
- \value BlendSubtract Blend subtract mode is available.
- \value CompressedTextures Compressed texture functions are available.
- \value Multisample glSampleCoverage() function is available.
- \value StencilSeparate Separate stencil functions are available.
- \value NPOTTextures Non power of two textures are available.
-*/
-
-// Hidden private fields for additional extension data.
-// Hidden private fields for additional extension data.
-struct QOpenGLFunctionsPrivateEx : public QOpenGLFunctionsPrivate
-{
- QOpenGLFunctionsPrivateEx(const QGLContext *context = 0)
- : QOpenGLFunctionsPrivate(context)
- , m_features(-1) {}
-
- int m_features;
-};
-
-Q_GLOBAL_STATIC(QGLResource<QOpenGLFunctionsPrivateEx>, qt_gl_functions_resource)
-
-static QOpenGLFunctionsPrivateEx *qt_gl_functions(const QGLContext *context = 0)
-{
- if (!context)
- context = QGLContext::currentContext();
- Q_ASSERT(context);
- return qt_gl_functions_resource()->value(context);
-}
-
-/*!
- Constructs a default function resolver. The resolver cannot
- be used until initializeGLFunctions() is called to specify
- the context.
-
- \sa initializeGLFunctions()
-*/
-QOpenGLFunctions::QOpenGLFunctions()
- : d_ptr(0)
-{
-}
-
-/*!
- Constructs a function resolver for \a context. If \a context
- is null, then the resolver will be created for the current QGLContext.
-
- An object constructed in this way can only be used with \a context
- and other contexts that share with it. Use initializeGLFunctions()
- to change the object's context association.
-
- \sa initializeGLFunctions()
-*/
-QOpenGLFunctions::QOpenGLFunctions(const QGLContext *context)
- : d_ptr(qt_gl_functions(context))
-{
-}
-
-/*!
- \fn QOpenGLFunctions::~QOpenGLFunctions()
-
- Destroys this function resolver.
-*/
-
-static int qt_gl_resolve_features()
-{
-#if defined(QT_OPENGL_ES_2)
- return QOpenGLFunctions::Multitexture |
- QOpenGLFunctions::Shaders |
- QOpenGLFunctions::Buffers |
- QOpenGLFunctions::Framebuffers |
- QOpenGLFunctions::BlendColor |
- QOpenGLFunctions::BlendEquation |
- QOpenGLFunctions::BlendEquationSeparate |
- QOpenGLFunctions::BlendFuncSeparate |
- QOpenGLFunctions::BlendSubtract |
- QOpenGLFunctions::CompressedTextures |
- QOpenGLFunctions::Multisample |
- QOpenGLFunctions::StencilSeparate |
- QOpenGLFunctions::NPOTTextures;
-#elif defined(QT_OPENGL_ES)
- int features = QOpenGLFunctions::Multitexture |
- QOpenGLFunctions::Buffers |
- QOpenGLFunctions::CompressedTextures |
- QOpenGLFunctions::Multisample;
- QGLExtensionChecker extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
- if (extensions.match("GL_OES_framebuffer_object"))
- features |= QOpenGLFunctions::Framebuffers;
- if (extensions.match("GL_OES_blend_equation_separate"))
- features |= QOpenGLFunctions::BlendEquationSeparate;
- if (extensions.match("GL_OES_blend_func_separate"))
- features |= QOpenGLFunctions::BlendFuncSeparate;
- if (extensions.match("GL_OES_blend_subtract"))
- features |= QOpenGLFunctions::BlendSubtract;
- if (extensions.match("GL_OES_texture_npot"))
- features |= QOpenGLFunctions::NPOTTextures;
- return features;
-#else
- int features = 0;
- QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags();
- QGLExtensionChecker extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
-
- // Recognize features by extension name.
- if (extensions.match("GL_ARB_multitexture"))
- features |= QOpenGLFunctions::Multitexture;
- if (extensions.match("GL_ARB_shader_objects"))
- features |= QOpenGLFunctions::Shaders;
- if (extensions.match("GL_EXT_framebuffer_object") ||
- extensions.match("GL_ARB_framebuffer_object"))
- features |= QOpenGLFunctions::Framebuffers;
- if (extensions.match("GL_EXT_blend_color"))
- features |= QOpenGLFunctions::BlendColor;
- if (extensions.match("GL_EXT_blend_equation_separate"))
- features |= QOpenGLFunctions::BlendEquationSeparate;
- if (extensions.match("GL_EXT_blend_func_separate"))
- features |= QOpenGLFunctions::BlendFuncSeparate;
- if (extensions.match("GL_EXT_blend_subtract"))
- features |= QOpenGLFunctions::BlendSubtract;
- if (extensions.match("GL_ARB_texture_compression"))
- features |= QOpenGLFunctions::CompressedTextures;
- if (extensions.match("GL_ARB_multisample"))
- features |= QOpenGLFunctions::Multisample;
- if (extensions.match("GL_ARB_texture_non_power_of_two"))
- features |= QOpenGLFunctions::NPOTTextures;
-
- // Recognize features by minimum OpenGL version.
- if (versions & QGLFormat::OpenGL_Version_1_2) {
- features |= QOpenGLFunctions::BlendColor |
- QOpenGLFunctions::BlendEquation;
- }
- if (versions & QGLFormat::OpenGL_Version_1_3) {
- features |= QOpenGLFunctions::Multitexture |
- QOpenGLFunctions::CompressedTextures |
- QOpenGLFunctions::Multisample;
- }
- if (versions & QGLFormat::OpenGL_Version_1_4)
- features |= QOpenGLFunctions::BlendFuncSeparate;
- if (versions & QGLFormat::OpenGL_Version_1_5)
- features |= QOpenGLFunctions::Buffers;
- if (versions & QGLFormat::OpenGL_Version_2_0) {
- features |= QOpenGLFunctions::Shaders |
- QOpenGLFunctions::StencilSeparate |
- QOpenGLFunctions::BlendEquationSeparate |
- QOpenGLFunctions::NPOTTextures;
- }
- return features;
-#endif
-}
-
-/*!
- Returns the set of features that are present on this system's
- OpenGL implementation.
-
- It is assumed that the QGLContext associated with this function
- resolver is current.
-
- \sa hasOpenGLFeature()
-*/
-QOpenGLFunctions::OpenGLFeatures QOpenGLFunctions::openGLFeatures() const
-{
- QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr);
- if (!d)
- return 0;
- if (d->m_features == -1)
- d->m_features = qt_gl_resolve_features();
- return QOpenGLFunctions::OpenGLFeatures(d->m_features);
-}
-
-/*!
- Returns true if \a feature is present on this system's OpenGL
- implementation; false otherwise.
-
- It is assumed that the QGLContext associated with this function
- resolver is current.
-
- \sa openGLFeatures()
-*/
-bool QOpenGLFunctions::hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const
-{
- QOpenGLFunctionsPrivateEx *d = static_cast<QOpenGLFunctionsPrivateEx *>(d_ptr);
- if (!d)
- return false;
- if (d->m_features == -1)
- d->m_features = qt_gl_resolve_features();
- return (d->m_features & int(feature)) != 0;
-}
-
-/*!
- Initializes GL function resolution for \a context. If \a context
- is null, then the current QGLContext will be used.
-
- After calling this function, the QOpenGLFunctions object can only be
- used with \a context and other contexts that share with it.
- Call initializeGLFunctions() again to change the object's context
- association.
-*/
-void QOpenGLFunctions::initializeGLFunctions(const QGLContext *context)
-{
- d_ptr = qt_gl_functions(context);
-}
-
-
-/*!
- \fn void QOpenGLFunctions::glActiveTexture(GLenum texture)
-
- Convenience function that calls glActiveTexture(\a texture).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glActiveTexture.xml}{glActiveTexture()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glAttachShader(GLuint program, GLuint shader)
-
- Convenience function that calls glAttachShader(\a program, \a shader).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glAttachShader.xml}{glAttachShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBindAttribLocation(GLuint program, GLuint index, const char* name)
-
- Convenience function that calls glBindAttribLocation(\a program, \a index, \a name).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBindAttribLocation.xml}{glBindAttribLocation()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBindBuffer(GLenum target, GLuint buffer)
-
- Convenience function that calls glBindBuffer(\a target, \a buffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBindBuffer.xml}{glBindBuffer()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffer)
-
- Convenience function that calls glBindFramebuffer(\a target, \a framebuffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBindFramebuffer.xml}{glBindFramebuffer()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-
- Convenience function that calls glBindRenderbuffer(\a target, \a renderbuffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBindRenderbuffer.xml}{glBindRenderbuffer()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-
- Convenience function that calls glBlendColor(\a red, \a green, \a blue, \a alpha).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendColor.xml}{glBlendColor()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBlendEquation(GLenum mode)
-
- Convenience function that calls glBlendEquation(\a mode).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendEquation.xml}{glBlendEquation()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-
- Convenience function that calls glBlendEquationSeparate(\a modeRGB, \a modeAlpha).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendEquationSeparate.xml}{glBlendEquationSeparate()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-
- Convenience function that calls glBlendFuncSeparate(\a srcRGB, \a dstRGB, \a srcAlpha, \a dstAlpha).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendFuncSeparate.xml}{glBlendFuncSeparate()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage)
-
- Convenience function that calls glBufferData(\a target, \a size, \a data, \a usage).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBufferData.xml}{glBufferData()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data)
-
- Convenience function that calls glBufferSubData(\a target, \a offset, \a size, \a data).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glBufferSubData.xml}{glBufferSubData()}.
-*/
-
-/*!
- \fn GLenum QOpenGLFunctions::glCheckFramebufferStatus(GLenum target)
-
- Convenience function that calls glCheckFramebufferStatus(\a target).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCheckFramebufferStatus.xml}{glCheckFramebufferStatus()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glClearDepthf(GLclampf depth)
-
- Convenience function that calls glClearDepth(\a depth) on
- desktop OpenGL systems and glClearDepthf(\a depth) on
- embedded OpenGL/ES systems.
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glClearDepthf.xml}{glClearDepthf()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glCompileShader(GLuint shader)
-
- Convenience function that calls glCompileShader(\a shader).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCompileShader.xml}{glCompileShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-
- Convenience function that calls glCompressedTexImage2D(\a target, \a level, \a internalformat, \a width, \a height, \a border, \a imageSize, \a data).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCompressedTexImage2D.xml}{glCompressedTexImage2D()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-
- Convenience function that calls glCompressedTexSubImage2D(\a target, \a level, \a xoffset, \a yoffset, \a width, \a height, \a format, \a imageSize, \a data).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCompressedTexSubImage2D.xml}{glCompressedTexSubImage2D()}.
-*/
-
-/*!
- \fn GLuint QOpenGLFunctions::glCreateProgram()
-
- Convenience function that calls glCreateProgram().
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCreateProgram.xml}{glCreateProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn GLuint QOpenGLFunctions::glCreateShader(GLenum type)
-
- Convenience function that calls glCreateShader(\a type).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glCreateShader.xml}{glCreateShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers)
-
- Convenience function that calls glDeleteBuffers(\a n, \a buffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteBuffers.xml}{glDeleteBuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-
- Convenience function that calls glDeleteFramebuffers(\a n, \a framebuffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteFramebuffers.xml}{glDeleteFramebuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDeleteProgram(GLuint program)
-
- Convenience function that calls glDeleteProgram(\a program).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteProgram.xml}{glDeleteProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-
- Convenience function that calls glDeleteRenderbuffers(\a n, \a renderbuffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteRenderbuffers.xml}{glDeleteRenderbuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDeleteShader(GLuint shader)
-
- Convenience function that calls glDeleteShader(\a shader).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteShader.xml}{glDeleteShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar)
-
- Convenience function that calls glDepthRange(\a zNear, \a zFar) on
- desktop OpenGL systems and glDepthRangef(\a zNear, \a zFar) on
- embedded OpenGL/ES systems.
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDepthRangef.xml}{glDepthRangef()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDetachShader(GLuint program, GLuint shader)
-
- Convenience function that calls glDetachShader(\a program, \a shader).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDetachShader.xml}{glDetachShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glDisableVertexAttribArray(GLuint index)
-
- Convenience function that calls glDisableVertexAttribArray(\a index).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glDisableVertexAttribArray.xml}{glDisableVertexAttribArray()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glEnableVertexAttribArray(GLuint index)
-
- Convenience function that calls glEnableVertexAttribArray(\a index).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glEnableVertexAttribArray.xml}{glEnableVertexAttribArray()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-
- Convenience function that calls glFramebufferRenderbuffer(\a target, \a attachment, \a renderbuffertarget, \a renderbuffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glFramebufferRenderbuffer.xml}{glFramebufferRenderbuffer()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-
- Convenience function that calls glFramebufferTexture2D(\a target, \a attachment, \a textarget, \a texture, \a level).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glFramebufferTexture2D.xml}{glFramebufferTexture2D()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers)
-
- Convenience function that calls glGenBuffers(\a n, \a buffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGenBuffers.xml}{glGenBuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGenerateMipmap(GLenum target)
-
- Convenience function that calls glGenerateMipmap(\a target).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGenerateMipmap.xml}{glGenerateMipmap()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers)
-
- Convenience function that calls glGenFramebuffers(\a n, \a framebuffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGenFramebuffers.xml}{glGenFramebuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-
- Convenience function that calls glGenRenderbuffers(\a n, \a renderbuffers).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGenRenderbuffers.xml}{glGenRenderbuffers()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-
- Convenience function that calls glGetActiveAttrib(\a program, \a index, \a bufsize, \a length, \a size, \a type, \a name).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetActiveAttrib.xml}{glGetActiveAttrib()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-
- Convenience function that calls glGetActiveUniform(\a program, \a index, \a bufsize, \a length, \a size, \a type, \a name).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetActiveUniform.xml}{glGetActiveUniform()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-
- Convenience function that calls glGetAttachedShaders(\a program, \a maxcount, \a count, \a shaders).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetAttachedShaders.xml}{glGetAttachedShaders()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn int QOpenGLFunctions::glGetAttribLocation(GLuint program, const char* name)
-
- Convenience function that calls glGetAttribLocation(\a program, \a name).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetAttribLocation.xml}{glGetAttribLocation()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-
- Convenience function that calls glGetBufferParameteriv(\a target, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetBufferParameteriv.xml}{glGetBufferParameteriv()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-
- Convenience function that calls glGetFramebufferAttachmentParameteriv(\a target, \a attachment, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetFramebufferAttachmentParameteriv.xml}{glGetFramebufferAttachmentParameteriv()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint* params)
-
- Convenience function that calls glGetProgramiv(\a program, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetProgramiv.xml}{glGetProgramiv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-
- Convenience function that calls glGetProgramInfoLog(\a program, \a bufsize, \a length, \a infolog).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetProgramInfoLog.xml}{glGetProgramInfoLog()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-
- Convenience function that calls glGetRenderbufferParameteriv(\a target, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetRenderbufferParameteriv.xml}{glGetRenderbufferParameteriv()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-
- Convenience function that calls glGetShaderiv(\a shader, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderiv.xml}{glGetShaderiv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-
- Convenience function that calls glGetShaderInfoLog(\a shader, \a bufsize, \a length, \a infolog).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderInfoLog.xml}{glGetShaderInfoLog()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-
- Convenience function that calls glGetShaderPrecisionFormat(\a shadertype, \a precisiontype, \a range, \a precision).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderPrecisionFormat.xml}{glGetShaderPrecisionFormat()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-
- Convenience function that calls glGetShaderSource(\a shader, \a bufsize, \a length, \a source).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderSource.xml}{glGetShaderSource()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetUniformfv(GLuint program, GLint location, GLfloat* params)
-
- Convenience function that calls glGetUniformfv(\a program, \a location, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformfv.xml}{glGetUniformfv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetUniformiv(GLuint program, GLint location, GLint* params)
-
- Convenience function that calls glGetUniformiv(\a program, \a location, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformiv.xml}{glGetUniformiv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn int QOpenGLFunctions::glGetUniformLocation(GLuint program, const char* name)
-
- Convenience function that calls glGetUniformLocation(\a program, \a name).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformLocation.xml}{glGetUniformLocation()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-
- Convenience function that calls glGetVertexAttribfv(\a index, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribfv.xml}{glGetVertexAttribfv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-
- Convenience function that calls glGetVertexAttribiv(\a index, \a pname, \a params).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribiv.xml}{glGetVertexAttribiv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-
- Convenience function that calls glGetVertexAttribPointerv(\a index, \a pname, \a pointer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribPointerv.xml}{glGetVertexAttribPointerv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn GLboolean QOpenGLFunctions::glIsBuffer(GLuint buffer)
-
- Convenience function that calls glIsBuffer(\a buffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glIsBuffer.xml}{glIsBuffer()}.
-*/
-
-/*!
- \fn GLboolean QOpenGLFunctions::glIsFramebuffer(GLuint framebuffer)
-
- Convenience function that calls glIsFramebuffer(\a framebuffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glIsFramebuffer.xml}{glIsFramebuffer()}.
-*/
-
-/*!
- \fn GLboolean QOpenGLFunctions::glIsProgram(GLuint program)
-
- Convenience function that calls glIsProgram(\a program).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glIsProgram.xml}{glIsProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn GLboolean QOpenGLFunctions::glIsRenderbuffer(GLuint renderbuffer)
-
- Convenience function that calls glIsRenderbuffer(\a renderbuffer).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glIsRenderbuffer.xml}{glIsRenderbuffer()}.
-*/
-
-/*!
- \fn GLboolean QOpenGLFunctions::glIsShader(GLuint shader)
-
- Convenience function that calls glIsShader(\a shader).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glIsShader.xml}{glIsShader()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glLinkProgram(GLuint program)
-
- Convenience function that calls glLinkProgram(\a program).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glLinkProgram.xml}{glLinkProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glReleaseShaderCompiler()
-
- Convenience function that calls glReleaseShaderCompiler().
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glReleaseShaderCompiler.xml}{glReleaseShaderCompiler()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-
- Convenience function that calls glRenderbufferStorage(\a target, \a internalformat, \a width, \a height).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glRenderbufferStorage.xml}{glRenderbufferStorage()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert)
-
- Convenience function that calls glSampleCoverage(\a value, \a invert).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glSampleCoverage.xml}{glSampleCoverage()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-
- Convenience function that calls glShaderBinary(\a n, \a shaders, \a binaryformat, \a binary, \a length).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glShaderBinary.xml}{glShaderBinary()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-
- Convenience function that calls glShaderSource(\a shader, \a count, \a string, \a length).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glShaderSource.xml}{glShaderSource()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-
- Convenience function that calls glStencilFuncSeparate(\a face, \a func, \a ref, \a mask).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilFuncSeparate.xml}{glStencilFuncSeparate()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask)
-
- Convenience function that calls glStencilMaskSeparate(\a face, \a mask).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilMaskSeparate.xml}{glStencilMaskSeparate()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-
- Convenience function that calls glStencilOpSeparate(\a face, \a fail, \a zfail, \a zpass).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilOpSeparate.xml}{glStencilOpSeparate()}.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform1f(GLint location, GLfloat x)
-
- Convenience function that calls glUniform1f(\a location, \a x).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1f.xml}{glUniform1f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-
- Convenience function that calls glUniform1fv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1fv.xml}{glUniform1fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform1i(GLint location, GLint x)
-
- Convenience function that calls glUniform1i(\a location, \a x).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1i.xml}{glUniform1i()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform1iv(GLint location, GLsizei count, const GLint* v)
-
- Convenience function that calls glUniform1iv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1iv.xml}{glUniform1iv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y)
-
- Convenience function that calls glUniform2f(\a location, \a x, \a y).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2f.xml}{glUniform2f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-
- Convenience function that calls glUniform2fv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2fv.xml}{glUniform2fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform2i(GLint location, GLint x, GLint y)
-
- Convenience function that calls glUniform2i(\a location, \a x, \a y).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2i.xml}{glUniform2i()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform2iv(GLint location, GLsizei count, const GLint* v)
-
- Convenience function that calls glUniform2iv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2iv.xml}{glUniform2iv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-
- Convenience function that calls glUniform3f(\a location, \a x, \a y, \a z).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3f.xml}{glUniform3f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-
- Convenience function that calls glUniform3fv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3fv.xml}{glUniform3fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLint z)
-
- Convenience function that calls glUniform3i(\a location, \a x, \a y, \a z).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3i.xml}{glUniform3i()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform3iv(GLint location, GLsizei count, const GLint* v)
-
- Convenience function that calls glUniform3iv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3iv.xml}{glUniform3iv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-
- Convenience function that calls glUniform4f(\a location, \a x, \a y, \a z, \a w).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4f.xml}{glUniform4f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-
- Convenience function that calls glUniform4fv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4fv.xml}{glUniform4fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-
- Convenience function that calls glUniform4i(\a location, \a x, \a y, \a z, \a w).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4i.xml}{glUniform4i()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniform4iv(GLint location, GLsizei count, const GLint* v)
-
- Convenience function that calls glUniform4iv(\a location, \a count, \a v).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4iv.xml}{glUniform4iv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
- Convenience function that calls glUniformMatrix2fv(\a location, \a count, \a transpose, \a value).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix2fv.xml}{glUniformMatrix2fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
- Convenience function that calls glUniformMatrix3fv(\a location, \a count, \a transpose, \a value).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix3fv.xml}{glUniformMatrix3fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
- Convenience function that calls glUniformMatrix4fv(\a location, \a count, \a transpose, \a value).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix4fv.xml}{glUniformMatrix4fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glUseProgram(GLuint program)
-
- Convenience function that calls glUseProgram(\a program).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glUseProgram.xml}{glUseProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glValidateProgram(GLuint program)
-
- Convenience function that calls glValidateProgram(\a program).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glValidateProgram.xml}{glValidateProgram()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x)
-
- Convenience function that calls glVertexAttrib1f(\a indx, \a x).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib1f.xml}{glVertexAttrib1f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* values)
-
- Convenience function that calls glVertexAttrib1fv(\a indx, \a values).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib1fv.xml}{glVertexAttrib1fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-
- Convenience function that calls glVertexAttrib2f(\a indx, \a x, \a y).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib2f.xml}{glVertexAttrib2f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* values)
-
- Convenience function that calls glVertexAttrib2fv(\a indx, \a values).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib2fv.xml}{glVertexAttrib2fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-
- Convenience function that calls glVertexAttrib3f(\a indx, \a x, \a y, \a z).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib3f.xml}{glVertexAttrib3f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* values)
-
- Convenience function that calls glVertexAttrib3fv(\a indx, \a values).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib3fv.xml}{glVertexAttrib3fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-
- Convenience function that calls glVertexAttrib4f(\a indx, \a x, \a y, \a z, \a w).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib4f.xml}{glVertexAttrib4f()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* values)
-
- Convenience function that calls glVertexAttrib4fv(\a indx, \a values).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib4fv.xml}{glVertexAttrib4fv()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-/*!
- \fn void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-
- Convenience function that calls glVertexAttribPointer(\a indx, \a size, \a type, \a normalized, \a stride, \a ptr).
-
- For more information, see the OpenGL/ES 2.0 documentation for
- \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttribPointer.xml}{glVertexAttribPointer()}.
-
- This convenience function will do nothing on OpenGL/ES 1.x systems.
-*/
-
-#ifndef QT_OPENGL_ES_2
-
-static void QT3D_GLF_APIENTRY qglfResolveActiveTexture(GLenum texture)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glActiveTexture)(GLenum texture);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->activeTexture = (type_glActiveTexture)
- context->getProcAddress(QLatin1String("glActiveTexture"));
- if (!funcs->activeTexture) {
- funcs->activeTexture = (type_glActiveTexture)
- context->getProcAddress(QLatin1String("glActiveTextureARB"));
- }
-
- if (funcs->activeTexture)
- funcs->activeTexture(texture);
- else
- funcs->activeTexture = qglfResolveActiveTexture;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveAttachShader(GLuint program, GLuint shader)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glAttachShader)(GLuint program, GLuint shader);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->attachShader = (type_glAttachShader)
- context->getProcAddress(QLatin1String("glAttachShader"));
- if (!funcs->attachShader) {
- funcs->attachShader = (type_glAttachShader)
- context->getProcAddress(QLatin1String("glAttachObjectARB"));
- }
-
- if (funcs->attachShader)
- funcs->attachShader(program, shader);
- else
- funcs->attachShader = qglfResolveAttachShader;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBindAttribLocation(GLuint program, GLuint index, const char* name)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBindAttribLocation)(GLuint program, GLuint index, const char* name);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bindAttribLocation = (type_glBindAttribLocation)
- context->getProcAddress(QLatin1String("glBindAttribLocation"));
- if (!funcs->bindAttribLocation) {
- funcs->bindAttribLocation = (type_glBindAttribLocation)
- context->getProcAddress(QLatin1String("glBindAttribLocationARB"));
- }
-
- if (funcs->bindAttribLocation)
- funcs->bindAttribLocation(program, index, name);
- else
- funcs->bindAttribLocation = qglfResolveBindAttribLocation;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBindBuffer(GLenum target, GLuint buffer)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBindBuffer)(GLenum target, GLuint buffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bindBuffer = (type_glBindBuffer)
- context->getProcAddress(QLatin1String("glBindBuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->bindBuffer) {
- funcs->bindBuffer = (type_glBindBuffer)
- context->getProcAddress(QLatin1String("glBindBufferOES"));
- }
-#endif
- if (!funcs->bindBuffer) {
- funcs->bindBuffer = (type_glBindBuffer)
- context->getProcAddress(QLatin1String("glBindBufferEXT"));
- }
- if (!funcs->bindBuffer) {
- funcs->bindBuffer = (type_glBindBuffer)
- context->getProcAddress(QLatin1String("glBindBufferARB"));
- }
-
- if (funcs->bindBuffer)
- funcs->bindBuffer(target, buffer);
- else
- funcs->bindBuffer = qglfResolveBindBuffer;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBindFramebuffer(GLenum target, GLuint framebuffer)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBindFramebuffer)(GLenum target, GLuint framebuffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bindFramebuffer = (type_glBindFramebuffer)
- context->getProcAddress(QLatin1String("glBindFramebuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->bindFramebuffer) {
- funcs->bindFramebuffer = (type_glBindFramebuffer)
- context->getProcAddress(QLatin1String("glBindFramebufferOES"));
- }
-#endif
- if (!funcs->bindFramebuffer) {
- funcs->bindFramebuffer = (type_glBindFramebuffer)
- context->getProcAddress(QLatin1String("glBindFramebufferEXT"));
- }
- if (!funcs->bindFramebuffer) {
- funcs->bindFramebuffer = (type_glBindFramebuffer)
- context->getProcAddress(QLatin1String("glBindFramebufferARB"));
- }
-
- if (funcs->bindFramebuffer)
- funcs->bindFramebuffer(target, framebuffer);
- else
- funcs->bindFramebuffer = qglfResolveBindFramebuffer;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBindRenderbuffer)(GLenum target, GLuint renderbuffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bindRenderbuffer = (type_glBindRenderbuffer)
- context->getProcAddress(QLatin1String("glBindRenderbuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->bindRenderbuffer) {
- funcs->bindRenderbuffer = (type_glBindRenderbuffer)
- context->getProcAddress(QLatin1String("glBindRenderbufferOES"));
- }
-#endif
- if (!funcs->bindRenderbuffer) {
- funcs->bindRenderbuffer = (type_glBindRenderbuffer)
- context->getProcAddress(QLatin1String("glBindRenderbufferEXT"));
- }
- if (!funcs->bindRenderbuffer) {
- funcs->bindRenderbuffer = (type_glBindRenderbuffer)
- context->getProcAddress(QLatin1String("glBindRenderbufferARB"));
- }
-
- if (funcs->bindRenderbuffer)
- funcs->bindRenderbuffer(target, renderbuffer);
- else
- funcs->bindRenderbuffer = qglfResolveBindRenderbuffer;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->blendColor = (type_glBlendColor)
- context->getProcAddress(QLatin1String("glBlendColor"));
-#ifdef QT_OPENGL_ES
- if (!funcs->blendColor) {
- funcs->blendColor = (type_glBlendColor)
- context->getProcAddress(QLatin1String("glBlendColorOES"));
- }
-#endif
- if (!funcs->blendColor) {
- funcs->blendColor = (type_glBlendColor)
- context->getProcAddress(QLatin1String("glBlendColorEXT"));
- }
- if (!funcs->blendColor) {
- funcs->blendColor = (type_glBlendColor)
- context->getProcAddress(QLatin1String("glBlendColorARB"));
- }
-
- if (funcs->blendColor)
- funcs->blendColor(red, green, blue, alpha);
- else
- funcs->blendColor = qglfResolveBlendColor;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBlendEquation(GLenum mode)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBlendEquation)(GLenum mode);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->blendEquation = (type_glBlendEquation)
- context->getProcAddress(QLatin1String("glBlendEquation"));
-#ifdef QT_OPENGL_ES
- if (!funcs->blendEquation) {
- funcs->blendEquation = (type_glBlendEquation)
- context->getProcAddress(QLatin1String("glBlendEquationOES"));
- }
-#endif
- if (!funcs->blendEquation) {
- funcs->blendEquation = (type_glBlendEquation)
- context->getProcAddress(QLatin1String("glBlendEquationEXT"));
- }
- if (!funcs->blendEquation) {
- funcs->blendEquation = (type_glBlendEquation)
- context->getProcAddress(QLatin1String("glBlendEquationARB"));
- }
-
- if (funcs->blendEquation)
- funcs->blendEquation(mode);
- else
- funcs->blendEquation = qglfResolveBlendEquation;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->blendEquationSeparate = (type_glBlendEquationSeparate)
- context->getProcAddress(QLatin1String("glBlendEquationSeparate"));
-#ifdef QT_OPENGL_ES
- if (!funcs->blendEquationSeparate) {
- funcs->blendEquationSeparate = (type_glBlendEquationSeparate)
- context->getProcAddress(QLatin1String("glBlendEquationSeparateOES"));
- }
-#endif
- if (!funcs->blendEquationSeparate) {
- funcs->blendEquationSeparate = (type_glBlendEquationSeparate)
- context->getProcAddress(QLatin1String("glBlendEquationSeparateEXT"));
- }
- if (!funcs->blendEquationSeparate) {
- funcs->blendEquationSeparate = (type_glBlendEquationSeparate)
- context->getProcAddress(QLatin1String("glBlendEquationSeparateARB"));
- }
-
- if (funcs->blendEquationSeparate)
- funcs->blendEquationSeparate(modeRGB, modeAlpha);
- else
- funcs->blendEquationSeparate = qglfResolveBlendEquationSeparate;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBlendFuncSeparate)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->blendFuncSeparate = (type_glBlendFuncSeparate)
- context->getProcAddress(QLatin1String("glBlendFuncSeparate"));
-#ifdef QT_OPENGL_ES
- if (!funcs->blendFuncSeparate) {
- funcs->blendFuncSeparate = (type_glBlendFuncSeparate)
- context->getProcAddress(QLatin1String("glBlendFuncSeparateOES"));
- }
-#endif
- if (!funcs->blendFuncSeparate) {
- funcs->blendFuncSeparate = (type_glBlendFuncSeparate)
- context->getProcAddress(QLatin1String("glBlendFuncSeparateEXT"));
- }
- if (!funcs->blendFuncSeparate) {
- funcs->blendFuncSeparate = (type_glBlendFuncSeparate)
- context->getProcAddress(QLatin1String("glBlendFuncSeparateARB"));
- }
-
- if (funcs->blendFuncSeparate)
- funcs->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
- else
- funcs->blendFuncSeparate = qglfResolveBlendFuncSeparate;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBufferData)(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bufferData = (type_glBufferData)
- context->getProcAddress(QLatin1String("glBufferData"));
-#ifdef QT_OPENGL_ES
- if (!funcs->bufferData) {
- funcs->bufferData = (type_glBufferData)
- context->getProcAddress(QLatin1String("glBufferDataOES"));
- }
-#endif
- if (!funcs->bufferData) {
- funcs->bufferData = (type_glBufferData)
- context->getProcAddress(QLatin1String("glBufferDataEXT"));
- }
- if (!funcs->bufferData) {
- funcs->bufferData = (type_glBufferData)
- context->getProcAddress(QLatin1String("glBufferDataARB"));
- }
-
- if (funcs->bufferData)
- funcs->bufferData(target, size, data, usage);
- else
- funcs->bufferData = qglfResolveBufferData;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glBufferSubData)(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->bufferSubData = (type_glBufferSubData)
- context->getProcAddress(QLatin1String("glBufferSubData"));
-#ifdef QT_OPENGL_ES
- if (!funcs->bufferSubData) {
- funcs->bufferSubData = (type_glBufferSubData)
- context->getProcAddress(QLatin1String("glBufferSubDataOES"));
- }
-#endif
- if (!funcs->bufferSubData) {
- funcs->bufferSubData = (type_glBufferSubData)
- context->getProcAddress(QLatin1String("glBufferSubDataEXT"));
- }
- if (!funcs->bufferSubData) {
- funcs->bufferSubData = (type_glBufferSubData)
- context->getProcAddress(QLatin1String("glBufferSubDataARB"));
- }
-
- if (funcs->bufferSubData)
- funcs->bufferSubData(target, offset, size, data);
- else
- funcs->bufferSubData = qglfResolveBufferSubData;
-}
-
-static GLenum QT3D_GLF_APIENTRY qglfResolveCheckFramebufferStatus(GLenum target)
-{
- typedef GLenum (QT3D_GLF_APIENTRYP type_glCheckFramebufferStatus)(GLenum target);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->checkFramebufferStatus = (type_glCheckFramebufferStatus)
- context->getProcAddress(QLatin1String("glCheckFramebufferStatus"));
-#ifdef QT_OPENGL_ES
- if (!funcs->checkFramebufferStatus) {
- funcs->checkFramebufferStatus = (type_glCheckFramebufferStatus)
- context->getProcAddress(QLatin1String("glCheckFramebufferStatusOES"));
- }
-#endif
- if (!funcs->checkFramebufferStatus) {
- funcs->checkFramebufferStatus = (type_glCheckFramebufferStatus)
- context->getProcAddress(QLatin1String("glCheckFramebufferStatusEXT"));
- }
- if (!funcs->checkFramebufferStatus) {
- funcs->checkFramebufferStatus = (type_glCheckFramebufferStatus)
- context->getProcAddress(QLatin1String("glCheckFramebufferStatusARB"));
- }
-
- if (funcs->checkFramebufferStatus)
- return funcs->checkFramebufferStatus(target);
- funcs->checkFramebufferStatus = qglfResolveCheckFramebufferStatus;
- return GLenum(0);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveCompileShader(GLuint shader)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glCompileShader)(GLuint shader);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->compileShader = (type_glCompileShader)
- context->getProcAddress(QLatin1String("glCompileShader"));
- if (!funcs->compileShader) {
- funcs->compileShader = (type_glCompileShader)
- context->getProcAddress(QLatin1String("glCompileShader"));
- }
-
- if (funcs->compileShader)
- funcs->compileShader(shader);
- else
- funcs->compileShader = qglfResolveCompileShader;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glCompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->compressedTexImage2D = (type_glCompressedTexImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexImage2D"));
-#ifdef QT_OPENGL_ES
- if (!funcs->compressedTexImage2D) {
- funcs->compressedTexImage2D = (type_glCompressedTexImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexImage2DOES"));
- }
-#endif
- if (!funcs->compressedTexImage2D) {
- funcs->compressedTexImage2D = (type_glCompressedTexImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexImage2DEXT"));
- }
- if (!funcs->compressedTexImage2D) {
- funcs->compressedTexImage2D = (type_glCompressedTexImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexImage2DARB"));
- }
-
- if (funcs->compressedTexImage2D)
- funcs->compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
- else
- funcs->compressedTexImage2D = qglfResolveCompressedTexImage2D;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glCompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->compressedTexSubImage2D = (type_glCompressedTexSubImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexSubImage2D"));
-#ifdef QT_OPENGL_ES
- if (!funcs->compressedTexSubImage2D) {
- funcs->compressedTexSubImage2D = (type_glCompressedTexSubImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexSubImage2DOES"));
- }
-#endif
- if (!funcs->compressedTexSubImage2D) {
- funcs->compressedTexSubImage2D = (type_glCompressedTexSubImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexSubImage2DEXT"));
- }
- if (!funcs->compressedTexSubImage2D) {
- funcs->compressedTexSubImage2D = (type_glCompressedTexSubImage2D)
- context->getProcAddress(QLatin1String("glCompressedTexSubImage2DARB"));
- }
-
- if (funcs->compressedTexSubImage2D)
- funcs->compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
- else
- funcs->compressedTexSubImage2D = qglfResolveCompressedTexSubImage2D;
-}
-
-static GLuint QT3D_GLF_APIENTRY qglfResolveCreateProgram()
-{
- typedef GLuint (QT3D_GLF_APIENTRYP type_glCreateProgram)();
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->createProgram = (type_glCreateProgram)
- context->getProcAddress(QLatin1String("glCreateProgram"));
- if (!funcs->createProgram) {
- funcs->createProgram = (type_glCreateProgram)
- context->getProcAddress(QLatin1String("glCreateProgramObjectARB"));
- }
-
- if (funcs->createProgram)
- return funcs->createProgram();
- funcs->createProgram = qglfResolveCreateProgram;
- return GLuint(0);
-}
-
-static GLuint QT3D_GLF_APIENTRY qglfResolveCreateShader(GLenum type)
-{
- typedef GLuint (QT3D_GLF_APIENTRYP type_glCreateShader)(GLenum type);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->createShader = (type_glCreateShader)
- context->getProcAddress(QLatin1String("glCreateShader"));
- if (!funcs->createShader) {
- funcs->createShader = (type_glCreateShader)
- context->getProcAddress(QLatin1String("glCreateShaderObjectARB"));
- }
-
- if (funcs->createShader)
- return funcs->createShader(type);
- funcs->createShader = qglfResolveCreateShader;
- return GLuint(0);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDeleteBuffers(GLsizei n, const GLuint* buffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDeleteBuffers)(GLsizei n, const GLuint* buffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->deleteBuffers = (type_glDeleteBuffers)
- context->getProcAddress(QLatin1String("glDeleteBuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->deleteBuffers) {
- funcs->deleteBuffers = (type_glDeleteBuffers)
- context->getProcAddress(QLatin1String("glDeleteBuffersOES"));
- }
-#endif
- if (!funcs->deleteBuffers) {
- funcs->deleteBuffers = (type_glDeleteBuffers)
- context->getProcAddress(QLatin1String("glDeleteBuffersEXT"));
- }
- if (!funcs->deleteBuffers) {
- funcs->deleteBuffers = (type_glDeleteBuffers)
- context->getProcAddress(QLatin1String("glDeleteBuffersARB"));
- }
-
- if (funcs->deleteBuffers)
- funcs->deleteBuffers(n, buffers);
- else
- funcs->deleteBuffers = qglfResolveDeleteBuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDeleteFramebuffers)(GLsizei n, const GLuint* framebuffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->deleteFramebuffers = (type_glDeleteFramebuffers)
- context->getProcAddress(QLatin1String("glDeleteFramebuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->deleteFramebuffers) {
- funcs->deleteFramebuffers = (type_glDeleteFramebuffers)
- context->getProcAddress(QLatin1String("glDeleteFramebuffersOES"));
- }
-#endif
- if (!funcs->deleteFramebuffers) {
- funcs->deleteFramebuffers = (type_glDeleteFramebuffers)
- context->getProcAddress(QLatin1String("glDeleteFramebuffersEXT"));
- }
- if (!funcs->deleteFramebuffers) {
- funcs->deleteFramebuffers = (type_glDeleteFramebuffers)
- context->getProcAddress(QLatin1String("glDeleteFramebuffersARB"));
- }
-
- if (funcs->deleteFramebuffers)
- funcs->deleteFramebuffers(n, framebuffers);
- else
- funcs->deleteFramebuffers = qglfResolveDeleteFramebuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDeleteProgram(GLuint program)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDeleteProgram)(GLuint program);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->deleteProgram = (type_glDeleteProgram)
- context->getProcAddress(QLatin1String("glDeleteProgram"));
- if (!funcs->deleteProgram) {
- funcs->deleteProgram = (type_glDeleteProgram)
- context->getProcAddress(QLatin1String("glDeleteObjectARB"));
- }
-
- if (funcs->deleteProgram)
- funcs->deleteProgram(program);
- else
- funcs->deleteProgram = qglfResolveDeleteProgram;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDeleteRenderbuffers)(GLsizei n, const GLuint* renderbuffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->deleteRenderbuffers = (type_glDeleteRenderbuffers)
- context->getProcAddress(QLatin1String("glDeleteRenderbuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->deleteRenderbuffers) {
- funcs->deleteRenderbuffers = (type_glDeleteRenderbuffers)
- context->getProcAddress(QLatin1String("glDeleteRenderbuffersOES"));
- }
-#endif
- if (!funcs->deleteRenderbuffers) {
- funcs->deleteRenderbuffers = (type_glDeleteRenderbuffers)
- context->getProcAddress(QLatin1String("glDeleteRenderbuffersEXT"));
- }
- if (!funcs->deleteRenderbuffers) {
- funcs->deleteRenderbuffers = (type_glDeleteRenderbuffers)
- context->getProcAddress(QLatin1String("glDeleteRenderbuffersARB"));
- }
-
- if (funcs->deleteRenderbuffers)
- funcs->deleteRenderbuffers(n, renderbuffers);
- else
- funcs->deleteRenderbuffers = qglfResolveDeleteRenderbuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDeleteShader(GLuint shader)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDeleteShader)(GLuint shader);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->deleteShader = (type_glDeleteShader)
- context->getProcAddress(QLatin1String("glDeleteShader"));
- if (!funcs->deleteShader) {
- funcs->deleteShader = (type_glDeleteShader)
- context->getProcAddress(QLatin1String("glDeleteObjectARB"));
- }
-
- if (funcs->deleteShader)
- funcs->deleteShader(shader);
- else
- funcs->deleteShader = qglfResolveDeleteShader;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDetachShader(GLuint program, GLuint shader)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDetachShader)(GLuint program, GLuint shader);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->detachShader = (type_glDetachShader)
- context->getProcAddress(QLatin1String("glDetachShader"));
- if (!funcs->detachShader) {
- funcs->detachShader = (type_glDetachShader)
- context->getProcAddress(QLatin1String("glDetachObjectARB"));
- }
-
- if (funcs->detachShader)
- funcs->detachShader(program, shader);
- else
- funcs->detachShader = qglfResolveDetachShader;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveDisableVertexAttribArray(GLuint index)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glDisableVertexAttribArray)(GLuint index);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->disableVertexAttribArray = (type_glDisableVertexAttribArray)
- context->getProcAddress(QLatin1String("glDisableVertexAttribArray"));
- if (!funcs->disableVertexAttribArray) {
- funcs->disableVertexAttribArray = (type_glDisableVertexAttribArray)
- context->getProcAddress(QLatin1String("glDisableVertexAttribArrayARB"));
- }
-
- if (funcs->disableVertexAttribArray)
- funcs->disableVertexAttribArray(index);
- else
- funcs->disableVertexAttribArray = qglfResolveDisableVertexAttribArray;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveEnableVertexAttribArray(GLuint index)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glEnableVertexAttribArray)(GLuint index);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->enableVertexAttribArray = (type_glEnableVertexAttribArray)
- context->getProcAddress(QLatin1String("glEnableVertexAttribArray"));
- if (!funcs->enableVertexAttribArray) {
- funcs->enableVertexAttribArray = (type_glEnableVertexAttribArray)
- context->getProcAddress(QLatin1String("glEnableVertexAttribArrayARB"));
- }
-
- if (funcs->enableVertexAttribArray)
- funcs->enableVertexAttribArray(index);
- else
- funcs->enableVertexAttribArray = qglfResolveEnableVertexAttribArray;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glFramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->framebufferRenderbuffer = (type_glFramebufferRenderbuffer)
- context->getProcAddress(QLatin1String("glFramebufferRenderbuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->framebufferRenderbuffer) {
- funcs->framebufferRenderbuffer = (type_glFramebufferRenderbuffer)
- context->getProcAddress(QLatin1String("glFramebufferRenderbufferOES"));
- }
-#endif
- if (!funcs->framebufferRenderbuffer) {
- funcs->framebufferRenderbuffer = (type_glFramebufferRenderbuffer)
- context->getProcAddress(QLatin1String("glFramebufferRenderbufferEXT"));
- }
- if (!funcs->framebufferRenderbuffer) {
- funcs->framebufferRenderbuffer = (type_glFramebufferRenderbuffer)
- context->getProcAddress(QLatin1String("glFramebufferRenderbufferARB"));
- }
-
- if (funcs->framebufferRenderbuffer)
- funcs->framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
- else
- funcs->framebufferRenderbuffer = qglfResolveFramebufferRenderbuffer;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glFramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->framebufferTexture2D = (type_glFramebufferTexture2D)
- context->getProcAddress(QLatin1String("glFramebufferTexture2D"));
-#ifdef QT_OPENGL_ES
- if (!funcs->framebufferTexture2D) {
- funcs->framebufferTexture2D = (type_glFramebufferTexture2D)
- context->getProcAddress(QLatin1String("glFramebufferTexture2DOES"));
- }
-#endif
- if (!funcs->framebufferTexture2D) {
- funcs->framebufferTexture2D = (type_glFramebufferTexture2D)
- context->getProcAddress(QLatin1String("glFramebufferTexture2DEXT"));
- }
- if (!funcs->framebufferTexture2D) {
- funcs->framebufferTexture2D = (type_glFramebufferTexture2D)
- context->getProcAddress(QLatin1String("glFramebufferTexture2DARB"));
- }
-
- if (funcs->framebufferTexture2D)
- funcs->framebufferTexture2D(target, attachment, textarget, texture, level);
- else
- funcs->framebufferTexture2D = qglfResolveFramebufferTexture2D;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGenBuffers(GLsizei n, GLuint* buffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGenBuffers)(GLsizei n, GLuint* buffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->genBuffers = (type_glGenBuffers)
- context->getProcAddress(QLatin1String("glGenBuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->genBuffers) {
- funcs->genBuffers = (type_glGenBuffers)
- context->getProcAddress(QLatin1String("glGenBuffersOES"));
- }
-#endif
- if (!funcs->genBuffers) {
- funcs->genBuffers = (type_glGenBuffers)
- context->getProcAddress(QLatin1String("glGenBuffersEXT"));
- }
- if (!funcs->genBuffers) {
- funcs->genBuffers = (type_glGenBuffers)
- context->getProcAddress(QLatin1String("glGenBuffersARB"));
- }
-
- if (funcs->genBuffers)
- funcs->genBuffers(n, buffers);
- else
- funcs->genBuffers = qglfResolveGenBuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGenerateMipmap(GLenum target)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGenerateMipmap)(GLenum target);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->generateMipmap = (type_glGenerateMipmap)
- context->getProcAddress(QLatin1String("glGenerateMipmap"));
-#ifdef QT_OPENGL_ES
- if (!funcs->generateMipmap) {
- funcs->generateMipmap = (type_glGenerateMipmap)
- context->getProcAddress(QLatin1String("glGenerateMipmapOES"));
- }
-#endif
- if (!funcs->generateMipmap) {
- funcs->generateMipmap = (type_glGenerateMipmap)
- context->getProcAddress(QLatin1String("glGenerateMipmapEXT"));
- }
- if (!funcs->generateMipmap) {
- funcs->generateMipmap = (type_glGenerateMipmap)
- context->getProcAddress(QLatin1String("glGenerateMipmapARB"));
- }
-
- if (funcs->generateMipmap)
- funcs->generateMipmap(target);
- else
- funcs->generateMipmap = qglfResolveGenerateMipmap;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGenFramebuffers(GLsizei n, GLuint* framebuffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGenFramebuffers)(GLsizei n, GLuint* framebuffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->genFramebuffers = (type_glGenFramebuffers)
- context->getProcAddress(QLatin1String("glGenFramebuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->genFramebuffers) {
- funcs->genFramebuffers = (type_glGenFramebuffers)
- context->getProcAddress(QLatin1String("glGenFramebuffersOES"));
- }
-#endif
- if (!funcs->genFramebuffers) {
- funcs->genFramebuffers = (type_glGenFramebuffers)
- context->getProcAddress(QLatin1String("glGenFramebuffersEXT"));
- }
- if (!funcs->genFramebuffers) {
- funcs->genFramebuffers = (type_glGenFramebuffers)
- context->getProcAddress(QLatin1String("glGenFramebuffersARB"));
- }
-
- if (funcs->genFramebuffers)
- funcs->genFramebuffers(n, framebuffers);
- else
- funcs->genFramebuffers = qglfResolveGenFramebuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGenRenderbuffers)(GLsizei n, GLuint* renderbuffers);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->genRenderbuffers = (type_glGenRenderbuffers)
- context->getProcAddress(QLatin1String("glGenRenderbuffers"));
-#ifdef QT_OPENGL_ES
- if (!funcs->genRenderbuffers) {
- funcs->genRenderbuffers = (type_glGenRenderbuffers)
- context->getProcAddress(QLatin1String("glGenRenderbuffersOES"));
- }
-#endif
- if (!funcs->genRenderbuffers) {
- funcs->genRenderbuffers = (type_glGenRenderbuffers)
- context->getProcAddress(QLatin1String("glGenRenderbuffersEXT"));
- }
- if (!funcs->genRenderbuffers) {
- funcs->genRenderbuffers = (type_glGenRenderbuffers)
- context->getProcAddress(QLatin1String("glGenRenderbuffersARB"));
- }
-
- if (funcs->genRenderbuffers)
- funcs->genRenderbuffers(n, renderbuffers);
- else
- funcs->genRenderbuffers = qglfResolveGenRenderbuffers;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetActiveAttrib)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getActiveAttrib = (type_glGetActiveAttrib)
- context->getProcAddress(QLatin1String("glGetActiveAttrib"));
- if (!funcs->getActiveAttrib) {
- funcs->getActiveAttrib = (type_glGetActiveAttrib)
- context->getProcAddress(QLatin1String("glGetActiveAttribARB"));
- }
-
- if (funcs->getActiveAttrib)
- funcs->getActiveAttrib(program, index, bufsize, length, size, type, name);
- else
- funcs->getActiveAttrib = qglfResolveGetActiveAttrib;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getActiveUniform = (type_glGetActiveUniform)
- context->getProcAddress(QLatin1String("glGetActiveUniform"));
- if (!funcs->getActiveUniform) {
- funcs->getActiveUniform = (type_glGetActiveUniform)
- context->getProcAddress(QLatin1String("glGetActiveUniformARB"));
- }
-
- if (funcs->getActiveUniform)
- funcs->getActiveUniform(program, index, bufsize, length, size, type, name);
- else
- funcs->getActiveUniform = qglfResolveGetActiveUniform;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getAttachedShaders = (type_glGetAttachedShaders)
- context->getProcAddress(QLatin1String("glGetAttachedShaders"));
- if (!funcs->getAttachedShaders) {
- funcs->getAttachedShaders = (type_glGetAttachedShaders)
- context->getProcAddress(QLatin1String("glGetAttachedObjectsARB"));
- }
-
- if (funcs->getAttachedShaders)
- funcs->getAttachedShaders(program, maxcount, count, shaders);
- else
- funcs->getAttachedShaders = qglfResolveGetAttachedShaders;
-}
-
-static int QT3D_GLF_APIENTRY qglfResolveGetAttribLocation(GLuint program, const char* name)
-{
- typedef int (QT3D_GLF_APIENTRYP type_glGetAttribLocation)(GLuint program, const char* name);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getAttribLocation = (type_glGetAttribLocation)
- context->getProcAddress(QLatin1String("glGetAttribLocation"));
- if (!funcs->getAttribLocation) {
- funcs->getAttribLocation = (type_glGetAttribLocation)
- context->getProcAddress(QLatin1String("glGetAttribLocationARB"));
- }
-
- if (funcs->getAttribLocation)
- return funcs->getAttribLocation(program, name);
- funcs->getAttribLocation = qglfResolveGetAttribLocation;
- return int(0);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetBufferParameteriv)(GLenum target, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getBufferParameteriv = (type_glGetBufferParameteriv)
- context->getProcAddress(QLatin1String("glGetBufferParameteriv"));
-#ifdef QT_OPENGL_ES
- if (!funcs->getBufferParameteriv) {
- funcs->getBufferParameteriv = (type_glGetBufferParameteriv)
- context->getProcAddress(QLatin1String("glGetBufferParameterivOES"));
- }
-#endif
- if (!funcs->getBufferParameteriv) {
- funcs->getBufferParameteriv = (type_glGetBufferParameteriv)
- context->getProcAddress(QLatin1String("glGetBufferParameterivEXT"));
- }
- if (!funcs->getBufferParameteriv) {
- funcs->getBufferParameteriv = (type_glGetBufferParameteriv)
- context->getProcAddress(QLatin1String("glGetBufferParameterivARB"));
- }
-
- if (funcs->getBufferParameteriv)
- funcs->getBufferParameteriv(target, pname, params);
- else
- funcs->getBufferParameteriv = qglfResolveGetBufferParameteriv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getFramebufferAttachmentParameteriv = (type_glGetFramebufferAttachmentParameteriv)
- context->getProcAddress(QLatin1String("glGetFramebufferAttachmentParameteriv"));
-#ifdef QT_OPENGL_ES
- if (!funcs->getFramebufferAttachmentParameteriv) {
- funcs->getFramebufferAttachmentParameteriv = (type_glGetFramebufferAttachmentParameteriv)
- context->getProcAddress(QLatin1String("glGetFramebufferAttachmentParameterivOES"));
- }
-#endif
- if (!funcs->getFramebufferAttachmentParameteriv) {
- funcs->getFramebufferAttachmentParameteriv = (type_glGetFramebufferAttachmentParameteriv)
- context->getProcAddress(QLatin1String("glGetFramebufferAttachmentParameterivEXT"));
- }
- if (!funcs->getFramebufferAttachmentParameteriv) {
- funcs->getFramebufferAttachmentParameteriv = (type_glGetFramebufferAttachmentParameteriv)
- context->getProcAddress(QLatin1String("glGetFramebufferAttachmentParameterivARB"));
- }
-
- if (funcs->getFramebufferAttachmentParameteriv)
- funcs->getFramebufferAttachmentParameteriv(target, attachment, pname, params);
- else
- funcs->getFramebufferAttachmentParameteriv = qglfResolveGetFramebufferAttachmentParameteriv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetProgramiv(GLuint program, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetProgramiv)(GLuint program, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getProgramiv = (type_glGetProgramiv)
- context->getProcAddress(QLatin1String("glGetProgramiv"));
- if (!funcs->getProgramiv) {
- funcs->getProgramiv = (type_glGetProgramiv)
- context->getProcAddress(QLatin1String("glGetObjectParameterivARB"));
- }
-
- if (funcs->getProgramiv)
- funcs->getProgramiv(program, pname, params);
- else
- funcs->getProgramiv = qglfResolveGetProgramiv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetProgramInfoLog)(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getProgramInfoLog = (type_glGetProgramInfoLog)
- context->getProcAddress(QLatin1String("glGetProgramInfoLog"));
- if (!funcs->getProgramInfoLog) {
- funcs->getProgramInfoLog = (type_glGetProgramInfoLog)
- context->getProcAddress(QLatin1String("glGetInfoLogARB"));
- }
-
- if (funcs->getProgramInfoLog)
- funcs->getProgramInfoLog(program, bufsize, length, infolog);
- else
- funcs->getProgramInfoLog = qglfResolveGetProgramInfoLog;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getRenderbufferParameteriv = (type_glGetRenderbufferParameteriv)
- context->getProcAddress(QLatin1String("glGetRenderbufferParameteriv"));
-#ifdef QT_OPENGL_ES
- if (!funcs->getRenderbufferParameteriv) {
- funcs->getRenderbufferParameteriv = (type_glGetRenderbufferParameteriv)
- context->getProcAddress(QLatin1String("glGetRenderbufferParameterivOES"));
- }
-#endif
- if (!funcs->getRenderbufferParameteriv) {
- funcs->getRenderbufferParameteriv = (type_glGetRenderbufferParameteriv)
- context->getProcAddress(QLatin1String("glGetRenderbufferParameterivEXT"));
- }
- if (!funcs->getRenderbufferParameteriv) {
- funcs->getRenderbufferParameteriv = (type_glGetRenderbufferParameteriv)
- context->getProcAddress(QLatin1String("glGetRenderbufferParameterivARB"));
- }
-
- if (funcs->getRenderbufferParameteriv)
- funcs->getRenderbufferParameteriv(target, pname, params);
- else
- funcs->getRenderbufferParameteriv = qglfResolveGetRenderbufferParameteriv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetShaderiv)(GLuint shader, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getShaderiv = (type_glGetShaderiv)
- context->getProcAddress(QLatin1String("glGetShaderiv"));
- if (!funcs->getShaderiv) {
- funcs->getShaderiv = (type_glGetShaderiv)
- context->getProcAddress(QLatin1String("glGetObjectParameterivARB"));
- }
-
- if (funcs->getShaderiv)
- funcs->getShaderiv(shader, pname, params);
- else
- funcs->getShaderiv = qglfResolveGetShaderiv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetShaderInfoLog)(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getShaderInfoLog = (type_glGetShaderInfoLog)
- context->getProcAddress(QLatin1String("glGetShaderInfoLog"));
- if (!funcs->getShaderInfoLog) {
- funcs->getShaderInfoLog = (type_glGetShaderInfoLog)
- context->getProcAddress(QLatin1String("glGetInfoLogARB"));
- }
-
- if (funcs->getShaderInfoLog)
- funcs->getShaderInfoLog(shader, bufsize, length, infolog);
- else
- funcs->getShaderInfoLog = qglfResolveGetShaderInfoLog;
-}
-
-static void QT3D_GLF_APIENTRY qglfSpecialGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
- Q_UNUSED(shadertype);
- Q_UNUSED(precisiontype);
- range[0] = range[1] = precision[0] = 0;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getShaderPrecisionFormat = (type_glGetShaderPrecisionFormat)
- context->getProcAddress(QLatin1String("glGetShaderPrecisionFormat"));
-#ifdef QT_OPENGL_ES
- if (!funcs->getShaderPrecisionFormat) {
- funcs->getShaderPrecisionFormat = (type_glGetShaderPrecisionFormat)
- context->getProcAddress(QLatin1String("glGetShaderPrecisionFormatOES"));
- }
-#endif
- if (!funcs->getShaderPrecisionFormat) {
- funcs->getShaderPrecisionFormat = (type_glGetShaderPrecisionFormat)
- context->getProcAddress(QLatin1String("glGetShaderPrecisionFormatEXT"));
- }
- if (!funcs->getShaderPrecisionFormat) {
- funcs->getShaderPrecisionFormat = (type_glGetShaderPrecisionFormat)
- context->getProcAddress(QLatin1String("glGetShaderPrecisionFormatARB"));
- }
-
- if (!funcs->getShaderPrecisionFormat)
- funcs->getShaderPrecisionFormat = qglfSpecialGetShaderPrecisionFormat;
-
- funcs->getShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetShaderSource)(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getShaderSource = (type_glGetShaderSource)
- context->getProcAddress(QLatin1String("glGetShaderSource"));
- if (!funcs->getShaderSource) {
- funcs->getShaderSource = (type_glGetShaderSource)
- context->getProcAddress(QLatin1String("glGetShaderSourceARB"));
- }
-
- if (funcs->getShaderSource)
- funcs->getShaderSource(shader, bufsize, length, source);
- else
- funcs->getShaderSource = qglfResolveGetShaderSource;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetUniformfv(GLuint program, GLint location, GLfloat* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetUniformfv)(GLuint program, GLint location, GLfloat* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getUniformfv = (type_glGetUniformfv)
- context->getProcAddress(QLatin1String("glGetUniformfv"));
- if (!funcs->getUniformfv) {
- funcs->getUniformfv = (type_glGetUniformfv)
- context->getProcAddress(QLatin1String("glGetUniformfvARB"));
- }
-
- if (funcs->getUniformfv)
- funcs->getUniformfv(program, location, params);
- else
- funcs->getUniformfv = qglfResolveGetUniformfv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetUniformiv(GLuint program, GLint location, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetUniformiv)(GLuint program, GLint location, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getUniformiv = (type_glGetUniformiv)
- context->getProcAddress(QLatin1String("glGetUniformiv"));
- if (!funcs->getUniformiv) {
- funcs->getUniformiv = (type_glGetUniformiv)
- context->getProcAddress(QLatin1String("glGetUniformivARB"));
- }
-
- if (funcs->getUniformiv)
- funcs->getUniformiv(program, location, params);
- else
- funcs->getUniformiv = qglfResolveGetUniformiv;
-}
-
-static int QT3D_GLF_APIENTRY qglfResolveGetUniformLocation(GLuint program, const char* name)
-{
- typedef int (QT3D_GLF_APIENTRYP type_glGetUniformLocation)(GLuint program, const char* name);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getUniformLocation = (type_glGetUniformLocation)
- context->getProcAddress(QLatin1String("glGetUniformLocation"));
- if (!funcs->getUniformLocation) {
- funcs->getUniformLocation = (type_glGetUniformLocation)
- context->getProcAddress(QLatin1String("glGetUniformLocationARB"));
- }
-
- if (funcs->getUniformLocation)
- return funcs->getUniformLocation(program, name);
- funcs->getUniformLocation = qglfResolveGetUniformLocation;
- return int(0);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getVertexAttribfv = (type_glGetVertexAttribfv)
- context->getProcAddress(QLatin1String("glGetVertexAttribfv"));
- if (!funcs->getVertexAttribfv) {
- funcs->getVertexAttribfv = (type_glGetVertexAttribfv)
- context->getProcAddress(QLatin1String("glGetVertexAttribfvARB"));
- }
-
- if (funcs->getVertexAttribfv)
- funcs->getVertexAttribfv(index, pname, params);
- else
- funcs->getVertexAttribfv = qglfResolveGetVertexAttribfv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetVertexAttribiv)(GLuint index, GLenum pname, GLint* params);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getVertexAttribiv = (type_glGetVertexAttribiv)
- context->getProcAddress(QLatin1String("glGetVertexAttribiv"));
- if (!funcs->getVertexAttribiv) {
- funcs->getVertexAttribiv = (type_glGetVertexAttribiv)
- context->getProcAddress(QLatin1String("glGetVertexAttribivARB"));
- }
-
- if (funcs->getVertexAttribiv)
- funcs->getVertexAttribiv(index, pname, params);
- else
- funcs->getVertexAttribiv = qglfResolveGetVertexAttribiv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glGetVertexAttribPointerv)(GLuint index, GLenum pname, void** pointer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->getVertexAttribPointerv = (type_glGetVertexAttribPointerv)
- context->getProcAddress(QLatin1String("glGetVertexAttribPointerv"));
- if (!funcs->getVertexAttribPointerv) {
- funcs->getVertexAttribPointerv = (type_glGetVertexAttribPointerv)
- context->getProcAddress(QLatin1String("glGetVertexAttribPointervARB"));
- }
-
- if (funcs->getVertexAttribPointerv)
- funcs->getVertexAttribPointerv(index, pname, pointer);
- else
- funcs->getVertexAttribPointerv = qglfResolveGetVertexAttribPointerv;
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfResolveIsBuffer(GLuint buffer)
-{
- typedef GLboolean (QT3D_GLF_APIENTRYP type_glIsBuffer)(GLuint buffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->isBuffer = (type_glIsBuffer)
- context->getProcAddress(QLatin1String("glIsBuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->isBuffer) {
- funcs->isBuffer = (type_glIsBuffer)
- context->getProcAddress(QLatin1String("glIsBufferOES"));
- }
-#endif
- if (!funcs->isBuffer) {
- funcs->isBuffer = (type_glIsBuffer)
- context->getProcAddress(QLatin1String("glIsBufferEXT"));
- }
- if (!funcs->isBuffer) {
- funcs->isBuffer = (type_glIsBuffer)
- context->getProcAddress(QLatin1String("glIsBufferARB"));
- }
-
- if (funcs->isBuffer)
- return funcs->isBuffer(buffer);
- funcs->isBuffer = qglfResolveIsBuffer;
- return GLboolean(0);
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfResolveIsFramebuffer(GLuint framebuffer)
-{
- typedef GLboolean (QT3D_GLF_APIENTRYP type_glIsFramebuffer)(GLuint framebuffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->isFramebuffer = (type_glIsFramebuffer)
- context->getProcAddress(QLatin1String("glIsFramebuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->isFramebuffer) {
- funcs->isFramebuffer = (type_glIsFramebuffer)
- context->getProcAddress(QLatin1String("glIsFramebufferOES"));
- }
-#endif
- if (!funcs->isFramebuffer) {
- funcs->isFramebuffer = (type_glIsFramebuffer)
- context->getProcAddress(QLatin1String("glIsFramebufferEXT"));
- }
- if (!funcs->isFramebuffer) {
- funcs->isFramebuffer = (type_glIsFramebuffer)
- context->getProcAddress(QLatin1String("glIsFramebufferARB"));
- }
-
- if (funcs->isFramebuffer)
- return funcs->isFramebuffer(framebuffer);
- funcs->isFramebuffer = qglfResolveIsFramebuffer;
- return GLboolean(0);
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfSpecialIsProgram(GLuint program)
-{
- return program != 0;
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfResolveIsProgram(GLuint program)
-{
- typedef GLboolean (QT3D_GLF_APIENTRYP type_glIsProgram)(GLuint program);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->isProgram = (type_glIsProgram)
- context->getProcAddress(QLatin1String("glIsProgram"));
- if (!funcs->isProgram) {
- funcs->isProgram = (type_glIsProgram)
- context->getProcAddress(QLatin1String("glIsProgramARB"));
- }
-
- if (!funcs->isProgram)
- funcs->isProgram = qglfSpecialIsProgram;
-
- return funcs->isProgram(program);
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfResolveIsRenderbuffer(GLuint renderbuffer)
-{
- typedef GLboolean (QT3D_GLF_APIENTRYP type_glIsRenderbuffer)(GLuint renderbuffer);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->isRenderbuffer = (type_glIsRenderbuffer)
- context->getProcAddress(QLatin1String("glIsRenderbuffer"));
-#ifdef QT_OPENGL_ES
- if (!funcs->isRenderbuffer) {
- funcs->isRenderbuffer = (type_glIsRenderbuffer)
- context->getProcAddress(QLatin1String("glIsRenderbufferOES"));
- }
-#endif
- if (!funcs->isRenderbuffer) {
- funcs->isRenderbuffer = (type_glIsRenderbuffer)
- context->getProcAddress(QLatin1String("glIsRenderbufferEXT"));
- }
- if (!funcs->isRenderbuffer) {
- funcs->isRenderbuffer = (type_glIsRenderbuffer)
- context->getProcAddress(QLatin1String("glIsRenderbufferARB"));
- }
-
- if (funcs->isRenderbuffer)
- return funcs->isRenderbuffer(renderbuffer);
- funcs->isRenderbuffer = qglfResolveIsRenderbuffer;
- return GLboolean(0);
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfSpecialIsShader(GLuint shader)
-{
- return shader != 0;
-}
-
-static GLboolean QT3D_GLF_APIENTRY qglfResolveIsShader(GLuint shader)
-{
- typedef GLboolean (QT3D_GLF_APIENTRYP type_glIsShader)(GLuint shader);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->isShader = (type_glIsShader)
- context->getProcAddress(QLatin1String("glIsShader"));
- if (!funcs->isShader) {
- funcs->isShader = (type_glIsShader)
- context->getProcAddress(QLatin1String("glIsShaderARB"));
- }
-
- if (!funcs->isShader)
- funcs->isShader = qglfSpecialIsShader;
-
- return funcs->isShader(shader);
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveLinkProgram(GLuint program)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glLinkProgram)(GLuint program);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->linkProgram = (type_glLinkProgram)
- context->getProcAddress(QLatin1String("glLinkProgram"));
- if (!funcs->linkProgram) {
- funcs->linkProgram = (type_glLinkProgram)
- context->getProcAddress(QLatin1String("glLinkProgramARB"));
- }
-
- if (funcs->linkProgram)
- funcs->linkProgram(program);
- else
- funcs->linkProgram = qglfResolveLinkProgram;
-}
-
-static void QT3D_GLF_APIENTRY qglfSpecialReleaseShaderCompiler()
-{
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveReleaseShaderCompiler()
-{
- typedef void (QT3D_GLF_APIENTRYP type_glReleaseShaderCompiler)();
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->releaseShaderCompiler = (type_glReleaseShaderCompiler)
- context->getProcAddress(QLatin1String("glReleaseShaderCompiler"));
- if (!funcs->releaseShaderCompiler) {
- funcs->releaseShaderCompiler = (type_glReleaseShaderCompiler)
- context->getProcAddress(QLatin1String("glReleaseShaderCompilerARB"));
- }
-
- if (!funcs->releaseShaderCompiler)
- funcs->releaseShaderCompiler = qglfSpecialReleaseShaderCompiler;
-
- funcs->releaseShaderCompiler();
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glRenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->renderbufferStorage = (type_glRenderbufferStorage)
- context->getProcAddress(QLatin1String("glRenderbufferStorage"));
-#ifdef QT_OPENGL_ES
- if (!funcs->renderbufferStorage) {
- funcs->renderbufferStorage = (type_glRenderbufferStorage)
- context->getProcAddress(QLatin1String("glRenderbufferStorageOES"));
- }
-#endif
- if (!funcs->renderbufferStorage) {
- funcs->renderbufferStorage = (type_glRenderbufferStorage)
- context->getProcAddress(QLatin1String("glRenderbufferStorageEXT"));
- }
- if (!funcs->renderbufferStorage) {
- funcs->renderbufferStorage = (type_glRenderbufferStorage)
- context->getProcAddress(QLatin1String("glRenderbufferStorageARB"));
- }
-
- if (funcs->renderbufferStorage)
- funcs->renderbufferStorage(target, internalformat, width, height);
- else
- funcs->renderbufferStorage = qglfResolveRenderbufferStorage;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveSampleCoverage(GLclampf value, GLboolean invert)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glSampleCoverage)(GLclampf value, GLboolean invert);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->sampleCoverage = (type_glSampleCoverage)
- context->getProcAddress(QLatin1String("glSampleCoverage"));
-#ifdef QT_OPENGL_ES
- if (!funcs->sampleCoverage) {
- funcs->sampleCoverage = (type_glSampleCoverage)
- context->getProcAddress(QLatin1String("glSampleCoverageOES"));
- }
-#endif
- if (!funcs->sampleCoverage) {
- funcs->sampleCoverage = (type_glSampleCoverage)
- context->getProcAddress(QLatin1String("glSampleCoverageEXT"));
- }
- if (!funcs->sampleCoverage) {
- funcs->sampleCoverage = (type_glSampleCoverage)
- context->getProcAddress(QLatin1String("glSampleCoverageARB"));
- }
-
- if (funcs->sampleCoverage)
- funcs->sampleCoverage(value, invert);
- else
- funcs->sampleCoverage = qglfResolveSampleCoverage;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glShaderBinary)(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->shaderBinary = (type_glShaderBinary)
- context->getProcAddress(QLatin1String("glShaderBinary"));
- if (!funcs->shaderBinary) {
- funcs->shaderBinary = (type_glShaderBinary)
- context->getProcAddress(QLatin1String("glShaderBinaryARB"));
- }
-
- if (funcs->shaderBinary)
- funcs->shaderBinary(n, shaders, binaryformat, binary, length);
- else
- funcs->shaderBinary = qglfResolveShaderBinary;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glShaderSource)(GLuint shader, GLsizei count, const char** string, const GLint* length);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->shaderSource = (type_glShaderSource)
- context->getProcAddress(QLatin1String("glShaderSource"));
- if (!funcs->shaderSource) {
- funcs->shaderSource = (type_glShaderSource)
- context->getProcAddress(QLatin1String("glShaderSourceARB"));
- }
-
- if (funcs->shaderSource)
- funcs->shaderSource(shader, count, string, length);
- else
- funcs->shaderSource = qglfResolveShaderSource;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glStencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->stencilFuncSeparate = (type_glStencilFuncSeparate)
- context->getProcAddress(QLatin1String("glStencilFuncSeparate"));
-#ifdef QT_OPENGL_ES
- if (!funcs->stencilFuncSeparate) {
- funcs->stencilFuncSeparate = (type_glStencilFuncSeparate)
- context->getProcAddress(QLatin1String("glStencilFuncSeparateOES"));
- }
-#endif
- if (!funcs->stencilFuncSeparate) {
- funcs->stencilFuncSeparate = (type_glStencilFuncSeparate)
- context->getProcAddress(QLatin1String("glStencilFuncSeparateEXT"));
- }
- if (!funcs->stencilFuncSeparate) {
- funcs->stencilFuncSeparate = (type_glStencilFuncSeparate)
- context->getProcAddress(QLatin1String("glStencilFuncSeparateARB"));
- }
-
- if (funcs->stencilFuncSeparate)
- funcs->stencilFuncSeparate(face, func, ref, mask);
- else
- funcs->stencilFuncSeparate = qglfResolveStencilFuncSeparate;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveStencilMaskSeparate(GLenum face, GLuint mask)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glStencilMaskSeparate)(GLenum face, GLuint mask);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->stencilMaskSeparate = (type_glStencilMaskSeparate)
- context->getProcAddress(QLatin1String("glStencilMaskSeparate"));
-#ifdef QT_OPENGL_ES
- if (!funcs->stencilMaskSeparate) {
- funcs->stencilMaskSeparate = (type_glStencilMaskSeparate)
- context->getProcAddress(QLatin1String("glStencilMaskSeparateOES"));
- }
-#endif
- if (!funcs->stencilMaskSeparate) {
- funcs->stencilMaskSeparate = (type_glStencilMaskSeparate)
- context->getProcAddress(QLatin1String("glStencilMaskSeparateEXT"));
- }
- if (!funcs->stencilMaskSeparate) {
- funcs->stencilMaskSeparate = (type_glStencilMaskSeparate)
- context->getProcAddress(QLatin1String("glStencilMaskSeparateARB"));
- }
-
- if (funcs->stencilMaskSeparate)
- funcs->stencilMaskSeparate(face, mask);
- else
- funcs->stencilMaskSeparate = qglfResolveStencilMaskSeparate;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glStencilOpSeparate)(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->stencilOpSeparate = (type_glStencilOpSeparate)
- context->getProcAddress(QLatin1String("glStencilOpSeparate"));
-#ifdef QT_OPENGL_ES
- if (!funcs->stencilOpSeparate) {
- funcs->stencilOpSeparate = (type_glStencilOpSeparate)
- context->getProcAddress(QLatin1String("glStencilOpSeparateOES"));
- }
-#endif
- if (!funcs->stencilOpSeparate) {
- funcs->stencilOpSeparate = (type_glStencilOpSeparate)
- context->getProcAddress(QLatin1String("glStencilOpSeparateEXT"));
- }
- if (!funcs->stencilOpSeparate) {
- funcs->stencilOpSeparate = (type_glStencilOpSeparate)
- context->getProcAddress(QLatin1String("glStencilOpSeparateARB"));
- }
-
- if (funcs->stencilOpSeparate)
- funcs->stencilOpSeparate(face, fail, zfail, zpass);
- else
- funcs->stencilOpSeparate = qglfResolveStencilOpSeparate;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform1f(GLint location, GLfloat x)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform1f)(GLint location, GLfloat x);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform1f = (type_glUniform1f)
- context->getProcAddress(QLatin1String("glUniform1f"));
- if (!funcs->uniform1f) {
- funcs->uniform1f = (type_glUniform1f)
- context->getProcAddress(QLatin1String("glUniform1fARB"));
- }
-
- if (funcs->uniform1f)
- funcs->uniform1f(location, x);
- else
- funcs->uniform1f = qglfResolveUniform1f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform1fv)(GLint location, GLsizei count, const GLfloat* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform1fv = (type_glUniform1fv)
- context->getProcAddress(QLatin1String("glUniform1fv"));
- if (!funcs->uniform1fv) {
- funcs->uniform1fv = (type_glUniform1fv)
- context->getProcAddress(QLatin1String("glUniform1fvARB"));
- }
-
- if (funcs->uniform1fv)
- funcs->uniform1fv(location, count, v);
- else
- funcs->uniform1fv = qglfResolveUniform1fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform1i(GLint location, GLint x)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform1i)(GLint location, GLint x);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform1i = (type_glUniform1i)
- context->getProcAddress(QLatin1String("glUniform1i"));
- if (!funcs->uniform1i) {
- funcs->uniform1i = (type_glUniform1i)
- context->getProcAddress(QLatin1String("glUniform1iARB"));
- }
-
- if (funcs->uniform1i)
- funcs->uniform1i(location, x);
- else
- funcs->uniform1i = qglfResolveUniform1i;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform1iv(GLint location, GLsizei count, const GLint* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform1iv)(GLint location, GLsizei count, const GLint* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform1iv = (type_glUniform1iv)
- context->getProcAddress(QLatin1String("glUniform1iv"));
- if (!funcs->uniform1iv) {
- funcs->uniform1iv = (type_glUniform1iv)
- context->getProcAddress(QLatin1String("glUniform1ivARB"));
- }
-
- if (funcs->uniform1iv)
- funcs->uniform1iv(location, count, v);
- else
- funcs->uniform1iv = qglfResolveUniform1iv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform2f(GLint location, GLfloat x, GLfloat y)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform2f)(GLint location, GLfloat x, GLfloat y);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform2f = (type_glUniform2f)
- context->getProcAddress(QLatin1String("glUniform2f"));
- if (!funcs->uniform2f) {
- funcs->uniform2f = (type_glUniform2f)
- context->getProcAddress(QLatin1String("glUniform2fARB"));
- }
-
- if (funcs->uniform2f)
- funcs->uniform2f(location, x, y);
- else
- funcs->uniform2f = qglfResolveUniform2f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform2fv)(GLint location, GLsizei count, const GLfloat* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform2fv = (type_glUniform2fv)
- context->getProcAddress(QLatin1String("glUniform2fv"));
- if (!funcs->uniform2fv) {
- funcs->uniform2fv = (type_glUniform2fv)
- context->getProcAddress(QLatin1String("glUniform2fvARB"));
- }
-
- if (funcs->uniform2fv)
- funcs->uniform2fv(location, count, v);
- else
- funcs->uniform2fv = qglfResolveUniform2fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform2i(GLint location, GLint x, GLint y)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform2i)(GLint location, GLint x, GLint y);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform2i = (type_glUniform2i)
- context->getProcAddress(QLatin1String("glUniform2i"));
- if (!funcs->uniform2i) {
- funcs->uniform2i = (type_glUniform2i)
- context->getProcAddress(QLatin1String("glUniform2iARB"));
- }
-
- if (funcs->uniform2i)
- funcs->uniform2i(location, x, y);
- else
- funcs->uniform2i = qglfResolveUniform2i;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform2iv(GLint location, GLsizei count, const GLint* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform2iv)(GLint location, GLsizei count, const GLint* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform2iv = (type_glUniform2iv)
- context->getProcAddress(QLatin1String("glUniform2iv"));
- if (!funcs->uniform2iv) {
- funcs->uniform2iv = (type_glUniform2iv)
- context->getProcAddress(QLatin1String("glUniform2ivARB"));
- }
-
- if (funcs->uniform2iv)
- funcs->uniform2iv(location, count, v);
- else
- funcs->uniform2iv = qglfResolveUniform2iv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform3f)(GLint location, GLfloat x, GLfloat y, GLfloat z);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform3f = (type_glUniform3f)
- context->getProcAddress(QLatin1String("glUniform3f"));
- if (!funcs->uniform3f) {
- funcs->uniform3f = (type_glUniform3f)
- context->getProcAddress(QLatin1String("glUniform3fARB"));
- }
-
- if (funcs->uniform3f)
- funcs->uniform3f(location, x, y, z);
- else
- funcs->uniform3f = qglfResolveUniform3f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform3fv)(GLint location, GLsizei count, const GLfloat* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform3fv = (type_glUniform3fv)
- context->getProcAddress(QLatin1String("glUniform3fv"));
- if (!funcs->uniform3fv) {
- funcs->uniform3fv = (type_glUniform3fv)
- context->getProcAddress(QLatin1String("glUniform3fvARB"));
- }
-
- if (funcs->uniform3fv)
- funcs->uniform3fv(location, count, v);
- else
- funcs->uniform3fv = qglfResolveUniform3fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform3i(GLint location, GLint x, GLint y, GLint z)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform3i)(GLint location, GLint x, GLint y, GLint z);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform3i = (type_glUniform3i)
- context->getProcAddress(QLatin1String("glUniform3i"));
- if (!funcs->uniform3i) {
- funcs->uniform3i = (type_glUniform3i)
- context->getProcAddress(QLatin1String("glUniform3iARB"));
- }
-
- if (funcs->uniform3i)
- funcs->uniform3i(location, x, y, z);
- else
- funcs->uniform3i = qglfResolveUniform3i;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform3iv(GLint location, GLsizei count, const GLint* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform3iv)(GLint location, GLsizei count, const GLint* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform3iv = (type_glUniform3iv)
- context->getProcAddress(QLatin1String("glUniform3iv"));
- if (!funcs->uniform3iv) {
- funcs->uniform3iv = (type_glUniform3iv)
- context->getProcAddress(QLatin1String("glUniform3ivARB"));
- }
-
- if (funcs->uniform3iv)
- funcs->uniform3iv(location, count, v);
- else
- funcs->uniform3iv = qglfResolveUniform3iv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform4f)(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform4f = (type_glUniform4f)
- context->getProcAddress(QLatin1String("glUniform4f"));
- if (!funcs->uniform4f) {
- funcs->uniform4f = (type_glUniform4f)
- context->getProcAddress(QLatin1String("glUniform4fARB"));
- }
-
- if (funcs->uniform4f)
- funcs->uniform4f(location, x, y, z, w);
- else
- funcs->uniform4f = qglfResolveUniform4f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform4fv)(GLint location, GLsizei count, const GLfloat* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform4fv = (type_glUniform4fv)
- context->getProcAddress(QLatin1String("glUniform4fv"));
- if (!funcs->uniform4fv) {
- funcs->uniform4fv = (type_glUniform4fv)
- context->getProcAddress(QLatin1String("glUniform4fvARB"));
- }
-
- if (funcs->uniform4fv)
- funcs->uniform4fv(location, count, v);
- else
- funcs->uniform4fv = qglfResolveUniform4fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform4i)(GLint location, GLint x, GLint y, GLint z, GLint w);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform4i = (type_glUniform4i)
- context->getProcAddress(QLatin1String("glUniform4i"));
- if (!funcs->uniform4i) {
- funcs->uniform4i = (type_glUniform4i)
- context->getProcAddress(QLatin1String("glUniform4iARB"));
- }
-
- if (funcs->uniform4i)
- funcs->uniform4i(location, x, y, z, w);
- else
- funcs->uniform4i = qglfResolveUniform4i;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniform4iv(GLint location, GLsizei count, const GLint* v)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniform4iv)(GLint location, GLsizei count, const GLint* v);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniform4iv = (type_glUniform4iv)
- context->getProcAddress(QLatin1String("glUniform4iv"));
- if (!funcs->uniform4iv) {
- funcs->uniform4iv = (type_glUniform4iv)
- context->getProcAddress(QLatin1String("glUniform4ivARB"));
- }
-
- if (funcs->uniform4iv)
- funcs->uniform4iv(location, count, v);
- else
- funcs->uniform4iv = qglfResolveUniform4iv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniformMatrix2fv = (type_glUniformMatrix2fv)
- context->getProcAddress(QLatin1String("glUniformMatrix2fv"));
- if (!funcs->uniformMatrix2fv) {
- funcs->uniformMatrix2fv = (type_glUniformMatrix2fv)
- context->getProcAddress(QLatin1String("glUniformMatrix2fvARB"));
- }
-
- if (funcs->uniformMatrix2fv)
- funcs->uniformMatrix2fv(location, count, transpose, value);
- else
- funcs->uniformMatrix2fv = qglfResolveUniformMatrix2fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniformMatrix3fv = (type_glUniformMatrix3fv)
- context->getProcAddress(QLatin1String("glUniformMatrix3fv"));
- if (!funcs->uniformMatrix3fv) {
- funcs->uniformMatrix3fv = (type_glUniformMatrix3fv)
- context->getProcAddress(QLatin1String("glUniformMatrix3fvARB"));
- }
-
- if (funcs->uniformMatrix3fv)
- funcs->uniformMatrix3fv(location, count, transpose, value);
- else
- funcs->uniformMatrix3fv = qglfResolveUniformMatrix3fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->uniformMatrix4fv = (type_glUniformMatrix4fv)
- context->getProcAddress(QLatin1String("glUniformMatrix4fv"));
- if (!funcs->uniformMatrix4fv) {
- funcs->uniformMatrix4fv = (type_glUniformMatrix4fv)
- context->getProcAddress(QLatin1String("glUniformMatrix4fvARB"));
- }
-
- if (funcs->uniformMatrix4fv)
- funcs->uniformMatrix4fv(location, count, transpose, value);
- else
- funcs->uniformMatrix4fv = qglfResolveUniformMatrix4fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveUseProgram(GLuint program)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glUseProgram)(GLuint program);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->useProgram = (type_glUseProgram)
- context->getProcAddress(QLatin1String("glUseProgram"));
- if (!funcs->useProgram) {
- funcs->useProgram = (type_glUseProgram)
- context->getProcAddress(QLatin1String("glUseProgramObjectARB"));
- }
-
- if (funcs->useProgram)
- funcs->useProgram(program);
- else
- funcs->useProgram = qglfResolveUseProgram;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveValidateProgram(GLuint program)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glValidateProgram)(GLuint program);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->validateProgram = (type_glValidateProgram)
- context->getProcAddress(QLatin1String("glValidateProgram"));
- if (!funcs->validateProgram) {
- funcs->validateProgram = (type_glValidateProgram)
- context->getProcAddress(QLatin1String("glValidateProgramARB"));
- }
-
- if (funcs->validateProgram)
- funcs->validateProgram(program);
- else
- funcs->validateProgram = qglfResolveValidateProgram;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib1f(GLuint indx, GLfloat x)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib1f)(GLuint indx, GLfloat x);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib1f = (type_glVertexAttrib1f)
- context->getProcAddress(QLatin1String("glVertexAttrib1f"));
- if (!funcs->vertexAttrib1f) {
- funcs->vertexAttrib1f = (type_glVertexAttrib1f)
- context->getProcAddress(QLatin1String("glVertexAttrib1fARB"));
- }
-
- if (funcs->vertexAttrib1f)
- funcs->vertexAttrib1f(indx, x);
- else
- funcs->vertexAttrib1f = qglfResolveVertexAttrib1f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib1fv)(GLuint indx, const GLfloat* values);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib1fv = (type_glVertexAttrib1fv)
- context->getProcAddress(QLatin1String("glVertexAttrib1fv"));
- if (!funcs->vertexAttrib1fv) {
- funcs->vertexAttrib1fv = (type_glVertexAttrib1fv)
- context->getProcAddress(QLatin1String("glVertexAttrib1fvARB"));
- }
-
- if (funcs->vertexAttrib1fv)
- funcs->vertexAttrib1fv(indx, values);
- else
- funcs->vertexAttrib1fv = qglfResolveVertexAttrib1fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib2f)(GLuint indx, GLfloat x, GLfloat y);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib2f = (type_glVertexAttrib2f)
- context->getProcAddress(QLatin1String("glVertexAttrib2f"));
- if (!funcs->vertexAttrib2f) {
- funcs->vertexAttrib2f = (type_glVertexAttrib2f)
- context->getProcAddress(QLatin1String("glVertexAttrib2fARB"));
- }
-
- if (funcs->vertexAttrib2f)
- funcs->vertexAttrib2f(indx, x, y);
- else
- funcs->vertexAttrib2f = qglfResolveVertexAttrib2f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib2fv)(GLuint indx, const GLfloat* values);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib2fv = (type_glVertexAttrib2fv)
- context->getProcAddress(QLatin1String("glVertexAttrib2fv"));
- if (!funcs->vertexAttrib2fv) {
- funcs->vertexAttrib2fv = (type_glVertexAttrib2fv)
- context->getProcAddress(QLatin1String("glVertexAttrib2fvARB"));
- }
-
- if (funcs->vertexAttrib2fv)
- funcs->vertexAttrib2fv(indx, values);
- else
- funcs->vertexAttrib2fv = qglfResolveVertexAttrib2fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib3f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib3f = (type_glVertexAttrib3f)
- context->getProcAddress(QLatin1String("glVertexAttrib3f"));
- if (!funcs->vertexAttrib3f) {
- funcs->vertexAttrib3f = (type_glVertexAttrib3f)
- context->getProcAddress(QLatin1String("glVertexAttrib3fARB"));
- }
-
- if (funcs->vertexAttrib3f)
- funcs->vertexAttrib3f(indx, x, y, z);
- else
- funcs->vertexAttrib3f = qglfResolveVertexAttrib3f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib3fv)(GLuint indx, const GLfloat* values);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib3fv = (type_glVertexAttrib3fv)
- context->getProcAddress(QLatin1String("glVertexAttrib3fv"));
- if (!funcs->vertexAttrib3fv) {
- funcs->vertexAttrib3fv = (type_glVertexAttrib3fv)
- context->getProcAddress(QLatin1String("glVertexAttrib3fvARB"));
- }
-
- if (funcs->vertexAttrib3fv)
- funcs->vertexAttrib3fv(indx, values);
- else
- funcs->vertexAttrib3fv = qglfResolveVertexAttrib3fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib4f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib4f = (type_glVertexAttrib4f)
- context->getProcAddress(QLatin1String("glVertexAttrib4f"));
- if (!funcs->vertexAttrib4f) {
- funcs->vertexAttrib4f = (type_glVertexAttrib4f)
- context->getProcAddress(QLatin1String("glVertexAttrib4fARB"));
- }
-
- if (funcs->vertexAttrib4f)
- funcs->vertexAttrib4f(indx, x, y, z, w);
- else
- funcs->vertexAttrib4f = qglfResolveVertexAttrib4f;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttrib4fv)(GLuint indx, const GLfloat* values);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttrib4fv = (type_glVertexAttrib4fv)
- context->getProcAddress(QLatin1String("glVertexAttrib4fv"));
- if (!funcs->vertexAttrib4fv) {
- funcs->vertexAttrib4fv = (type_glVertexAttrib4fv)
- context->getProcAddress(QLatin1String("glVertexAttrib4fvARB"));
- }
-
- if (funcs->vertexAttrib4fv)
- funcs->vertexAttrib4fv(indx, values);
- else
- funcs->vertexAttrib4fv = qglfResolveVertexAttrib4fv;
-}
-
-static void QT3D_GLF_APIENTRY qglfResolveVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-{
- typedef void (QT3D_GLF_APIENTRYP type_glVertexAttribPointer)(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-
- const QGLContext *context = QGLContext::currentContext();
- QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
-
- funcs->vertexAttribPointer = (type_glVertexAttribPointer)
- context->getProcAddress(QLatin1String("glVertexAttribPointer"));
- if (!funcs->vertexAttribPointer) {
- funcs->vertexAttribPointer = (type_glVertexAttribPointer)
- context->getProcAddress(QLatin1String("glVertexAttribPointerARB"));
- }
-
- if (funcs->vertexAttribPointer)
- funcs->vertexAttribPointer(indx, size, type, normalized, stride, ptr);
- else
- funcs->vertexAttribPointer = qglfResolveVertexAttribPointer;
-}
-
-#endif // !QT_OPENGL_ES_2
-
-QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(const QGLContext *)
-{
-#ifndef QT_OPENGL_ES_2
- activeTexture = qglfResolveActiveTexture;
- attachShader = qglfResolveAttachShader;
- bindAttribLocation = qglfResolveBindAttribLocation;
- bindBuffer = qglfResolveBindBuffer;
- bindFramebuffer = qglfResolveBindFramebuffer;
- bindRenderbuffer = qglfResolveBindRenderbuffer;
- blendColor = qglfResolveBlendColor;
- blendEquation = qglfResolveBlendEquation;
- blendEquationSeparate = qglfResolveBlendEquationSeparate;
- blendFuncSeparate = qglfResolveBlendFuncSeparate;
- bufferData = qglfResolveBufferData;
- bufferSubData = qglfResolveBufferSubData;
- checkFramebufferStatus = qglfResolveCheckFramebufferStatus;
- compileShader = qglfResolveCompileShader;
- compressedTexImage2D = qglfResolveCompressedTexImage2D;
- compressedTexSubImage2D = qglfResolveCompressedTexSubImage2D;
- createProgram = qglfResolveCreateProgram;
- createShader = qglfResolveCreateShader;
- deleteBuffers = qglfResolveDeleteBuffers;
- deleteFramebuffers = qglfResolveDeleteFramebuffers;
- deleteProgram = qglfResolveDeleteProgram;
- deleteRenderbuffers = qglfResolveDeleteRenderbuffers;
- deleteShader = qglfResolveDeleteShader;
- detachShader = qglfResolveDetachShader;
- disableVertexAttribArray = qglfResolveDisableVertexAttribArray;
- enableVertexAttribArray = qglfResolveEnableVertexAttribArray;
- framebufferRenderbuffer = qglfResolveFramebufferRenderbuffer;
- framebufferTexture2D = qglfResolveFramebufferTexture2D;
- genBuffers = qglfResolveGenBuffers;
- generateMipmap = qglfResolveGenerateMipmap;
- genFramebuffers = qglfResolveGenFramebuffers;
- genRenderbuffers = qglfResolveGenRenderbuffers;
- getActiveAttrib = qglfResolveGetActiveAttrib;
- getActiveUniform = qglfResolveGetActiveUniform;
- getAttachedShaders = qglfResolveGetAttachedShaders;
- getAttribLocation = qglfResolveGetAttribLocation;
- getBufferParameteriv = qglfResolveGetBufferParameteriv;
- getFramebufferAttachmentParameteriv = qglfResolveGetFramebufferAttachmentParameteriv;
- getProgramiv = qglfResolveGetProgramiv;
- getProgramInfoLog = qglfResolveGetProgramInfoLog;
- getRenderbufferParameteriv = qglfResolveGetRenderbufferParameteriv;
- getShaderiv = qglfResolveGetShaderiv;
- getShaderInfoLog = qglfResolveGetShaderInfoLog;
- getShaderPrecisionFormat = qglfResolveGetShaderPrecisionFormat;
- getShaderSource = qglfResolveGetShaderSource;
- getUniformfv = qglfResolveGetUniformfv;
- getUniformiv = qglfResolveGetUniformiv;
- getUniformLocation = qglfResolveGetUniformLocation;
- getVertexAttribfv = qglfResolveGetVertexAttribfv;
- getVertexAttribiv = qglfResolveGetVertexAttribiv;
- getVertexAttribPointerv = qglfResolveGetVertexAttribPointerv;
- isBuffer = qglfResolveIsBuffer;
- isFramebuffer = qglfResolveIsFramebuffer;
- isProgram = qglfResolveIsProgram;
- isRenderbuffer = qglfResolveIsRenderbuffer;
- isShader = qglfResolveIsShader;
- linkProgram = qglfResolveLinkProgram;
- releaseShaderCompiler = qglfResolveReleaseShaderCompiler;
- renderbufferStorage = qglfResolveRenderbufferStorage;
- sampleCoverage = qglfResolveSampleCoverage;
- shaderBinary = qglfResolveShaderBinary;
- shaderSource = qglfResolveShaderSource;
- stencilFuncSeparate = qglfResolveStencilFuncSeparate;
- stencilMaskSeparate = qglfResolveStencilMaskSeparate;
- stencilOpSeparate = qglfResolveStencilOpSeparate;
- uniform1f = qglfResolveUniform1f;
- uniform1fv = qglfResolveUniform1fv;
- uniform1i = qglfResolveUniform1i;
- uniform1iv = qglfResolveUniform1iv;
- uniform2f = qglfResolveUniform2f;
- uniform2fv = qglfResolveUniform2fv;
- uniform2i = qglfResolveUniform2i;
- uniform2iv = qglfResolveUniform2iv;
- uniform3f = qglfResolveUniform3f;
- uniform3fv = qglfResolveUniform3fv;
- uniform3i = qglfResolveUniform3i;
- uniform3iv = qglfResolveUniform3iv;
- uniform4f = qglfResolveUniform4f;
- uniform4fv = qglfResolveUniform4fv;
- uniform4i = qglfResolveUniform4i;
- uniform4iv = qglfResolveUniform4iv;
- uniformMatrix2fv = qglfResolveUniformMatrix2fv;
- uniformMatrix3fv = qglfResolveUniformMatrix3fv;
- uniformMatrix4fv = qglfResolveUniformMatrix4fv;
- useProgram = qglfResolveUseProgram;
- validateProgram = qglfResolveValidateProgram;
- vertexAttrib1f = qglfResolveVertexAttrib1f;
- vertexAttrib1fv = qglfResolveVertexAttrib1fv;
- vertexAttrib2f = qglfResolveVertexAttrib2f;
- vertexAttrib2fv = qglfResolveVertexAttrib2fv;
- vertexAttrib3f = qglfResolveVertexAttrib3f;
- vertexAttrib3fv = qglfResolveVertexAttrib3fv;
- vertexAttrib4f = qglfResolveVertexAttrib4f;
- vertexAttrib4fv = qglfResolveVertexAttrib4fv;
- vertexAttribPointer = qglfResolveVertexAttribPointer;
-#endif // !QT_OPENGL_ES_2
-}
-
diff --git a/src/gui/extern/Qt3D/api/qopenglfunctions.h b/src/gui/extern/Qt3D/api/qopenglfunctions.h
deleted file mode 100644
index cd0fe911d594e7a8edefa74ea387a072e3d68f9a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/api/qopenglfunctions.h
+++ /dev/null
@@ -1,2292 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QOPENGLFUNCTIONS_H
-#define QOPENGLFUNCTIONS_H
-
-#include <QtOpenGL/qgl.h>
-#include "qt3dglobal.h"
-#include <QDebug>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-// Types that aren't defined in all system's gl.h files.
-typedef ptrdiff_t qgl_GLintptr;
-typedef ptrdiff_t qgl_GLsizeiptr;
-
-#ifdef Q_WS_WIN
-# define QT3D_GLF_APIENTRY APIENTRY
-#endif
-
-#ifndef Q_WS_MAC
-# ifndef QT3D_GLF_APIENTRYP
-# ifdef QT3D_GLF_APIENTRY
-# define QT3D_GLF_APIENTRYP QT3D_GLF_APIENTRY *
-# else
-# define QT3D_GLF_APIENTRY
-# define QT3D_GLF_APIENTRYP *
-# endif
-# endif
-#else
-# define QT3D_GLF_APIENTRY
-# define QT3D_GLF_APIENTRYP *
-#endif
-
-struct QOpenGLFunctionsPrivate;
-
-// Undefine any macros from GLEW, qglextensions_p.h, etc that
-// may interfere with the definition of QOpenGLFunctions.
-#undef glActiveTexture
-#undef glAttachShader
-#undef glBindAttribLocation
-#undef glBindBuffer
-#undef glBindFramebuffer
-#undef glBindRenderbuffer
-#undef glBlendColor
-#undef glBlendEquation
-#undef glBlendEquationSeparate
-#undef glBlendFuncSeparate
-#undef glBufferData
-#undef glBufferSubData
-#undef glCheckFramebufferStatus
-#undef glClearDepthf
-#undef glCompileShader
-#undef glCompressedTexImage2D
-#undef glCompressedTexSubImage2D
-#undef glCreateProgram
-#undef glCreateShader
-#undef glDeleteBuffers
-#undef glDeleteFramebuffers
-#undef glDeleteProgram
-#undef glDeleteRenderbuffers
-#undef glDeleteShader
-#undef glDepthRangef
-#undef glDetachShader
-#undef glDisableVertexAttribArray
-#undef glEnableVertexAttribArray
-#undef glFramebufferRenderbuffer
-#undef glFramebufferTexture2D
-#undef glGenBuffers
-#undef glGenerateMipmap
-#undef glGenFramebuffers
-#undef glGenRenderbuffers
-#undef glGetActiveAttrib
-#undef glGetActiveUniform
-#undef glGetAttachedShaders
-#undef glGetAttribLocation
-#undef glGetBufferParameteriv
-#undef glGetFramebufferAttachmentParameteriv
-#undef glGetProgramiv
-#undef glGetProgramInfoLog
-#undef glGetRenderbufferParameteriv
-#undef glGetShaderiv
-#undef glGetShaderInfoLog
-#undef glGetShaderPrecisionFormat
-#undef glGetShaderSource
-#undef glGetUniformfv
-#undef glGetUniformiv
-#undef glGetUniformLocation
-#undef glGetVertexAttribfv
-#undef glGetVertexAttribiv
-#undef glGetVertexAttribPointerv
-#undef glIsBuffer
-#undef glIsFramebuffer
-#undef glIsProgram
-#undef glIsRenderbuffer
-#undef glIsShader
-#undef glLinkProgram
-#undef glReleaseShaderCompiler
-#undef glRenderbufferStorage
-#undef glSampleCoverage
-#undef glShaderBinary
-#undef glShaderSource
-#undef glStencilFuncSeparate
-#undef glStencilMaskSeparate
-#undef glStencilOpSeparate
-#undef glUniform1f
-#undef glUniform1fv
-#undef glUniform1i
-#undef glUniform1iv
-#undef glUniform2f
-#undef glUniform2fv
-#undef glUniform2i
-#undef glUniform2iv
-#undef glUniform3f
-#undef glUniform3fv
-#undef glUniform3i
-#undef glUniform3iv
-#undef glUniform4f
-#undef glUniform4fv
-#undef glUniform4i
-#undef glUniform4iv
-#undef glUniformMatrix2fv
-#undef glUniformMatrix3fv
-#undef glUniformMatrix4fv
-#undef glUseProgram
-#undef glValidateProgram
-#undef glVertexAttrib1f
-#undef glVertexAttrib1fv
-#undef glVertexAttrib2f
-#undef glVertexAttrib2fv
-#undef glVertexAttrib3f
-#undef glVertexAttrib3fv
-#undef glVertexAttrib4f
-#undef glVertexAttrib4fv
-#undef glVertexAttribPointer
-
-class Q_QT3D_EXPORT QOpenGLFunctions
-{
-public:
- QOpenGLFunctions();
- explicit QOpenGLFunctions(const QGLContext *context);
- ~QOpenGLFunctions() {}
-
- enum OpenGLFeature
- {
- Multitexture = 0x0001,
- Shaders = 0x0002,
- Buffers = 0x0004,
- Framebuffers = 0x0008,
- BlendColor = 0x0010,
- BlendEquation = 0x0020,
- BlendEquationSeparate = 0x0040,
- BlendFuncSeparate = 0x0080,
- BlendSubtract = 0x0100,
- CompressedTextures = 0x0200,
- Multisample = 0x0400,
- StencilSeparate = 0x0800,
- NPOTTextures = 0x1000
- };
- Q_DECLARE_FLAGS(OpenGLFeatures, OpenGLFeature)
-
- QOpenGLFunctions::OpenGLFeatures openGLFeatures() const;
- bool hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const;
-
- void initializeGLFunctions(const QGLContext *context = 0);
-
- void glActiveTexture(GLenum texture);
- void glAttachShader(GLuint program, GLuint shader);
- void glBindAttribLocation(GLuint program, GLuint index, const char* name);
- void glBindBuffer(GLenum target, GLuint buffer);
- void glBindFramebuffer(GLenum target, GLuint framebuffer);
- void glBindRenderbuffer(GLenum target, GLuint renderbuffer);
- void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
- void glBlendEquation(GLenum mode);
- void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
- void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
- void glBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage);
- void glBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data);
- GLenum glCheckFramebufferStatus(GLenum target);
- void glClearDepthf(GLclampf depth);
- void glCompileShader(GLuint shader);
- void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
- void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
- GLuint glCreateProgram();
- GLuint glCreateShader(GLenum type);
- void glDeleteBuffers(GLsizei n, const GLuint* buffers);
- void glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers);
- void glDeleteProgram(GLuint program);
- void glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers);
- void glDeleteShader(GLuint shader);
- void glDepthRangef(GLclampf zNear, GLclampf zFar);
- void glDetachShader(GLuint program, GLuint shader);
- void glDisableVertexAttribArray(GLuint index);
- void glEnableVertexAttribArray(GLuint index);
- void glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
- void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
- void glGenBuffers(GLsizei n, GLuint* buffers);
- void glGenerateMipmap(GLenum target);
- void glGenFramebuffers(GLsizei n, GLuint* framebuffers);
- void glGenRenderbuffers(GLsizei n, GLuint* renderbuffers);
- void glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- void glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
- int glGetAttribLocation(GLuint program, const char* name);
- void glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params);
- void glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params);
- void glGetProgramiv(GLuint program, GLenum pname, GLint* params);
- void glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
- void glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params);
- void glGetShaderiv(GLuint shader, GLenum pname, GLint* params);
- void glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
- void glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
- void glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
- void glGetUniformfv(GLuint program, GLint location, GLfloat* params);
- void glGetUniformiv(GLuint program, GLint location, GLint* params);
- int glGetUniformLocation(GLuint program, const char* name);
- void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);
- void glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params);
- void glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
- GLboolean glIsBuffer(GLuint buffer);
- GLboolean glIsFramebuffer(GLuint framebuffer);
- GLboolean glIsProgram(GLuint program);
- GLboolean glIsRenderbuffer(GLuint renderbuffer);
- GLboolean glIsShader(GLuint shader);
- void glLinkProgram(GLuint program);
- void glReleaseShaderCompiler();
- void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
- void glSampleCoverage(GLclampf value, GLboolean invert);
- void glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
- void glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length);
- void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
- void glStencilMaskSeparate(GLenum face, GLuint mask);
- void glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
- void glUniform1f(GLint location, GLfloat x);
- void glUniform1fv(GLint location, GLsizei count, const GLfloat* v);
- void glUniform1i(GLint location, GLint x);
- void glUniform1iv(GLint location, GLsizei count, const GLint* v);
- void glUniform2f(GLint location, GLfloat x, GLfloat y);
- void glUniform2fv(GLint location, GLsizei count, const GLfloat* v);
- void glUniform2i(GLint location, GLint x, GLint y);
- void glUniform2iv(GLint location, GLsizei count, const GLint* v);
- void glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
- void glUniform3fv(GLint location, GLsizei count, const GLfloat* v);
- void glUniform3i(GLint location, GLint x, GLint y, GLint z);
- void glUniform3iv(GLint location, GLsizei count, const GLint* v);
- void glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- void glUniform4fv(GLint location, GLsizei count, const GLfloat* v);
- void glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w);
- void glUniform4iv(GLint location, GLsizei count, const GLint* v);
- void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void glUseProgram(GLuint program);
- void glValidateProgram(GLuint program);
- void glVertexAttrib1f(GLuint indx, GLfloat x);
- void glVertexAttrib1fv(GLuint indx, const GLfloat* values);
- void glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
- void glVertexAttrib2fv(GLuint indx, const GLfloat* values);
- void glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
- void glVertexAttrib3fv(GLuint indx, const GLfloat* values);
- void glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- void glVertexAttrib4fv(GLuint indx, const GLfloat* values);
- void glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-
-private:
- QOpenGLFunctionsPrivate *d_ptr;
- static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != 0; }
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLFunctions::OpenGLFeatures)
-
-struct QOpenGLFunctionsPrivate
-{
- QOpenGLFunctionsPrivate(const QGLContext *context = 0);
-
-#ifndef QT_OPENGL_ES_2
- void (QT3D_GLF_APIENTRYP activeTexture)(GLenum texture);
- void (QT3D_GLF_APIENTRYP attachShader)(GLuint program, GLuint shader);
- void (QT3D_GLF_APIENTRYP bindAttribLocation)(GLuint program, GLuint index, const char* name);
- void (QT3D_GLF_APIENTRYP bindBuffer)(GLenum target, GLuint buffer);
- void (QT3D_GLF_APIENTRYP bindFramebuffer)(GLenum target, GLuint framebuffer);
- void (QT3D_GLF_APIENTRYP bindRenderbuffer)(GLenum target, GLuint renderbuffer);
- void (QT3D_GLF_APIENTRYP blendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
- void (QT3D_GLF_APIENTRYP blendEquation)(GLenum mode);
- void (QT3D_GLF_APIENTRYP blendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
- void (QT3D_GLF_APIENTRYP blendFuncSeparate)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
- void (QT3D_GLF_APIENTRYP bufferData)(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage);
- void (QT3D_GLF_APIENTRYP bufferSubData)(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data);
- GLenum (QT3D_GLF_APIENTRYP checkFramebufferStatus)(GLenum target);
- void (QT3D_GLF_APIENTRYP compileShader)(GLuint shader);
- void (QT3D_GLF_APIENTRYP compressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
- void (QT3D_GLF_APIENTRYP compressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
- GLuint (QT3D_GLF_APIENTRYP createProgram)();
- GLuint (QT3D_GLF_APIENTRYP createShader)(GLenum type);
- void (QT3D_GLF_APIENTRYP deleteBuffers)(GLsizei n, const GLuint* buffers);
- void (QT3D_GLF_APIENTRYP deleteFramebuffers)(GLsizei n, const GLuint* framebuffers);
- void (QT3D_GLF_APIENTRYP deleteProgram)(GLuint program);
- void (QT3D_GLF_APIENTRYP deleteRenderbuffers)(GLsizei n, const GLuint* renderbuffers);
- void (QT3D_GLF_APIENTRYP deleteShader)(GLuint shader);
- void (QT3D_GLF_APIENTRYP detachShader)(GLuint program, GLuint shader);
- void (QT3D_GLF_APIENTRYP disableVertexAttribArray)(GLuint index);
- void (QT3D_GLF_APIENTRYP enableVertexAttribArray)(GLuint index);
- void (QT3D_GLF_APIENTRYP framebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
- void (QT3D_GLF_APIENTRYP framebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
- void (QT3D_GLF_APIENTRYP genBuffers)(GLsizei n, GLuint* buffers);
- void (QT3D_GLF_APIENTRYP generateMipmap)(GLenum target);
- void (QT3D_GLF_APIENTRYP genFramebuffers)(GLsizei n, GLuint* framebuffers);
- void (QT3D_GLF_APIENTRYP genRenderbuffers)(GLsizei n, GLuint* renderbuffers);
- void (QT3D_GLF_APIENTRYP getActiveAttrib)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- void (QT3D_GLF_APIENTRYP getActiveUniform)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
- void (QT3D_GLF_APIENTRYP getAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
- int (QT3D_GLF_APIENTRYP getAttribLocation)(GLuint program, const char* name);
- void (QT3D_GLF_APIENTRYP getBufferParameteriv)(GLenum target, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getProgramiv)(GLuint program, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getProgramInfoLog)(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
- void (QT3D_GLF_APIENTRYP getRenderbufferParameteriv)(GLenum target, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getShaderiv)(GLuint shader, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getShaderInfoLog)(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
- void (QT3D_GLF_APIENTRYP getShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
- void (QT3D_GLF_APIENTRYP getShaderSource)(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
- void (QT3D_GLF_APIENTRYP getUniformfv)(GLuint program, GLint location, GLfloat* params);
- void (QT3D_GLF_APIENTRYP getUniformiv)(GLuint program, GLint location, GLint* params);
- int (QT3D_GLF_APIENTRYP getUniformLocation)(GLuint program, const char* name);
- void (QT3D_GLF_APIENTRYP getVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params);
- void (QT3D_GLF_APIENTRYP getVertexAttribiv)(GLuint index, GLenum pname, GLint* params);
- void (QT3D_GLF_APIENTRYP getVertexAttribPointerv)(GLuint index, GLenum pname, void** pointer);
- GLboolean (QT3D_GLF_APIENTRYP isBuffer)(GLuint buffer);
- GLboolean (QT3D_GLF_APIENTRYP isFramebuffer)(GLuint framebuffer);
- GLboolean (QT3D_GLF_APIENTRYP isProgram)(GLuint program);
- GLboolean (QT3D_GLF_APIENTRYP isRenderbuffer)(GLuint renderbuffer);
- GLboolean (QT3D_GLF_APIENTRYP isShader)(GLuint shader);
- void (QT3D_GLF_APIENTRYP linkProgram)(GLuint program);
- void (QT3D_GLF_APIENTRYP releaseShaderCompiler)();
- void (QT3D_GLF_APIENTRYP renderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
- void (QT3D_GLF_APIENTRYP sampleCoverage)(GLclampf value, GLboolean invert);
- void (QT3D_GLF_APIENTRYP shaderBinary)(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
- void (QT3D_GLF_APIENTRYP shaderSource)(GLuint shader, GLsizei count, const char** string, const GLint* length);
- void (QT3D_GLF_APIENTRYP stencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask);
- void (QT3D_GLF_APIENTRYP stencilMaskSeparate)(GLenum face, GLuint mask);
- void (QT3D_GLF_APIENTRYP stencilOpSeparate)(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
- void (QT3D_GLF_APIENTRYP uniform1f)(GLint location, GLfloat x);
- void (QT3D_GLF_APIENTRYP uniform1fv)(GLint location, GLsizei count, const GLfloat* v);
- void (QT3D_GLF_APIENTRYP uniform1i)(GLint location, GLint x);
- void (QT3D_GLF_APIENTRYP uniform1iv)(GLint location, GLsizei count, const GLint* v);
- void (QT3D_GLF_APIENTRYP uniform2f)(GLint location, GLfloat x, GLfloat y);
- void (QT3D_GLF_APIENTRYP uniform2fv)(GLint location, GLsizei count, const GLfloat* v);
- void (QT3D_GLF_APIENTRYP uniform2i)(GLint location, GLint x, GLint y);
- void (QT3D_GLF_APIENTRYP uniform2iv)(GLint location, GLsizei count, const GLint* v);
- void (QT3D_GLF_APIENTRYP uniform3f)(GLint location, GLfloat x, GLfloat y, GLfloat z);
- void (QT3D_GLF_APIENTRYP uniform3fv)(GLint location, GLsizei count, const GLfloat* v);
- void (QT3D_GLF_APIENTRYP uniform3i)(GLint location, GLint x, GLint y, GLint z);
- void (QT3D_GLF_APIENTRYP uniform3iv)(GLint location, GLsizei count, const GLint* v);
- void (QT3D_GLF_APIENTRYP uniform4f)(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- void (QT3D_GLF_APIENTRYP uniform4fv)(GLint location, GLsizei count, const GLfloat* v);
- void (QT3D_GLF_APIENTRYP uniform4i)(GLint location, GLint x, GLint y, GLint z, GLint w);
- void (QT3D_GLF_APIENTRYP uniform4iv)(GLint location, GLsizei count, const GLint* v);
- void (QT3D_GLF_APIENTRYP uniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void (QT3D_GLF_APIENTRYP uniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void (QT3D_GLF_APIENTRYP uniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
- void (QT3D_GLF_APIENTRYP useProgram)(GLuint program);
- void (QT3D_GLF_APIENTRYP validateProgram)(GLuint program);
- void (QT3D_GLF_APIENTRYP vertexAttrib1f)(GLuint indx, GLfloat x);
- void (QT3D_GLF_APIENTRYP vertexAttrib1fv)(GLuint indx, const GLfloat* values);
- void (QT3D_GLF_APIENTRYP vertexAttrib2f)(GLuint indx, GLfloat x, GLfloat y);
- void (QT3D_GLF_APIENTRYP vertexAttrib2fv)(GLuint indx, const GLfloat* values);
- void (QT3D_GLF_APIENTRYP vertexAttrib3f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
- void (QT3D_GLF_APIENTRYP vertexAttrib3fv)(GLuint indx, const GLfloat* values);
- void (QT3D_GLF_APIENTRYP vertexAttrib4f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
- void (QT3D_GLF_APIENTRYP vertexAttrib4fv)(GLuint indx, const GLfloat* values);
- void (QT3D_GLF_APIENTRYP vertexAttribPointer)(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-#endif
-};
-
-inline void QOpenGLFunctions::glActiveTexture(GLenum texture)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glActiveTexture(texture);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->activeTexture(texture);
-#endif
-}
-
-inline void QOpenGLFunctions::glAttachShader(GLuint program, GLuint shader)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glAttachShader(program, shader);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->attachShader(program, shader);
-#endif
-}
-
-inline void QOpenGLFunctions::glBindAttribLocation(GLuint program, GLuint index, const char* name)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBindAttribLocation(program, index, name);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bindAttribLocation(program, index, name);
-#endif
-}
-
-inline void QOpenGLFunctions::glBindBuffer(GLenum target, GLuint buffer)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBindBuffer(target, buffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bindBuffer(target, buffer);
-#endif
-}
-
-inline void QOpenGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBindFramebuffer(target, framebuffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bindFramebuffer(target, framebuffer);
-#endif
-}
-
-inline void QOpenGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBindRenderbuffer(target, renderbuffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bindRenderbuffer(target, renderbuffer);
-#endif
-}
-
-inline void QOpenGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBlendColor(red, green, blue, alpha);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->blendColor(red, green, blue, alpha);
-#endif
-}
-
-inline void QOpenGLFunctions::glBlendEquation(GLenum mode)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBlendEquation(mode);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->blendEquation(mode);
-#endif
-}
-
-inline void QOpenGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBlendEquationSeparate(modeRGB, modeAlpha);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->blendEquationSeparate(modeRGB, modeAlpha);
-#endif
-}
-
-inline void QOpenGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
-#endif
-}
-
-inline void QOpenGLFunctions::glBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBufferData(target, size, data, usage);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bufferData(target, size, data, usage);
-#endif
-}
-
-inline void QOpenGLFunctions::glBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glBufferSubData(target, offset, size, data);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->bufferSubData(target, offset, size, data);
-#endif
-}
-
-inline GLenum QOpenGLFunctions::glCheckFramebufferStatus(GLenum target)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glCheckFramebufferStatus(target);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->checkFramebufferStatus(target);
-#endif
-}
-
-inline void QOpenGLFunctions::glClearDepthf(GLclampf depth)
-{
-#ifndef QT_OPENGL_ES
- ::glClearDepth(depth);
-#else
- ::glClearDepthf(depth);
-#endif
-}
-
-inline void QOpenGLFunctions::glCompileShader(GLuint shader)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glCompileShader(shader);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->compileShader(shader);
-#endif
-}
-
-inline void QOpenGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
-#endif
-}
-
-inline void QOpenGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
-#endif
-}
-
-inline GLuint QOpenGLFunctions::glCreateProgram()
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glCreateProgram();
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->createProgram();
-#endif
-}
-
-inline GLuint QOpenGLFunctions::glCreateShader(GLenum type)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glCreateShader(type);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->createShader(type);
-#endif
-}
-
-inline void QOpenGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDeleteBuffers(n, buffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->deleteBuffers(n, buffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDeleteFramebuffers(n, framebuffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->deleteFramebuffers(n, framebuffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glDeleteProgram(GLuint program)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDeleteProgram(program);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->deleteProgram(program);
-#endif
-}
-
-inline void QOpenGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDeleteRenderbuffers(n, renderbuffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->deleteRenderbuffers(n, renderbuffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glDeleteShader(GLuint shader)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDeleteShader(shader);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->deleteShader(shader);
-#endif
-}
-
-inline void QOpenGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-#ifndef QT_OPENGL_ES
- ::glDepthRange(zNear, zFar);
-#else
- ::glDepthRangef(zNear, zFar);
-#endif
-}
-
-inline void QOpenGLFunctions::glDetachShader(GLuint program, GLuint shader)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDetachShader(program, shader);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->detachShader(program, shader);
-#endif
-}
-
-inline void QOpenGLFunctions::glDisableVertexAttribArray(GLuint index)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glDisableVertexAttribArray(index);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->disableVertexAttribArray(index);
-#endif
-}
-
-inline void QOpenGLFunctions::glEnableVertexAttribArray(GLuint index)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glEnableVertexAttribArray(index);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->enableVertexAttribArray(index);
-#endif
-}
-
-inline void QOpenGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
-#endif
-}
-
-inline void QOpenGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glFramebufferTexture2D(target, attachment, textarget, texture, level);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->framebufferTexture2D(target, attachment, textarget, texture, level);
-#endif
-}
-
-inline void QOpenGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGenBuffers(n, buffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->genBuffers(n, buffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glGenerateMipmap(GLenum target)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGenerateMipmap(target);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->generateMipmap(target);
-#endif
-}
-
-inline void QOpenGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGenFramebuffers(n, framebuffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->genFramebuffers(n, framebuffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGenRenderbuffers(n, renderbuffers);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->genRenderbuffers(n, renderbuffers);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetActiveAttrib(program, index, bufsize, length, size, type, name);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getActiveAttrib(program, index, bufsize, length, size, type, name);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetActiveUniform(program, index, bufsize, length, size, type, name);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getActiveUniform(program, index, bufsize, length, size, type, name);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetAttachedShaders(program, maxcount, count, shaders);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getAttachedShaders(program, maxcount, count, shaders);
-#endif
-}
-
-inline int QOpenGLFunctions::glGetAttribLocation(GLuint program, const char* name)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glGetAttribLocation(program, name);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->getAttribLocation(program, name);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetBufferParameteriv(target, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getBufferParameteriv(target, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getFramebufferAttachmentParameteriv(target, attachment, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetProgramiv(program, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getProgramiv(program, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetProgramInfoLog(program, bufsize, length, infolog);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getProgramInfoLog(program, bufsize, length, infolog);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetRenderbufferParameteriv(target, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getRenderbufferParameteriv(target, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetShaderiv(shader, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getShaderiv(shader, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetShaderInfoLog(shader, bufsize, length, infolog);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getShaderInfoLog(shader, bufsize, length, infolog);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetShaderSource(shader, bufsize, length, source);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getShaderSource(shader, bufsize, length, source);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetUniformfv(GLuint program, GLint location, GLfloat* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetUniformfv(program, location, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getUniformfv(program, location, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetUniformiv(GLuint program, GLint location, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetUniformiv(program, location, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getUniformiv(program, location, params);
-#endif
-}
-
-inline int QOpenGLFunctions::glGetUniformLocation(GLuint program, const char* name)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glGetUniformLocation(program, name);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->getUniformLocation(program, name);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetVertexAttribfv(index, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getVertexAttribfv(index, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetVertexAttribiv(index, pname, params);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getVertexAttribiv(index, pname, params);
-#endif
-}
-
-inline void QOpenGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glGetVertexAttribPointerv(index, pname, pointer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->getVertexAttribPointerv(index, pname, pointer);
-#endif
-}
-
-inline GLboolean QOpenGLFunctions::glIsBuffer(GLuint buffer)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glIsBuffer(buffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->isBuffer(buffer);
-#endif
-}
-
-inline GLboolean QOpenGLFunctions::glIsFramebuffer(GLuint framebuffer)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glIsFramebuffer(framebuffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->isFramebuffer(framebuffer);
-#endif
-}
-
-inline GLboolean QOpenGLFunctions::glIsProgram(GLuint program)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glIsProgram(program);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->isProgram(program);
-#endif
-}
-
-inline GLboolean QOpenGLFunctions::glIsRenderbuffer(GLuint renderbuffer)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glIsRenderbuffer(renderbuffer);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->isRenderbuffer(renderbuffer);
-#endif
-}
-
-inline GLboolean QOpenGLFunctions::glIsShader(GLuint shader)
-{
-#if defined(QT_OPENGL_ES_2)
- return ::glIsShader(shader);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- return d_ptr->isShader(shader);
-#endif
-}
-
-inline void QOpenGLFunctions::glLinkProgram(GLuint program)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glLinkProgram(program);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->linkProgram(program);
-#endif
-}
-
-inline void QOpenGLFunctions::glReleaseShaderCompiler()
-{
-#if defined(QT_OPENGL_ES_2)
- ::glReleaseShaderCompiler();
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->releaseShaderCompiler();
-#endif
-}
-
-inline void QOpenGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glRenderbufferStorage(target, internalformat, width, height);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->renderbufferStorage(target, internalformat, width, height);
-#endif
-}
-
-inline void QOpenGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glSampleCoverage(value, invert);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->sampleCoverage(value, invert);
-#endif
-}
-
-inline void QOpenGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glShaderBinary(n, shaders, binaryformat, binary, length);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->shaderBinary(n, shaders, binaryformat, binary, length);
-#endif
-}
-
-inline void QOpenGLFunctions::glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glShaderSource(shader, count, string, length);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->shaderSource(shader, count, string, length);
-#endif
-}
-
-inline void QOpenGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glStencilFuncSeparate(face, func, ref, mask);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->stencilFuncSeparate(face, func, ref, mask);
-#endif
-}
-
-inline void QOpenGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glStencilMaskSeparate(face, mask);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->stencilMaskSeparate(face, mask);
-#endif
-}
-
-inline void QOpenGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glStencilOpSeparate(face, fail, zfail, zpass);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->stencilOpSeparate(face, fail, zfail, zpass);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform1f(GLint location, GLfloat x)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform1f(location, x);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform1f(location, x);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform1fv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform1fv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform1i(GLint location, GLint x)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform1i(location, x);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform1i(location, x);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform1iv(GLint location, GLsizei count, const GLint* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform1iv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform1iv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform2f(location, x, y);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform2f(location, x, y);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform2fv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform2fv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform2i(GLint location, GLint x, GLint y)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform2i(location, x, y);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform2i(location, x, y);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform2iv(GLint location, GLsizei count, const GLint* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform2iv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform2iv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform3f(location, x, y, z);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform3f(location, x, y, z);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform3fv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform3fv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLint z)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform3i(location, x, y, z);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform3i(location, x, y, z);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform3iv(GLint location, GLsizei count, const GLint* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform3iv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform3iv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform4f(location, x, y, z, w);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform4f(location, x, y, z, w);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform4fv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform4fv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform4i(location, x, y, z, w);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform4i(location, x, y, z, w);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniform4iv(GLint location, GLsizei count, const GLint* v)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniform4iv(location, count, v);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniform4iv(location, count, v);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniformMatrix2fv(location, count, transpose, value);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniformMatrix2fv(location, count, transpose, value);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniformMatrix3fv(location, count, transpose, value);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniformMatrix3fv(location, count, transpose, value);
-#endif
-}
-
-inline void QOpenGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUniformMatrix4fv(location, count, transpose, value);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->uniformMatrix4fv(location, count, transpose, value);
-#endif
-}
-
-inline void QOpenGLFunctions::glUseProgram(GLuint program)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glUseProgram(program);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->useProgram(program);
-#endif
-}
-
-inline void QOpenGLFunctions::glValidateProgram(GLuint program)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glValidateProgram(program);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->validateProgram(program);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib1f(indx, x);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib1f(indx, x);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib1fv(indx, values);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib1fv(indx, values);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib2f(indx, x, y);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib2f(indx, x, y);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib2fv(indx, values);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib2fv(indx, values);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib3f(indx, x, y, z);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib3f(indx, x, y, z);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib3fv(indx, values);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib3fv(indx, values);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib4f(indx, x, y, z, w);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib4f(indx, x, y, z, w);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttrib4fv(indx, values);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttrib4fv(indx, values);
-#endif
-}
-
-inline void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-{
-#if defined(QT_OPENGL_ES_2)
- ::glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
-#else
- Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
- d_ptr->vertexAttribPointer(indx, size, type, normalized, stride, ptr);
-#endif
-}
-
-#ifndef GL_ACTIVE_ATTRIBUTE_MAX_LENGTH
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#endif
-#ifndef GL_ACTIVE_ATTRIBUTES
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#endif
-#ifndef GL_ACTIVE_TEXTURE
-#define GL_ACTIVE_TEXTURE 0x84E0
-#endif
-#ifndef GL_ACTIVE_UNIFORM_MAX_LENGTH
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#endif
-#ifndef GL_ACTIVE_UNIFORMS
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#endif
-#ifndef GL_ALIASED_LINE_WIDTH_RANGE
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-#endif
-#ifndef GL_ALIASED_POINT_SIZE_RANGE
-#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
-#endif
-#ifndef GL_ALPHA
-#define GL_ALPHA 0x1906
-#endif
-#ifndef GL_ALPHA_BITS
-#define GL_ALPHA_BITS 0x0D55
-#endif
-#ifndef GL_ALWAYS
-#define GL_ALWAYS 0x0207
-#endif
-#ifndef GL_ARRAY_BUFFER
-#define GL_ARRAY_BUFFER 0x8892
-#endif
-#ifndef GL_ARRAY_BUFFER_BINDING
-#define GL_ARRAY_BUFFER_BINDING 0x8894
-#endif
-#ifndef GL_ATTACHED_SHADERS
-#define GL_ATTACHED_SHADERS 0x8B85
-#endif
-#ifndef GL_BACK
-#define GL_BACK 0x0405
-#endif
-#ifndef GL_BLEND
-#define GL_BLEND 0x0BE2
-#endif
-#ifndef GL_BLEND_COLOR
-#define GL_BLEND_COLOR 0x8005
-#endif
-#ifndef GL_BLEND_DST_ALPHA
-#define GL_BLEND_DST_ALPHA 0x80CA
-#endif
-#ifndef GL_BLEND_DST_RGB
-#define GL_BLEND_DST_RGB 0x80C8
-#endif
-#ifndef GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION 0x8009
-#endif
-#ifndef GL_BLEND_EQUATION_ALPHA
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#endif
-#ifndef GL_BLEND_EQUATION_RGB
-#define GL_BLEND_EQUATION_RGB 0x8009
-#endif
-#ifndef GL_BLEND_SRC_ALPHA
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#endif
-#ifndef GL_BLEND_SRC_RGB
-#define GL_BLEND_SRC_RGB 0x80C9
-#endif
-#ifndef GL_BLUE_BITS
-#define GL_BLUE_BITS 0x0D54
-#endif
-#ifndef GL_BOOL
-#define GL_BOOL 0x8B56
-#endif
-#ifndef GL_BOOL_VEC2
-#define GL_BOOL_VEC2 0x8B57
-#endif
-#ifndef GL_BOOL_VEC3
-#define GL_BOOL_VEC3 0x8B58
-#endif
-#ifndef GL_BOOL_VEC4
-#define GL_BOOL_VEC4 0x8B59
-#endif
-#ifndef GL_BUFFER_SIZE
-#define GL_BUFFER_SIZE 0x8764
-#endif
-#ifndef GL_BUFFER_USAGE
-#define GL_BUFFER_USAGE 0x8765
-#endif
-#ifndef GL_BYTE
-#define GL_BYTE 0x1400
-#endif
-#ifndef GL_CCW
-#define GL_CCW 0x0901
-#endif
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE 0x812F
-#endif
-#ifndef GL_COLOR_ATTACHMENT0
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#endif
-#ifndef GL_COLOR_BUFFER_BIT
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#endif
-#ifndef GL_COLOR_CLEAR_VALUE
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#endif
-#ifndef GL_COLOR_WRITEMASK
-#define GL_COLOR_WRITEMASK 0x0C23
-#endif
-#ifndef GL_COMPILE_STATUS
-#define GL_COMPILE_STATUS 0x8B81
-#endif
-#ifndef GL_COMPRESSED_TEXTURE_FORMATS
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
-#endif
-#ifndef GL_CONSTANT_ALPHA
-#define GL_CONSTANT_ALPHA 0x8003
-#endif
-#ifndef GL_CONSTANT_COLOR
-#define GL_CONSTANT_COLOR 0x8001
-#endif
-#ifndef GL_CULL_FACE
-#define GL_CULL_FACE 0x0B44
-#endif
-#ifndef GL_CULL_FACE_MODE
-#define GL_CULL_FACE_MODE 0x0B45
-#endif
-#ifndef GL_CURRENT_PROGRAM
-#define GL_CURRENT_PROGRAM 0x8B8D
-#endif
-#ifndef GL_CURRENT_VERTEX_ATTRIB
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#endif
-#ifndef GL_CW
-#define GL_CW 0x0900
-#endif
-#ifndef GL_DECR
-#define GL_DECR 0x1E03
-#endif
-#ifndef GL_DECR_WRAP
-#define GL_DECR_WRAP 0x8508
-#endif
-#ifndef GL_DELETE_STATUS
-#define GL_DELETE_STATUS 0x8B80
-#endif
-#ifndef GL_DEPTH_ATTACHMENT
-#define GL_DEPTH_ATTACHMENT 0x8D00
-#endif
-#ifndef GL_DEPTH_BITS
-#define GL_DEPTH_BITS 0x0D56
-#endif
-#ifndef GL_DEPTH_BUFFER_BIT
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#endif
-#ifndef GL_DEPTH_CLEAR_VALUE
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#endif
-#ifndef GL_DEPTH_COMPONENT
-#define GL_DEPTH_COMPONENT 0x1902
-#endif
-#ifndef GL_DEPTH_COMPONENT16
-#define GL_DEPTH_COMPONENT16 0x81A5
-#endif
-#ifndef GL_DEPTH_FUNC
-#define GL_DEPTH_FUNC 0x0B74
-#endif
-#ifndef GL_DEPTH_RANGE
-#define GL_DEPTH_RANGE 0x0B70
-#endif
-#ifndef GL_DEPTH_TEST
-#define GL_DEPTH_TEST 0x0B71
-#endif
-#ifndef GL_DEPTH_WRITEMASK
-#define GL_DEPTH_WRITEMASK 0x0B72
-#endif
-#ifndef GL_DITHER
-#define GL_DITHER 0x0BD0
-#endif
-#ifndef GL_DONT_CARE
-#define GL_DONT_CARE 0x1100
-#endif
-#ifndef GL_DST_ALPHA
-#define GL_DST_ALPHA 0x0304
-#endif
-#ifndef GL_DST_COLOR
-#define GL_DST_COLOR 0x0306
-#endif
-#ifndef GL_DYNAMIC_DRAW
-#define GL_DYNAMIC_DRAW 0x88E8
-#endif
-#ifndef GL_ELEMENT_ARRAY_BUFFER
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#endif
-#ifndef GL_ELEMENT_ARRAY_BUFFER_BINDING
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#endif
-#ifndef GL_EQUAL
-#define GL_EQUAL 0x0202
-#endif
-#ifndef GL_EXTENSIONS
-#define GL_EXTENSIONS 0x1F03
-#endif
-#ifndef GL_FALSE
-#define GL_FALSE 0
-#endif
-#ifndef GL_FASTEST
-#define GL_FASTEST 0x1101
-#endif
-#ifndef GL_FIXED
-#define GL_FIXED 0x140C
-#endif
-#ifndef GL_FLOAT
-#define GL_FLOAT 0x1406
-#endif
-#ifndef GL_FLOAT_MAT2
-#define GL_FLOAT_MAT2 0x8B5A
-#endif
-#ifndef GL_FLOAT_MAT3
-#define GL_FLOAT_MAT3 0x8B5B
-#endif
-#ifndef GL_FLOAT_MAT4
-#define GL_FLOAT_MAT4 0x8B5C
-#endif
-#ifndef GL_FLOAT_VEC2
-#define GL_FLOAT_VEC2 0x8B50
-#endif
-#ifndef GL_FLOAT_VEC3
-#define GL_FLOAT_VEC3 0x8B51
-#endif
-#ifndef GL_FLOAT_VEC4
-#define GL_FLOAT_VEC4 0x8B52
-#endif
-#ifndef GL_FRAGMENT_SHADER
-#define GL_FRAGMENT_SHADER 0x8B30
-#endif
-#ifndef GL_FRAMEBUFFER
-#define GL_FRAMEBUFFER 0x8D40
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#endif
-#ifndef GL_FRAMEBUFFER_BINDING
-#define GL_FRAMEBUFFER_BINDING 0x8CA6
-#endif
-#ifndef GL_FRAMEBUFFER_COMPLETE
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#endif
-#ifndef GL_FRAMEBUFFER_UNSUPPORTED
-#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
-#endif
-#ifndef GL_FRONT
-#define GL_FRONT 0x0404
-#endif
-#ifndef GL_FRONT_AND_BACK
-#define GL_FRONT_AND_BACK 0x0408
-#endif
-#ifndef GL_FRONT_FACE
-#define GL_FRONT_FACE 0x0B46
-#endif
-#ifndef GL_FUNC_ADD
-#define GL_FUNC_ADD 0x8006
-#endif
-#ifndef GL_FUNC_REVERSE_SUBTRACT
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#endif
-#ifndef GL_FUNC_SUBTRACT
-#define GL_FUNC_SUBTRACT 0x800A
-#endif
-#ifndef GL_GENERATE_MIPMAP_HINT
-#define GL_GENERATE_MIPMAP_HINT 0x8192
-#endif
-#ifndef GL_GEQUAL
-#define GL_GEQUAL 0x0206
-#endif
-#ifndef GL_GREATER
-#define GL_GREATER 0x0204
-#endif
-#ifndef GL_GREEN_BITS
-#define GL_GREEN_BITS 0x0D53
-#endif
-#ifndef GL_HIGH_FLOAT
-#define GL_HIGH_FLOAT 0x8DF2
-#endif
-#ifndef GL_HIGH_INT
-#define GL_HIGH_INT 0x8DF5
-#endif
-#ifndef GL_IMPLEMENTATION_COLOR_READ_FORMAT
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#endif
-#ifndef GL_IMPLEMENTATION_COLOR_READ_TYPE
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#endif
-#ifndef GL_INCR
-#define GL_INCR 0x1E02
-#endif
-#ifndef GL_INCR_WRAP
-#define GL_INCR_WRAP 0x8507
-#endif
-#ifndef GL_INFO_LOG_LENGTH
-#define GL_INFO_LOG_LENGTH 0x8B84
-#endif
-#ifndef GL_INT
-#define GL_INT 0x1404
-#endif
-#ifndef GL_INT_VEC2
-#define GL_INT_VEC2 0x8B53
-#endif
-#ifndef GL_INT_VEC3
-#define GL_INT_VEC3 0x8B54
-#endif
-#ifndef GL_INT_VEC4
-#define GL_INT_VEC4 0x8B55
-#endif
-#ifndef GL_INVALID_ENUM
-#define GL_INVALID_ENUM 0x0500
-#endif
-#ifndef GL_INVALID_FRAMEBUFFER_OPERATION
-#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
-#endif
-#ifndef GL_INVALID_OPERATION
-#define GL_INVALID_OPERATION 0x0502
-#endif
-#ifndef GL_INVALID_VALUE
-#define GL_INVALID_VALUE 0x0501
-#endif
-#ifndef GL_INVERT
-#define GL_INVERT 0x150A
-#endif
-#ifndef GL_KEEP
-#define GL_KEEP 0x1E00
-#endif
-#ifndef GL_LEQUAL
-#define GL_LEQUAL 0x0203
-#endif
-#ifndef GL_LESS
-#define GL_LESS 0x0201
-#endif
-#ifndef GL_LINEAR
-#define GL_LINEAR 0x2601
-#endif
-#ifndef GL_LINEAR_MIPMAP_LINEAR
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#endif
-#ifndef GL_LINEAR_MIPMAP_NEAREST
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#endif
-#ifndef GL_LINE_LOOP
-#define GL_LINE_LOOP 0x0002
-#endif
-#ifndef GL_LINES
-#define GL_LINES 0x0001
-#endif
-#ifndef GL_LINE_STRIP
-#define GL_LINE_STRIP 0x0003
-#endif
-#ifndef GL_LINE_WIDTH
-#define GL_LINE_WIDTH 0x0B21
-#endif
-#ifndef GL_LINK_STATUS
-#define GL_LINK_STATUS 0x8B82
-#endif
-#ifndef GL_LOW_FLOAT
-#define GL_LOW_FLOAT 0x8DF0
-#endif
-#ifndef GL_LOW_INT
-#define GL_LOW_INT 0x8DF3
-#endif
-#ifndef GL_LUMINANCE
-#define GL_LUMINANCE 0x1909
-#endif
-#ifndef GL_LUMINANCE_ALPHA
-#define GL_LUMINANCE_ALPHA 0x190A
-#endif
-#ifndef GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#endif
-#ifndef GL_MAX_CUBE_MAP_TEXTURE_SIZE
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
-#endif
-#ifndef GL_MAX_FRAGMENT_UNIFORM_VECTORS
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-#endif
-#ifndef GL_MAX_RENDERBUFFER_SIZE
-#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
-#endif
-#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#endif
-#ifndef GL_MAX_TEXTURE_SIZE
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#endif
-#ifndef GL_MAX_VARYING_VECTORS
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#endif
-#ifndef GL_MAX_VERTEX_ATTRIBS
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#endif
-#ifndef GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#endif
-#ifndef GL_MAX_VERTEX_UNIFORM_VECTORS
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#endif
-#ifndef GL_MAX_VIEWPORT_DIMS
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#endif
-#ifndef GL_MEDIUM_FLOAT
-#define GL_MEDIUM_FLOAT 0x8DF1
-#endif
-#ifndef GL_MEDIUM_INT
-#define GL_MEDIUM_INT 0x8DF4
-#endif
-#ifndef GL_MIRRORED_REPEAT
-#define GL_MIRRORED_REPEAT 0x8370
-#endif
-#ifndef GL_NEAREST
-#define GL_NEAREST 0x2600
-#endif
-#ifndef GL_NEAREST_MIPMAP_LINEAR
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#endif
-#ifndef GL_NEAREST_MIPMAP_NEAREST
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#endif
-#ifndef GL_NEVER
-#define GL_NEVER 0x0200
-#endif
-#ifndef GL_NICEST
-#define GL_NICEST 0x1102
-#endif
-#ifndef GL_NO_ERROR
-#define GL_NO_ERROR 0
-#endif
-#ifndef GL_NONE
-#define GL_NONE 0
-#endif
-#ifndef GL_NOTEQUAL
-#define GL_NOTEQUAL 0x0205
-#endif
-#ifndef GL_NUM_COMPRESSED_TEXTURE_FORMATS
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#endif
-#ifndef GL_NUM_SHADER_BINARY_FORMATS
-#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
-#endif
-#ifndef GL_ONE
-#define GL_ONE 1
-#endif
-#ifndef GL_ONE_MINUS_CONSTANT_ALPHA
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#endif
-#ifndef GL_ONE_MINUS_CONSTANT_COLOR
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#endif
-#ifndef GL_ONE_MINUS_DST_ALPHA
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#endif
-#ifndef GL_ONE_MINUS_DST_COLOR
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#endif
-#ifndef GL_ONE_MINUS_SRC_ALPHA
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#endif
-#ifndef GL_ONE_MINUS_SRC_COLOR
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#endif
-#ifndef GL_OUT_OF_MEMORY
-#define GL_OUT_OF_MEMORY 0x0505
-#endif
-#ifndef GL_PACK_ALIGNMENT
-#define GL_PACK_ALIGNMENT 0x0D05
-#endif
-#ifndef GL_POINTS
-#define GL_POINTS 0x0000
-#endif
-#ifndef GL_POLYGON_OFFSET_FACTOR
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#endif
-#ifndef GL_POLYGON_OFFSET_FILL
-#define GL_POLYGON_OFFSET_FILL 0x8037
-#endif
-#ifndef GL_POLYGON_OFFSET_UNITS
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#endif
-#ifndef GL_RED_BITS
-#define GL_RED_BITS 0x0D52
-#endif
-#ifndef GL_RENDERBUFFER
-#define GL_RENDERBUFFER 0x8D41
-#endif
-#ifndef GL_RENDERBUFFER_ALPHA_SIZE
-#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
-#endif
-#ifndef GL_RENDERBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING 0x8CA7
-#endif
-#ifndef GL_RENDERBUFFER_BLUE_SIZE
-#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
-#endif
-#ifndef GL_RENDERBUFFER_DEPTH_SIZE
-#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
-#endif
-#ifndef GL_RENDERBUFFER_GREEN_SIZE
-#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
-#endif
-#ifndef GL_RENDERBUFFER_HEIGHT
-#define GL_RENDERBUFFER_HEIGHT 0x8D43
-#endif
-#ifndef GL_RENDERBUFFER_INTERNAL_FORMAT
-#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
-#endif
-#ifndef GL_RENDERBUFFER_RED_SIZE
-#define GL_RENDERBUFFER_RED_SIZE 0x8D50
-#endif
-#ifndef GL_RENDERBUFFER_STENCIL_SIZE
-#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
-#endif
-#ifndef GL_RENDERBUFFER_WIDTH
-#define GL_RENDERBUFFER_WIDTH 0x8D42
-#endif
-#ifndef GL_RENDERER
-#define GL_RENDERER 0x1F01
-#endif
-#ifndef GL_REPEAT
-#define GL_REPEAT 0x2901
-#endif
-#ifndef GL_REPLACE
-#define GL_REPLACE 0x1E01
-#endif
-#ifndef GL_RGB
-#define GL_RGB 0x1907
-#endif
-#ifndef GL_RGB565
-#define GL_RGB565 0x8D62
-#endif
-#ifndef GL_RGB5_A1
-#define GL_RGB5_A1 0x8057
-#endif
-#ifndef GL_RGBA
-#define GL_RGBA 0x1908
-#endif
-#ifndef GL_RGBA4
-#define GL_RGBA4 0x8056
-#endif
-#ifndef GL_SAMPLE_ALPHA_TO_COVERAGE
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#endif
-#ifndef GL_SAMPLE_BUFFERS
-#define GL_SAMPLE_BUFFERS 0x80A8
-#endif
-#ifndef GL_SAMPLE_COVERAGE
-#define GL_SAMPLE_COVERAGE 0x80A0
-#endif
-#ifndef GL_SAMPLE_COVERAGE_INVERT
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#endif
-#ifndef GL_SAMPLE_COVERAGE_VALUE
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#endif
-#ifndef GL_SAMPLER_2D
-#define GL_SAMPLER_2D 0x8B5E
-#endif
-#ifndef GL_SAMPLER_CUBE
-#define GL_SAMPLER_CUBE 0x8B60
-#endif
-#ifndef GL_SAMPLES
-#define GL_SAMPLES 0x80A9
-#endif
-#ifndef GL_SCISSOR_BOX
-#define GL_SCISSOR_BOX 0x0C10
-#endif
-#ifndef GL_SCISSOR_TEST
-#define GL_SCISSOR_TEST 0x0C11
-#endif
-#ifndef GL_SHADER_BINARY_FORMATS
-#define GL_SHADER_BINARY_FORMATS 0x8DF8
-#endif
-#ifndef GL_SHADER_COMPILER
-#define GL_SHADER_COMPILER 0x8DFA
-#endif
-#ifndef GL_SHADER_SOURCE_LENGTH
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#endif
-#ifndef GL_SHADER_TYPE
-#define GL_SHADER_TYPE 0x8B4F
-#endif
-#ifndef GL_SHADING_LANGUAGE_VERSION
-#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
-#endif
-#ifndef GL_SHORT
-#define GL_SHORT 0x1402
-#endif
-#ifndef GL_SRC_ALPHA
-#define GL_SRC_ALPHA 0x0302
-#endif
-#ifndef GL_SRC_ALPHA_SATURATE
-#define GL_SRC_ALPHA_SATURATE 0x0308
-#endif
-#ifndef GL_SRC_COLOR
-#define GL_SRC_COLOR 0x0300
-#endif
-#ifndef GL_STATIC_DRAW
-#define GL_STATIC_DRAW 0x88E4
-#endif
-#ifndef GL_STENCIL_ATTACHMENT
-#define GL_STENCIL_ATTACHMENT 0x8D20
-#endif
-#ifndef GL_STENCIL_BACK_FAIL
-#define GL_STENCIL_BACK_FAIL 0x8801
-#endif
-#ifndef GL_STENCIL_BACK_FUNC
-#define GL_STENCIL_BACK_FUNC 0x8800
-#endif
-#ifndef GL_STENCIL_BACK_PASS_DEPTH_FAIL
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
-#endif
-#ifndef GL_STENCIL_BACK_PASS_DEPTH_PASS
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
-#endif
-#ifndef GL_STENCIL_BACK_REF
-#define GL_STENCIL_BACK_REF 0x8CA3
-#endif
-#ifndef GL_STENCIL_BACK_VALUE_MASK
-#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
-#endif
-#ifndef GL_STENCIL_BACK_WRITEMASK
-#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
-#endif
-#ifndef GL_STENCIL_BITS
-#define GL_STENCIL_BITS 0x0D57
-#endif
-#ifndef GL_STENCIL_BUFFER_BIT
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#endif
-#ifndef GL_STENCIL_CLEAR_VALUE
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#endif
-#ifndef GL_STENCIL_FAIL
-#define GL_STENCIL_FAIL 0x0B94
-#endif
-#ifndef GL_STENCIL_FUNC
-#define GL_STENCIL_FUNC 0x0B92
-#endif
-#ifndef GL_STENCIL_INDEX
-#define GL_STENCIL_INDEX 0x1901
-#endif
-#ifndef GL_STENCIL_INDEX8
-#define GL_STENCIL_INDEX8 0x8D48
-#endif
-#ifndef GL_STENCIL_PASS_DEPTH_FAIL
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#endif
-#ifndef GL_STENCIL_PASS_DEPTH_PASS
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#endif
-#ifndef GL_STENCIL_REF
-#define GL_STENCIL_REF 0x0B97
-#endif
-#ifndef GL_STENCIL_TEST
-#define GL_STENCIL_TEST 0x0B90
-#endif
-#ifndef GL_STENCIL_VALUE_MASK
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#endif
-#ifndef GL_STENCIL_WRITEMASK
-#define GL_STENCIL_WRITEMASK 0x0B98
-#endif
-#ifndef GL_STREAM_DRAW
-#define GL_STREAM_DRAW 0x88E0
-#endif
-#ifndef GL_SUBPIXEL_BITS
-#define GL_SUBPIXEL_BITS 0x0D50
-#endif
-#ifndef GL_TEXTURE0
-#define GL_TEXTURE0 0x84C0
-#endif
-#ifndef GL_TEXTURE
-#define GL_TEXTURE 0x1702
-#endif
-#ifndef GL_TEXTURE10
-#define GL_TEXTURE10 0x84CA
-#endif
-#ifndef GL_TEXTURE1
-#define GL_TEXTURE1 0x84C1
-#endif
-#ifndef GL_TEXTURE11
-#define GL_TEXTURE11 0x84CB
-#endif
-#ifndef GL_TEXTURE12
-#define GL_TEXTURE12 0x84CC
-#endif
-#ifndef GL_TEXTURE13
-#define GL_TEXTURE13 0x84CD
-#endif
-#ifndef GL_TEXTURE14
-#define GL_TEXTURE14 0x84CE
-#endif
-#ifndef GL_TEXTURE15
-#define GL_TEXTURE15 0x84CF
-#endif
-#ifndef GL_TEXTURE16
-#define GL_TEXTURE16 0x84D0
-#endif
-#ifndef GL_TEXTURE17
-#define GL_TEXTURE17 0x84D1
-#endif
-#ifndef GL_TEXTURE18
-#define GL_TEXTURE18 0x84D2
-#endif
-#ifndef GL_TEXTURE19
-#define GL_TEXTURE19 0x84D3
-#endif
-#ifndef GL_TEXTURE20
-#define GL_TEXTURE20 0x84D4
-#endif
-#ifndef GL_TEXTURE2
-#define GL_TEXTURE2 0x84C2
-#endif
-#ifndef GL_TEXTURE21
-#define GL_TEXTURE21 0x84D5
-#endif
-#ifndef GL_TEXTURE22
-#define GL_TEXTURE22 0x84D6
-#endif
-#ifndef GL_TEXTURE23
-#define GL_TEXTURE23 0x84D7
-#endif
-#ifndef GL_TEXTURE24
-#define GL_TEXTURE24 0x84D8
-#endif
-#ifndef GL_TEXTURE25
-#define GL_TEXTURE25 0x84D9
-#endif
-#ifndef GL_TEXTURE26
-#define GL_TEXTURE26 0x84DA
-#endif
-#ifndef GL_TEXTURE27
-#define GL_TEXTURE27 0x84DB
-#endif
-#ifndef GL_TEXTURE28
-#define GL_TEXTURE28 0x84DC
-#endif
-#ifndef GL_TEXTURE29
-#define GL_TEXTURE29 0x84DD
-#endif
-#ifndef GL_TEXTURE_2D
-#define GL_TEXTURE_2D 0x0DE1
-#endif
-#ifndef GL_TEXTURE30
-#define GL_TEXTURE30 0x84DE
-#endif
-#ifndef GL_TEXTURE3
-#define GL_TEXTURE3 0x84C3
-#endif
-#ifndef GL_TEXTURE31
-#define GL_TEXTURE31 0x84DF
-#endif
-#ifndef GL_TEXTURE4
-#define GL_TEXTURE4 0x84C4
-#endif
-#ifndef GL_TEXTURE5
-#define GL_TEXTURE5 0x84C5
-#endif
-#ifndef GL_TEXTURE6
-#define GL_TEXTURE6 0x84C6
-#endif
-#ifndef GL_TEXTURE7
-#define GL_TEXTURE7 0x84C7
-#endif
-#ifndef GL_TEXTURE8
-#define GL_TEXTURE8 0x84C8
-#endif
-#ifndef GL_TEXTURE9
-#define GL_TEXTURE9 0x84C9
-#endif
-#ifndef GL_TEXTURE_BINDING_2D
-#define GL_TEXTURE_BINDING_2D 0x8069
-#endif
-#ifndef GL_TEXTURE_BINDING_CUBE_MAP
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_X
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_X
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_Y
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_Z
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#endif
-#ifndef GL_TEXTURE_MAG_FILTER
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#endif
-#ifndef GL_TEXTURE_MIN_FILTER
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#endif
-#ifndef GL_TEXTURE_WRAP_S
-#define GL_TEXTURE_WRAP_S 0x2802
-#endif
-#ifndef GL_TEXTURE_WRAP_T
-#define GL_TEXTURE_WRAP_T 0x2803
-#endif
-#ifndef GL_TRIANGLE_FAN
-#define GL_TRIANGLE_FAN 0x0006
-#endif
-#ifndef GL_TRIANGLES
-#define GL_TRIANGLES 0x0004
-#endif
-#ifndef GL_TRIANGLE_STRIP
-#define GL_TRIANGLE_STRIP 0x0005
-#endif
-#ifndef GL_TRUE
-#define GL_TRUE 1
-#endif
-#ifndef GL_UNPACK_ALIGNMENT
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#endif
-#ifndef GL_UNSIGNED_BYTE
-#define GL_UNSIGNED_BYTE 0x1401
-#endif
-#ifndef GL_UNSIGNED_INT
-#define GL_UNSIGNED_INT 0x1405
-#endif
-#ifndef GL_UNSIGNED_SHORT
-#define GL_UNSIGNED_SHORT 0x1403
-#endif
-#ifndef GL_UNSIGNED_SHORT_4_4_4_4
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#endif
-#ifndef GL_UNSIGNED_SHORT_5_5_5_1
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#endif
-#ifndef GL_UNSIGNED_SHORT_5_6_5
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#endif
-#ifndef GL_VALIDATE_STATUS
-#define GL_VALIDATE_STATUS 0x8B83
-#endif
-#ifndef GL_VENDOR
-#define GL_VENDOR 0x1F00
-#endif
-#ifndef GL_VERSION
-#define GL_VERSION 0x1F02
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_ENABLED
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_NORMALIZED
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_POINTER
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_SIZE
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_STRIDE
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_TYPE
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#endif
-#ifndef GL_VERTEX_SHADER
-#define GL_VERTEX_SHADER 0x8B31
-#endif
-#ifndef GL_VIEWPORT
-#define GL_VIEWPORT 0x0BA2
-#endif
-#ifndef GL_ZERO
-#define GL_ZERO 0
-#endif
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/CMakeLists.txt b/src/gui/extern/Qt3D/arrays/CMakeLists.txt
deleted file mode 100644
index c033759d8b50f4a764e47f5991eab486312a32c3..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-target_sources( gui
- PRIVATE
- qglvertexbundle.h
- qglattributedescription.cpp
- qcustomdataarray.h
- qcolor4ub.cpp
- qglattributeset.cpp
- qglattributevalue.h
- qglattributevalue.cpp
- qarray.cpp
- qvector4darray.h
- qglattributeset.h
- qvector3darray.h
- qarray.h
- qglindexbuffer.cpp
- qglattributedescription.h
- qglvertexbundle_p.h
- qglvertexbundle.cpp
- qglindexbuffer.h
- qvector4darray.cpp
- qcolor4ub.h
- qvector2darray.h
- qcustomdataarray.cpp
- qvector2darray.cpp
- qvector3darray.cpp
- )
diff --git a/src/gui/extern/Qt3D/arrays/qarray.cpp b/src/gui/extern/Qt3D/arrays/qarray.cpp
deleted file mode 100644
index 3dd8f25c96fda32ad9da8ec2d47efe8ac70e7b7a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qarray.cpp
+++ /dev/null
@@ -1,1022 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qarray.h"
-#include <limits.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QArray
- \brief The QArray class is a template class that provides a dynamic array of simple types.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QArray is similar to QVector except that it has much less overhead
- when constructing large arrays by appending individual elements
- one by one.
-
- QArray instances have a preallocated data area for quickly
- building small arrays on the stack without malloc overhead.
- Once the array grows beyond the preallocated size, it is copied
- to the heap. The size of the preallocated area, which defaults to 8,
- can be specified with the second template parameter:
-
- \code
- QArray<QVector3D, 32> array;
- \endcode
-
- QArray uses implicit sharing and copy-on-write semantics to support
- passing large arrays around an application with little overhead.
-
- QArray is heavily optimized for copy-on-write and the case of
- constructing an array by calling append(). It has a slight
- performance penalty for random access using the non-const
- version of operator[]().
-*/
-
-/*!
- \fn QArray::QArray()
-
- Constructs an empty array.
-
- \sa reserve()
-*/
-
-/*!
- \fn QArray::QArray(int size, const T &value)
-
- Constructs an array of \a size elements, all initialized
- to \a value.
-
- \sa fill()
-*/
-
-/*!
- \fn QArray::QArray(int size)
-
- Constructs an array of \a size elements, all initialized
- to their default-constructed values.
-*/
-
-/*!
- \fn QArray::QArray(const T *values, int size)
-
- Constructs an array of \a size elements, initialized
- from \a values.
-*/
-
-/*!
- \fn QArray::QArray(const QArray<T, PreallocSize> &other)
-
- Constructs a copy of \a other.
-
- \sa operator=()
-*/
-
-/*!
- \fn QArray::~QArray()
-
- Destroys the array.
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::operator=(const QArray<T, PreallocSize> &other)
-
- Assigns \a other to this array and returns a reference
- to this array.
-*/
-
-/*!
- \fn int QArray::size() const
-
- Returns the number of elements in this array.
-
- \sa resize(), capacity(), isEmpty()
-*/
-
-/*!
- \fn int QArray::count() const
- \overload
-
- Same as size(), provided for convenience.
-*/
-
-/*!
- \fn int QArray::capacity() const
-
- Returns the number of elements that can be stored in this
- array before reallocation.
-
- \sa reserve(), size()
-*/
-
-/*!
- \fn bool QArray::isEmpty() const
-
- Returns true if this array is empty; false otherwise.
-
- \sa size(), clear()
-*/
-
-/*!
- \fn bool QArray::isDetached() const
- \internal
-
- Returns true if this array has definitely been detached from all
- other shared copies of the data; false otherwise.
-
- It is possible for this function to return false if the
- array was previously shared but no longer is. It is thus
- an indication that a detach() will probably be required.
-
- This function can be used to determine if functions that
- write to this array such as append(), replace(),
- and data(), will need to make a copy.
-
- Raw data arrays that are created with fromRawData() are
- never detached.
-
- \sa detach()
-*/
-
-/*!
- \fn void QArray::detach()
- \internal
-
- Detaches this array from all other shared copies of the data.
-
- \sa isDetached()
-*/
-
-/*!
- \fn void QArray::clear()
-
- Clears all elements from this array and sets the size to zero.
-
- This function will deallocate any memory that is used on the heap
- to store the array's elements. To reuse the same memory
- as before, call resize() with an argument of zero.
-
- \sa resize(), isEmpty()
-*/
-
-/*!
- \fn const T &QArray::at(int index) const
-
- Returns the item at position \a index in the array.
-
- \a index must be a valid index position in the array (i.e., 0 <= \a
- index < size()).
-
- \sa operator[](), constData(), value()
-*/
-
-/*!
- \fn T &QArray::operator[](int index)
-
- Returns the item at position \a index as a modifiable reference.
-
- \a index must be a valid index position in the vector (i.e., 0 <= \a index
- < size()).
-
- Note that using non-const operators can cause QArray
- to do a deep copy.
-
- \sa at(), value()
-*/
-
-/*!
- \fn const T &QArray::operator[](int index) const
-
- \overload
-
- Same as at(\a index).
-*/
-
-/*!
- \fn T QArray::value(int index) const
-
- Returns the value at position \a index in the vector.
-
- If the \a index is out of bounds, the function returns
- a default-constructed value. If you are certain that
- \a index is within bounds, you can use at() instead,
- which is slightly faster.
-
- \sa at(), operator[]()
-*/
-
-/*!
- \fn T QArray::value(int index, const T &defaultValue) const
- \overload
-
- If the \a index is out of bounds, the function returns
- \a defaultValue.
-*/
-
-/*!
- \fn T *QArray::extend(int size)
-
- Extends this array by \a size elements and returns a pointer
- to the storage, which is not initialized. The pointer is only
- valid until the array is reallocated or destroyed.
-
- The append() or resize() functions are recommended if T is a
- complex type, with extend() only used for simple types.
- Because the storage is not initialized, the caller should use
- the in-place new operator to set elements:
-
- \code
- QArray<QRegExp> array;
- QRegExp *space = array.extend(1);
- new (space) QRegExp(QLatin1String("exp"));
- \endcode
-
- \sa append(), resize()
-*/
-
-/*!
- \fn void QArray::append(const T &value)
-
- Appends \a value to this array.
-
- \sa prepend(), insert()
-*/
-
-/*!
- \fn void QArray::append(const T &value1, const T &value2)
-
- \overload
-
- Appends \a value1 and \a value2 to this array.
-*/
-
-/*!
- \fn void QArray::append(const T &value1, const T &value2, const T &value3)
-
- \overload
-
- Appends \a value1, \a value2, and \a value3 to this array.
-*/
-
-/*!
- \fn void QArray::append(const T &value1, const T &value2, const T &value3, const T &value4)
-
- \overload
-
- Appends \a value1, \a value2, \a value3, and \a value4 to this array.
-*/
-
-/*!
- \fn void QArray::append(const T *values, int count)
-
- Appends the \a count elements of \a values to this array.
-*/
-
-/*!
- \fn void QArray::append(const QArray<T, PreallocSize> &other)
-
- Appends the elements of \a other to this array.
-*/
-
-/*!
- \fn void QArray::prepend(const T &value)
-
- Prepends \a value to this array.
-
- \sa append(), insert()
-*/
-
-/*!
- \fn void QArray::insert(int index, const T &value)
-
- Inserts \a value at position \a index in this array.
- If \a index is 0, then \a value is prepended to the array.
- If \a index is size(), then \a value is appended to the array.
-
- \sa append(), prepend()
-*/
-
-/*!
- \fn void QArray::insert(int index, int count, const T &value)
- \overload
-
- Inserts \a count copies of \a value at position \a index
- in this array.
-*/
-
-/*!
- \fn QArray::iterator QArray::insert(iterator before, int count, const T &value)
-
- Inserts \a count copies of \a value in front of the item
- pointed to by the iterator \a before. Returns an iterator
- pointing at the first of the inserted items.
-*/
-
-/*!
- \fn QArray::iterator QArray::insert(iterator before, const T &value)
- \overload
-
- Inserts \a value in front of the item pointed to by the
- iterator \a before. Returns an iterator pointing at the
- inserted item.
-*/
-
-/*!
- \fn void QArray::replace(int index, const T &value)
-
- Replaces the element at \a index with \a value.
-
- \sa operator[](), remove()
-*/
-
-/*!
- \fn void QArray::replace(int index, const T *values, int count)
- \overload
-
- Replaces the \a count elements of this array with the
- contents of \a values, starting at \a index.
-
- If (\a index + \a count) is larger than the current size of this
- array, the array will be extended to that size.
-
- \sa append()
-*/
-
-/*!
- \fn void QArray::remove(int index)
-
- \overload
-
- Removes the element at position \a index in this array.
-*/
-
-/*!
- \fn void QArray::remove(int index, int count)
-
- Removes the \a count elements starting at position \a index
- in this array. If \a index or \a count is out of range,
- the set of removed elements will be truncated to those that
- are in range.
-*/
-
-/*!
- \fn QArray::iterator QArray::erase(iterator begin, iterator end)
- \overload
-
- Removes all the items from \a begin up to (but not including) \a
- end. Returns an iterator to the same item that \a end referred to
- before the call.
-*/
-
-/*!
- \fn QArray::iterator QArray::erase(iterator pos)
-
- Removes the item pointed to by the iterator \a pos from the
- vector, and returns an iterator to the next item in the vector
- (which may be end()).
-
- \sa insert(), remove()
-*/
-
-/*!
- \fn void QArray::removeFirst()
-
- Removes the first element from this array. Does nothing if
- the array is empty.
-
- \sa remove(), removeLast()
-*/
-
-/*!
- \fn void QArray::removeLast()
-
- Removes the last element from this array. Does nothing if
- the array is empty.
-
- \sa remove(), removeFirst()
-*/
-
-/*!
- \fn int QArray::indexOf(const T &value, int from) const
-
- Returns the index position of the first occurrence of
- \a value in the array, searching forward from index
- position \a from. Returns -1 if no item matched.
-
- If \a from is negative, then it indicates an index position
- relative to the end of the array, -1 being the last index
- position.
-
- This function requires the value type T to have an implementation
- of \c operator==().
-
- \sa lastIndexOf(), contains()
-*/
-
-/*!
- \fn int QArray::lastIndexOf(const T &value, int from) const
-
- Returns the index position of the last occurrence of
- \a value in the array, searching backward from index
- position \a from. Returns -1 if no item matched.
-
- If \a from is negative, then it indicates an index position
- relative to the end of the array, -1 being the last index
- position. The default for \a from is -1.
-
- This function requires the value type T to have an implementation
- of \c operator==().
-
- \sa indexOf(), contains()
-*/
-
-/*!
- \fn bool QArray::contains(const T &value) const
-
- Returns true if the array contains an occurrence of \a value;
- false otherwise.
-
- This function requires the value type T to have an implementation
- of \c operator==().
-
- \sa indexOf(), count()
-*/
-
-/*!
- \fn int QArray::count(const T &value) const
-
- Returns the number of occurrences of \a value in the array.
-
- This function requires the value type T to have an implementation
- of \c operator==().
-
- \sa contains(), indexOf()
-*/
-
-/*!
- \fn void QArray::resize(int size)
-
- Sets the size of the array to \a size. If \a size is greater
- than the current size, elements are added to the end and are
- initialized to a default-constructed value. If \a size is less
- than the current size, elements are removed from the end.
-
- \sa size(), reserve(), squeeze()
-*/
-
-/*!
- \fn void QArray::reserve(int size)
-
- Increases the capacity of this array to reserve space for
- at least \a size elements. If the capacity is already larger
- than \a size, this function does nothing; in particular, it does
- not remove elements from the array like resize() does.
-
- This function can be useful when you know how roughly many elements
- will be appended ahead of time. Reserving the space once can avoid
- unnecessary realloc operations later.
-
- \sa capacity(), resize(), squeeze()
-*/
-
-/*!
- \fn void QArray::squeeze()
-
- Releases any memory not required to store the array's elements
- by reducing its capacity() to size().
-
- This function is intended for reclaiming memory in an
- array that is being used over and over with different contents.
- As elements are added to an array, it will be constantly
- expanded in size. This function can realloc the array
- to a smaller size to reclaim unused memory.
-
- \sa reserve(), capacity()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::fill(const T &value, int size)
-
- Assigns \a value to all items in the array. If \a size is
- different from -1 (the default), the array is resized to
- \a size beforehand. Returns a reference to the array.
-
- \sa resize()
-*/
-
-/*!
- \fn void QArray::reverse()
-
- Reverses the order of this array in place.
-
- \sa reversed()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::reversed() const
-
- Returns a copy of this array with elements in the reverse order.
-
- \sa reverse()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::mid(int index, int length) const
-
- Returns an array containing the \a length elements of
- this array, starting at \a index. If \a length is less
- than zero, or extends further than the end of the array, then all
- elements extending from \a index to the end of the array will be
- included in the return value.
-
- \sa left(), right()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::left(int length) const;
-
- Returns an array containing the first \a length
- elements of this array. If \a length is less than zero,
- or greater than size(), then all elements in this array will
- be included in the return value.
-
- \sa mid(), right()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::right(int length) const;
-
- Returns an array containing the last \a length
- elements of this array. If \a length is less than zero,
- or greater than size(), then all elements in this array
- will be included in the return value.
-
- \sa mid(), left()
-*/
-
-/*!
- \fn T *QArray::data()
-
- Returns a pointer to the data stored in the array. The pointer
- can be used to access and modify the items in the array.
-
- The pointer remains valid as long as the array isn't
- reallocated.
-
- This function is mostly useful to pass an array to a function
- that accepts a plain C++ array. It may make a deep copy of the
- array's elements if the array is implicitly shared.
-
- \sa constData(), operator[]()
-*/
-
-/*!
- \fn const T *QArray::data() const
-
- \overload
-*/
-
-/*!
- \fn const T *QArray::constData() const
-
- Returns a const pointer to the data stored in the array.
- The pointer can be used to access the items in the array.
- The pointer remains valid as long as the array isn't
- reallocated.
-
- This function is mostly useful to pass an array to a function
- that accepts a plain C++ array.
-
- \sa data(), operator[]()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::fromRawData(const T *data, int size)
-
- Returns an array consisting of the \a size elements from \a data.
-
- This function takes a reference to \a data, but does not copy
- the elements until the array is modified. The memory at \a data
- must remain valid until the returned array is destroyed
- or modified.
-
- Use append() instead of fromRawData() to force a copy to be made
- of the elements at \a data when the array is created:
-
- \code
- // Makes a copy of the data immediately.
- QArray<float> array;
- array.append(data, size);
-
- // Does not make a copy of the data until the array is modified.
- QArray<float> array;
- array = QArray<float>::fromRawData(data, size);
- \endcode
-
- \sa fromWritableRawData(), append()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> QArray::fromWritableRawData(T *data, int size)
-
- Returns an array consisting of the \a size elements from \a data.
-
- This function takes a reference to \a data, but does not copy
- the elements until the array is reallocated to a larger size.
- The memory at \a data must remain valid until the returned
- array is destroyed or reallocated.
-
- The elements of \a data will be modified in-place. This differs
- from fromRawData() which will make a copy of the elements
- of \a data when the array is modified.
-
- If the returned array is resized to less than \a size,
- then a copy will not be made, and append() can be used to
- append new items up to \a size. Further calls to append()
- after \a size will force the array to be reallocated.
-
- If the returned array is resized to more than \a size,
- then a copy of the data will be made and further modifications
- will not affect the elements at \a data.
-
- \sa fromRawData()
-*/
-
-/*!
- \fn bool QArray::operator==(const QArray<T, PreallocSize> &other) const
-
- Returns true if \a other is equal to this array; otherwise
- returns false.
-
- Two arrays are considered equal if they contain the same values
- in the same order.
-
- This function requires the value type to have an implementation
- of \c operator==().
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QArray::operator!=(const QArray<T, PreallocSize> &other) const
-
- Returns true if \a other is not equal to this array; otherwise
- returns false.
-
- Two arrays are considered equal if they contain the same values
- in the same order.
-
- This function requires the value type to have an implementation
- of \c operator==().
-
- \sa operator==()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::operator+=(const T &value)
-
- \overload
-
- Appends \a value to this array and returns a reference to
- this array.
-
- \sa operator<<(), append()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::operator+=(const QArray<T, PreallocSize> &other)
-
- Appends the elements of the \a other array to this array
- and returns a reference to this array.
-
- \sa operator<<(), append()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::operator<<(const T &value)
-
- \overload
-
- Appends \a value to this array and returns a reference to
- this array.
-
- \sa operator+=(), append()
-*/
-
-/*!
- \fn QArray<T, PreallocSize> &QArray::operator<<(const QArray<T, PreallocSize> &other)
-
- Appends the elements of the \a other array to this array
- and returns a reference to this array.
-
- \sa operator+=(), append()
-*/
-
-/*!
- \typedef QArray::iterator
-
- The QArray::iterator typedef provides an STL-style non-const
- iterator for QArray. The iterator is simply a typedef
- for "T *" (pointer to T).
-
- \sa QArray::begin(), QArray::const_iterator
-*/
-
-/*!
- \typedef QArray::const_iterator
-
- The QArray::iterator typedef provides an STL-style const
- iterator for QArray. The iterator is simply a typedef
- for "const T *" (pointer to const T).
-
- \sa QArray::constBegin(), QArray::iterator
-*/
-
-/*!
- \typedef QArray::Iterator
-
- Qt-style synonym for QArray::iterator.
-*/
-
-/*!
- \typedef QArray::ConstIterator
-
- Qt-style synonym for QArray::const_iterator.
-*/
-
-/*!
- \typedef QArray::const_pointer
-
- Typedef for const T *. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::const_reference
-
- Typedef for T &. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::difference_type
-
- Typedef for ptrdiff_t. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::pointer
-
- Typedef for T *. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::reference
-
- Typedef for T &. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::size_type
-
- Typedef for int. Provided for STL compatibility.
-*/
-
-/*!
- \typedef QArray::value_type
-
- Typedef for T. Provided for STL compatibility.
-*/
-
-/*!
- \fn QArray::iterator QArray::begin()
-
- Returns an STL-style iterator pointing to the first item
- in the array.
-
- \sa end(), constBegin(), QArray::iterator
-*/
-
-/*!
- \fn QArray::const_iterator QArray::begin() const
- \overload
-*/
-
-/*!
- \fn QArray::const_iterator QArray::constBegin() const
-
- Returns a const STL-style iterator pointing to the first item
- in the array.
-
- \sa constEnd(), begin(), QArray::const_iterator
-*/
-
-/*!
- \fn QArray::iterator QArray::end()
-
- Returns an STL-style iterator pointing to the imaginary item
- after the last item in the array.
-
- \sa begin(), constEnd(), QArray::iterator
-*/
-
-/*!
- \fn QArray::const_iterator QArray::end() const
- \overload
-*/
-
-/*!
- \fn QArray::const_iterator QArray::constEnd() const
-
- Returns a const STL-style iterator pointing to the imaginary item
- after the last item in the array.
-
- \sa constBegin(), end(), QArray::const_iterator
-*/
-
-/*!
- \fn T &QArray::first()
-
- Returns a reference to the first item in the array. This
- function assumes that the array isn't empty.
-
- \sa last(), isEmpty()
-*/
-
-/*!
- \fn const T &QArray::first() const
- \overload
-*/
-
-/*!
- \fn T &QArray::last()
-
- Returns a reference to the last item in the array. This function
- assumes that the array isn't empty.
-
- \sa first(), isEmpty()
-*/
-
-/*!
- \fn const T &QArray::last() const
- \overload
-*/
-
-/*!
- \fn bool QArray::startsWith(const T &value) const
-
- Returns true if this array is not empty and its first
- item is equal to \a value; otherwise returns false.
-
- \sa isEmpty(), first()
-*/
-
-/*!
- \fn bool QArray::endsWith(const T &value) const
-
- Returns true if this array is not empty and its last
- item is equal to \a value; otherwise returns false.
-
- \sa isEmpty(), last()
-*/
-
-/*!
- \fn void QArray::push_back(const T &value)
-
- This function is provided for STL compatibility. It is equivalent
- to append(\a value).
-*/
-
-/*!
- \fn void QArray::push_front(const T &value)
-
- This function is provided for STL compatibility. It is equivalent
- to prepend(\a value).
-*/
-
-/*!
- \fn void QArray::pop_front()
-
- This function is provided for STL compatibility. It is equivalent
- to removeFirst().
-*/
-
-/*!
- \fn void QArray::pop_back()
-
- This function is provided for STL compatibility. It is equivalent
- to removeLast().
-*/
-
-/*!
- \fn QArray::reference QArray::front()
-
- This function is provided for STL compatibility. It is equivalent
- to first().
-*/
-
-/*!
- \fn QArray::const_reference QArray::front() const
- \overload
-*/
-
-/*!
- \fn QArray::reference QArray::back()
-
- This function is provided for STL compatibility. It is equivalent
- to last().
-*/
-
-/*!
- \fn QArray::const_reference QArray::back() const
- \overload
-*/
-
-/*!
- \fn bool QArray::empty() const
-
- This function is provided for STL compatibility. It is equivalent
- to isEmpty(), returning true if the array is empty; otherwise
- returns false.
-*/
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream& operator<<(QDataStream& stream, const QArray<T, PreallocSize>& array)
- \relates QArray
-
- Writes \a array to the given \a stream and returns a reference
- to the \a stream.
-*/
-
-/*!
- \fn QDataStream& operator>>(QDataStream& stream, QArray<T, PreallocSize>& array)
- \relates QArray
-
- Reads \a array from the given \a stream and returns a reference
- to the \a stream.
-*/
-
-#endif
-
-int qArrayAllocMore(int alloc, int extra, int sizeOfT)
-{
- if (alloc == 0 && extra == 0)
- return 0;
- const int page = 1 << 12;
- int nalloc;
- alloc += extra;
- alloc *= sizeOfT;
- // don't do anything if the loop will overflow signed int.
- if (alloc >= INT_MAX/2)
- return INT_MAX / sizeOfT;
- nalloc = (alloc < page) ? 64 : page;
- while (nalloc < alloc) {
- if (nalloc <= 0)
- return INT_MAX / sizeOfT;
- nalloc *= 2;
- }
- return nalloc / sizeOfT;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qarray.h b/src/gui/extern/Qt3D/arrays/qarray.h
deleted file mode 100644
index 8285af0c00ffda2368ac2be671e37d188fc54199..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qarray.h
+++ /dev/null
@@ -1,1209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QARRAY_H
-#define QARRAY_H
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qatomic.h>
-#include <QtCore/qdatastream.h>
-#include <QtCore/qdebug.h>
-#include <string.h>
-#include <new>
-
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-#if defined(Q_DECL_ALIGN) && defined(Q_ALIGNOF)
-
-#if defined(Q_CC_GNU) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
- typedef char __attribute__((__may_alias__)) QArrayAlignedChar;
-#else
- typedef char QArrayAlignedChar;
-#endif
-
-template <typename T, int PreallocSize, size_t AlignT>
-struct QArrayAlignedPrealloc;
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 1>
-{
- QArrayAlignedChar Q_DECL_ALIGN(1) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 2>
-{
- QArrayAlignedChar Q_DECL_ALIGN(2) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 4>
-{
- QArrayAlignedChar Q_DECL_ALIGN(4) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 8>
-{
- QArrayAlignedChar Q_DECL_ALIGN(8) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 16>
-{
- QArrayAlignedChar Q_DECL_ALIGN(16) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 32>
-{
- QArrayAlignedChar Q_DECL_ALIGN(32) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 64>
-{
- QArrayAlignedChar Q_DECL_ALIGN(64) data[sizeof(T) * PreallocSize];
-};
-template <typename T, int PreallocSize>
-struct QArrayAlignedPrealloc<T, PreallocSize, 128>
-{
- QArrayAlignedChar Q_DECL_ALIGN(128) data[sizeof(T) * PreallocSize];
-};
-
-#else
-
-template <typename T, int PreallocSize, size_t AlignT>
-union QArrayAlignedPrealloc
-{
- char data[sizeof(T) * PreallocSize];
- qint64 q_for_alignment_1;
- double q_for_alignment_2;
-};
-
-#endif
-
-template <typename T, int PreallocSize>
-class QArrayData
-{
-public:
-#if defined(Q_ALIGNOF)
- QArrayAlignedPrealloc<T, PreallocSize, Q_ALIGNOF(T)> m_prealloc;
-#else
- QArrayAlignedPrealloc<T, PreallocSize, sizeof(T)> m_prealloc;
-#endif
-
- inline T *prealloc()
- {
- return reinterpret_cast<T *>(m_prealloc.data);
- }
-
- inline bool isPrealloc(const T *start) const
- {
- return start == reinterpret_cast<const T *>(m_prealloc.data);
- }
-};
-
-template <typename T>
-class QArrayData<T, 0>
-{
-public:
-
- inline T *prealloc() { return 0; }
-
- inline bool isPrealloc(const T *start) const
- {
- Q_UNUSED(start);
- return false;
- }
-};
-
-template <typename T, int PreallocSize = 8>
-class QArray : private QArrayData<T, PreallocSize>
-{
-public:
- QArray();
- explicit QArray(int size);
- QArray(int size, const T &value);
- QArray(const T *values, int size);
- QArray(const QArray<T, PreallocSize> &other);
- ~QArray();
-
- typedef T *iterator;
- typedef const T *const_iterator;
-
- QArray<T, PreallocSize> &operator=
- (const QArray<T, PreallocSize> &other);
-
- int size() const;
- int count() const;
- int capacity() const;
-
- bool isEmpty() const;
-
- bool isDetached() const;
- void detach();
-
- void clear();
-
- const T &at(int index) const;
- const T &operator[](int index) const;
- T &operator[](int index);
-
- T value(int index) const;
- T value(int index, const T &defaultValue) const;
-
- T *extend(int size);
-
- void append(const T &value);
- void append(const T &value1, const T &value2);
- void append(const T &value1, const T &value2, const T &value3);
- void append(const T &value1, const T &value2, const T &value3, const T &value4);
- void append(const T *values, int count);
- void append(const QArray<T, PreallocSize> &other);
-
- void prepend(const T &value);
-
- void insert(int index, const T &value);
- void insert(int index, int count, const T &value);
- iterator insert(iterator before, int count, const T &value);
- iterator insert(iterator before, const T &value);
-
- void replace(int index, const T &value);
- void replace(int index, const T *values, int count);
-
- void remove(int index);
- void remove(int index, int count);
- void removeFirst() { remove(0); }
- void removeLast() { remove(size() - 1); }
-
- iterator erase(iterator begin, iterator end);
- iterator erase(iterator pos);
-
- int indexOf(const T &value, int from = 0) const;
- int lastIndexOf(const T &value, int from = -1) const;
- bool contains(const T &value) const;
- int count(const T &value) const;
-
- void resize(int size);
- void reserve(int size);
- void squeeze();
-
- QArray<T, PreallocSize> &fill(const T &value, int size = -1);
-
- void reverse();
- QArray<T, PreallocSize> reversed() const;
-
- QArray<T, PreallocSize> mid(int index, int length = -1) const;
- QArray<T, PreallocSize> left(int length) const;
- QArray<T, PreallocSize> right(int length) const;
-
- T *data();
- const T *data() const;
- const T *constData() const;
-
- static QArray<T, PreallocSize> fromRawData(const T *data, int size);
- static QArray<T, PreallocSize> fromWritableRawData(T *data, int size);
-
- bool operator==(const QArray<T, PreallocSize> &other) const;
- bool operator!=(const QArray<T, PreallocSize> &other) const;
-
- QArray<T, PreallocSize> &operator+=(const T &value);
- QArray<T, PreallocSize> &operator+=(const QArray<T, PreallocSize> &other);
- QArray<T, PreallocSize> &operator<<(const T &value);
- QArray<T, PreallocSize> &operator<<(const QArray<T, PreallocSize> &other);
-
- typedef iterator Iterator;
- typedef const_iterator ConstIterator;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef value_type &reference;
- typedef const value_type &const_reference;
- typedef ptrdiff_t difference_type;
- typedef int size_type;
-
- inline iterator begin() { return data(); }
- inline const_iterator begin() const { return constData(); }
- inline const_iterator constBegin() const { return constData(); }
- inline iterator end() { return data() + size(); }
- inline const_iterator end() const { return constData() + size(); }
- inline const_iterator constEnd() const { return constData() + size(); }
-
- inline T &first() { Q_ASSERT(!isEmpty()); return *begin(); }
- inline const T &first() const { Q_ASSERT(!isEmpty()); return *begin(); }
- inline T &last() { Q_ASSERT(!isEmpty()); return *(end()-1); }
- inline const T &last() const { Q_ASSERT(!isEmpty()); return *(end()-1); }
- inline bool startsWith(const T &t) const { return !isEmpty() && first() == t; }
- inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
-
- inline void push_back(const T &value) { append(value); }
- inline void push_front(const T &value) { prepend(value); }
- inline void pop_back() { Q_ASSERT(!isEmpty()); removeLast(); }
- inline void pop_front() { Q_ASSERT(!isEmpty()); removeFirst(); }
- inline bool empty() const { return isEmpty(); }
- inline reference front() { return first(); }
- inline const_reference front() const { return first(); }
- inline reference back() { return last(); }
- inline const_reference back() const { return last(); }
-
-private:
- struct Data
- {
- QBasicAtomicInt ref;
- int capacity;
- T array[1];
- };
-
- // Invariants:
- // 1. If the data is not shared, then the usual condition is
- // for m_limit >= m_end.
- // 2. If the data is shared, then m_limit == m_start.
- // This triggers the range check in append() to call grow(),
- // which will copy-on-write. It also triggers the detach
- // check in data() and operator[] to cause a copy-on-write.
- // 3. If the data is not shared, but previously was, then
- // m_limit == m_start. This will trigger grow() or
- // detach(), which may then notice that it doesn't have to
- // copy-on-write. In that case, m_limit is set back
- // to m_start + m_data->capacity.
- // 4. If m_data is null, then m_start is either the same as
- // m_prealloc, or it points at raw data (const or non-const).
- // 5. If the array contains const raw data, then m_limit will
- // be set to m_start to force copy-on-write.
- T *m_start;
- T *m_end;
- mutable T *m_limit;
- Data *m_data;
-
- inline void initPrealloc()
- {
- m_end = m_start = QArrayData<T, PreallocSize>::prealloc();
- m_limit = m_start + PreallocSize;
- }
-
- QArray(const T *data, int size, bool isWritable);
-
- void free(T *data, int count);
- void release();
- void copyReplace(T *dst, const T *src, int count);
- Data *copyData(const T *src, int size, int capacity);
- void reallocate(int capacity);
- void detach_helper();
- void assign(const QArray<T, PreallocSize> &other);
- void grow(int needed);
- void setSize(int size);
-};
-
-int Q_QT3D_EXPORT qArrayAllocMore(int alloc, int extra, int sizeOfT);
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::free(T *data, int count)
-{
- while (count-- > 0) {
- data->~T();
- ++data;
- }
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::release()
-{
- if (m_data) {
- if (!m_data->ref.deref()) {
- if (QTypeInfo<T>::isComplex)
- free(m_start, m_end - m_start);
- qFree(m_data);
- }
- } else if (this->isPrealloc(m_start)) {
- if (QTypeInfo<T>::isComplex)
- free(m_start, m_end - m_start);
- }
-}
-
-// Copy values to initialized memory, replacing previous values.
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::copyReplace(T *dst, const T *src, int count)
-{
- if (!QTypeInfo<T>::isStatic) {
- ::memmove(dst, src, count * sizeof(T));
- } else {
- while (count-- > 0)
- *dst++ = *src++;
- }
-}
-
-// Make a copy of m_data, while remaining exception-safe.
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE Q_TYPENAME QArray<T, PreallocSize>::Data *QArray<T, PreallocSize>::copyData(const T *src, int size, int capacity)
-{
- Data *data = reinterpret_cast<Data *>
- (qMalloc(sizeof(Data) + sizeof(T) * (capacity - 1)));
- Q_CHECK_PTR(data);
- data->ref = 1;
- data->capacity = capacity;
- T *dst = data->array;
- int copied = 0;
- QT_TRY {
- while (copied < size) {
- new (dst) T(*src++);
- ++dst;
- ++copied;
- }
- } QT_CATCH(...) {
- while (copied-- > 0)
- (--dst)->~T();
- qFree(data);
- QT_RETHROW;
- }
- return data;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::reallocate(int capacity)
-{
- int size = m_end - m_start;
- if (!QTypeInfo<T>::isStatic) {
- Data *data = reinterpret_cast<Data *>
- (qRealloc(m_data, sizeof(Data) + sizeof(T) * (capacity - 1)));
- Q_CHECK_PTR(data);
- data->capacity = capacity;
- m_data = data;
- } else {
- Data *data = copyData(m_data->array, size, capacity);
- free(m_data->array, size);
- qFree(m_data);
- m_data = data;
- }
- m_start = m_data->array;
- m_end = m_start + size;
- m_limit = m_start + capacity;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::detach_helper()
-{
- // If the reference count is 1, then the array may have been
- // copied and then the copy released. So just reset the limit.
- if (m_data && m_data->ref == 1) {
- m_limit = m_start + m_data->capacity;
- return;
- }
-
- // Allocate a new block on the heap and copy the data across.
- int size = m_end - m_start;
- int capacity = qArrayAllocMore(size, 0, sizeof(T));
- m_data = copyData(m_start, size, capacity);
-
- // Update the start/end/append pointers for faster updates.
- m_start = m_data->array;
- m_end = m_start + size;
- m_limit = m_start + capacity;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::assign(const QArray<T, PreallocSize> &other)
-{
- if (other.m_data) {
- m_start = other.m_start;
- m_end = other.m_end;
- m_data = other.m_data;
- m_data->ref.ref();
-
- // We set the append limit of both objects to m_start, which forces
- // the next append() or data() in either object to copy-on-write.
- other.m_limit = m_limit = m_start;
- } else if (other.isPrealloc(other.m_start)) {
- // Make a deep copy of preallocated data.
- initPrealloc();
- m_data = 0;
- append(other.constData(), other.size());
- } else {
- // Shallow copy of raw data.
- m_start = other.m_start;
- m_end = other.m_end;
- m_limit = other.m_limit;
- m_data = 0;
- }
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::grow(int needed)
-{
- int size = m_end - m_start;
- int capacity = qArrayAllocMore(size, needed, sizeof(T));
- if (!m_data || m_data->ref != 1) {
- // Copy preallocated, raw, or shared data and expand the capacity.
- Data *data = copyData(m_start, size, capacity);
- if (this->isPrealloc(m_start))
- free(m_start, size);
- if (m_data)
- m_data->ref.deref();
- m_data = data;
- m_start = data->array;
- m_end = m_start + size;
- m_limit = m_start + capacity;
- } else if ((size + needed) > m_data->capacity) {
- // Reallocate to create more capacity.
- reallocate(capacity);
- } else {
- // We have enough capacity - just fix the append limit.
- // This can happen when an array is copied and then the
- // copy is removed.
- m_limit = m_start + m_data->capacity;
- }
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::setSize(int size)
-{
- if (size <= PreallocSize) {
- initPrealloc();
- m_data = 0;
- } else {
- int capacity = qArrayAllocMore(size, 0, sizeof(T));
- Data *data = reinterpret_cast<Data *>
- (qMalloc(sizeof(Data) + sizeof(T) * (capacity - 1)));
- Q_CHECK_PTR(data);
- m_data = data;
- m_data->ref = 1;
- m_data->capacity = capacity;
- m_start = m_data->array;
- m_end = m_start;
- m_limit = m_start + capacity;
- }
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray()
-{
- initPrealloc();
- m_data = 0;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray(int size)
-{
- setSize(size);
- while (size-- > 0)
- new (m_end++) T();
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray(int size, const T &value)
-{
- setSize(size);
- while (size-- > 0)
- new (m_end++) T(value);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray(const T *values, int size)
-{
- setSize(size);
- while (size-- > 0)
- new (m_end++) T(*values++);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray(const QArray<T, PreallocSize> &other)
-{
- assign(other);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::QArray(const T *data, int size, bool isWritable)
-{
- // Constructing a raw data array.
- m_start = const_cast<T *>(data);
- m_end = m_start + size;
- if (isWritable)
- m_limit = m_end;
- else
- m_limit = m_start;
- m_data = 0;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize>::~QArray()
-{
- release();
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::operator=(const QArray<T, PreallocSize> &other)
-{
- if (this == &other)
- return *this;
- if (other.m_data && m_data == other.m_data)
- return *this;
- release();
- assign(other);
- return *this;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE int QArray<T, PreallocSize>::size() const
-{
- return m_end - m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE int QArray<T, PreallocSize>::count() const
-{
- return m_end - m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE int QArray<T, PreallocSize>::capacity() const
-{
- if (m_data)
- return m_data->capacity;
- else if (this->isPrealloc(m_start))
- return PreallocSize;
- else
- return m_end - m_start; // raw data, m_limit == m_start
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE bool QArray<T, PreallocSize>::isEmpty() const
-{
- return m_start == m_end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE bool QArray<T, PreallocSize>::isDetached() const
-{
- // If m_limit is the same as m_start, then the array
- // is either shared or contains raw data.
- return m_limit != m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::detach()
-{
- if (m_limit == m_start)
- detach_helper();
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::clear()
-{
- release();
- initPrealloc();
- m_data = 0;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE const T &QArray<T, PreallocSize>::operator[](int index) const
-{
- Q_ASSERT_X(index >= 0 && index < size(),
- "QArray<T>::at", "index out of range");
- return m_start[index];
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE const T &QArray<T, PreallocSize>::at(int index) const
-{
- Q_ASSERT_X(index >= 0 && index < size(),
- "QArray<T>::operator[]", "index out of range");
- return m_start[index];
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE T &QArray<T, PreallocSize>::operator[](int index)
-{
- Q_ASSERT_X(index >= 0 && index < size(),
- "QArray<T>::operator[]", "index out of range");
- return data()[index];
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE T QArray<T, PreallocSize>::value(int index) const
-{
- if (index >= 0 && index < size())
- return m_start[index];
- else
- return T();
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE T QArray<T, PreallocSize>::value(int index, const T &defaultValue) const
-{
- if (index >= 0 && index < size())
- return m_start[index];
- else
- return defaultValue;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE T *QArray<T, PreallocSize>::extend(int size)
-{
- Q_ASSERT(size > 0);
- if ((m_end + size) >= m_limit)
- grow(size);
- T *end = m_end;
- m_end += size; // Note: new elements are not initialized.
- return end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::append(const T &value)
-{
- if (m_end >= m_limit)
- grow(1);
- new (m_end) T(value);
- ++m_end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::append(const T &value1, const T &value2)
-{
- if ((m_end + 1) >= m_limit)
- grow(2);
- new (m_end) T(value1);
- ++m_end; // Increment one at a time in case an exception is thrown.
- new (m_end) T(value2);
- ++m_end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::append(const T &value1, const T &value2, const T &value3)
-{
- if ((m_end + 2) >= m_limit)
- grow(3);
- new (m_end) T(value1);
- ++m_end;
- new (m_end) T(value2);
- ++m_end;
- new (m_end) T(value3);
- ++m_end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::append(const T &value1, const T &value2, const T &value3, const T &value4)
-{
- if ((m_end + 3) >= m_limit)
- grow(4);
- new (m_end) T(value1);
- ++m_end;
- new (m_end) T(value2);
- ++m_end;
- new (m_end) T(value3);
- ++m_end;
- new (m_end) T(value4);
- ++m_end;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::append(const T *values, int count)
-{
- if (count <= 0)
- return;
- if (!m_start || (m_end + count) > m_limit)
- grow(count);
- while (count-- > 0) {
- new (m_end) T(*values++);
- ++m_end;
- }
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::append(const QArray<T, PreallocSize> &other)
-{
- if (isEmpty()) {
- *this = other;
- } else {
- if (&other == this || (m_data && other.m_data == m_data))
- grow(size()); // Appending to ourselves: make some room.
- append(other.constData(), other.size());
- }
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::prepend(const T &value)
-{
- insert(begin(), 1, value);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::insert(int index, const T &value)
-{
- Q_ASSERT_X(index >= 0 && index <= size(),
- "QArray<T>::insert", "index out of range");
- insert(begin() + index, 1, value);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::insert(int index, int count, const T &value)
-{
- Q_ASSERT_X(index >= 0 && index <= size(),
- "QArray<T>::insert", "index out of range");
- insert(begin() + index, count, value);
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE Q_TYPENAME QArray<T, PreallocSize>::iterator QArray<T, PreallocSize>::insert(iterator before, int count, const T &value)
-{
- // Check the parameters.
- int size = this->size();
- int offset = int(before - m_start);
- Q_ASSERT_X(offset >= 0 && offset <= size,
- "QArray<T>::insert", "iterator offset is out of range");
- Q_ASSERT(count >= 0);
- if (count <= 0)
- return m_start + offset;
-
- // Reserve extra space and then copy-on-write.
- reserve(size + count);
- detach();
-
- // Move items up to make room, and replace at the insert point.
- if (QTypeInfo<T>::isStatic) {
- int newcount = count;
- while (newcount > 0) {
- new (m_end++) T();
- --newcount;
- }
- int posn = size;
- while (posn > offset) {
- --posn;
- m_start[posn + count] = m_start[posn];
- }
- while (count > 0) {
- --count;
- m_start[offset + count] = value;
- }
- } else {
- ::memmove(m_start + offset + count, m_start + offset,
- (size - offset) * sizeof(T));
- m_end += count;
- while (count > 0) {
- --count;
- new (m_start + offset + count) T(value);
- }
- }
-
- // Return the new iterator at the insert position.
- return m_start + offset;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE Q_TYPENAME QArray<T, PreallocSize>::iterator QArray<T, PreallocSize>::insert(iterator before, const T &value)
-{
- return insert(before, 1, value);
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::replace(int index, const T &value)
-{
- Q_ASSERT_X(index >= 0 && index < size(),
- "QArray<T>::replace", "index out of range");
- data()[index] = value;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::replace(int index, const T *values, int count)
-{
- if (index < 0 || count <= 0)
- return;
- int replaceSize = index + count;
- if (replaceSize > size())
- resize(replaceSize);
- copyReplace(data() + index, values, count);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::remove(int index)
-{
- remove(index, 1);
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::remove(int index, int count)
-{
- // Truncate the range to be removed.
- int currentSize = size();
- if (index < 0) {
- count += index;
- index = 0;
- }
- if (count > 0 && (index + count) > currentSize)
- count = currentSize - index;
- if (count <= 0)
- return;
-
- // Perform the removal.
- if (index == 0 && count >= currentSize) {
- clear();
- return;
- }
- T *start = data();
- copyReplace(start + index, start + index + count,
- (currentSize - (index + count)));
- resize(currentSize - count);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE Q_TYPENAME QArray<T, PreallocSize>::iterator QArray<T, PreallocSize>::erase(iterator begin, iterator end)
-{
- int index = begin - m_start;
- remove(index, end - begin);
- return m_start + index;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE Q_TYPENAME QArray<T, PreallocSize>::iterator QArray<T, PreallocSize>::erase(iterator pos)
-{
- int index = pos - m_start;
- remove(index, 1);
- return m_start + index;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE int QArray<T, PreallocSize>::indexOf(const T &value, int from) const
-{
- if (from < 0)
- from = qMax(from + size(), 0);
- const T *ptr = m_start + from;
- while (ptr < m_end) {
- if (*ptr == value)
- return ptr - m_start;
- ++ptr;
- }
- return -1;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE int QArray<T, PreallocSize>::lastIndexOf(const T &value, int from) const
-{
- int size = count();
- if (from < 0)
- from += size;
- else if (from >= size)
- from = size - 1;
- if (from >= 0) {
- const T *ptr = m_start + from;
- while (ptr >= m_start) {
- if (*ptr == value)
- return ptr - m_start;
- --ptr;
- }
- }
- return -1;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE bool QArray<T, PreallocSize>::contains(const T &value) const
-{
- const T *ptr = m_start;
- while (ptr < m_end) {
- if (*ptr == value)
- return true;
- ++ptr;
- }
- return false;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE int QArray<T, PreallocSize>::count(const T &value) const
-{
- const T *ptr = m_start;
- int count = 0;
- while (ptr < m_end) {
- if (*ptr == value)
- ++count;
- ++ptr;
- }
- return count;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::resize(int size)
-{
- if (size < 0)
- return;
- int currentSize = count();
- if (size < currentSize) {
- T *start = data(); // Force copy on write if necessary.
- if (QTypeInfo<T>::isComplex)
- free(start + size, currentSize - size);
- m_end = start + size;
- } else if (size > currentSize) {
- grow(size - currentSize);
- while (currentSize++ < size) {
- new (m_end) T();
- ++m_end;
- }
- }
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE void QArray<T, PreallocSize>::reserve(int size)
-{
- int cap = capacity();
- if (size > cap)
- grow(size - this->size());
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::fill(const T &value, int size)
-{
- if (size >= 0)
- resize(size);
- T *ptr = m_start;
- while (ptr < m_end)
- *ptr++ = value;
- return *this;
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::squeeze()
-{
- int size = count();
- if (size <= 0) {
- clear();
- } else if (size < capacity() && m_data) {
- reallocate(size);
- }
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE void QArray<T, PreallocSize>::reverse()
-{
- if (count() > 0) {
- T *src = m_start;
- T *dst = m_end - 1;
- while (src < dst)
- qSwap(*(dst--), *(src++));
- }
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::reversed() const
-{
- QArray<T, PreallocSize> result;
- int count = size();
- if (count > 0) {
- result.extend(count);
- const T *src = m_start;
- T *dst = result.m_end - 1;
- if (!QTypeInfo<T>::isComplex) {
- while (src != m_end)
- *(dst--) = *(src++);
- } else {
- while (src != m_end)
- new (dst--) T(*src++);
- }
- }
- return result;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::mid(int index, int length) const
-{
- int count = size();
- Q_ASSERT(index >= 0 && index <= count);
- if (length < 0 || (index + length) > count)
- length = count - index;
- if (index == 0 && length == count)
- return *this;
- QArray<T, PreallocSize> result;
- result.append(constData() + index, length);
- return result;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::left(int length) const
-{
- return mid(0, length);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::right(int length) const
-{
- int size = count();
- if (length < 0 || length >= size)
- length = size;
- return mid(size - length, length);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE T *QArray<T, PreallocSize>::data()
-{
- detach();
- return m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE const T *QArray<T, PreallocSize>::data() const
-{
- return m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE const T *QArray<T, PreallocSize>::constData() const
-{
- return m_start;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::fromRawData(const T *data, int size)
-{
- Q_ASSERT(size >= 0);
- return QArray<T, PreallocSize>(data, size, false);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> QArray<T, PreallocSize>::fromWritableRawData(T *data, int size)
-{
- Q_ASSERT(size >= 0);
- return QArray<T, PreallocSize>(data, size, true);
-}
-
-template <typename T, int PreallocSize>
-Q_OUTOFLINE_TEMPLATE bool QArray<T, PreallocSize>::operator==
- (const QArray<T, PreallocSize> &other) const
-{
- if (this == &other)
- return true;
- const T *thisData = constData();
- const T *otherData = other.constData();
- if (thisData == otherData)
- return true;
- int thisCount = count();
- int otherCount = other.count();
- if (thisCount == 0 && otherCount == 0)
- return true;
- if (thisCount != otherCount)
- return false;
- for (int index = 0; index < thisCount; ++index, ++thisData, ++otherData)
- if (*thisData != *otherData)
- return false;
- return true;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE bool QArray<T, PreallocSize>::operator!=
- (const QArray<T, PreallocSize> &other) const
-{
- return !(*this == other);
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::operator+=(const T &value)
-{
- append(value);
- return *this;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::operator+=(const QArray<T, PreallocSize> &other)
-{
- append(other);
- return *this;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::operator<<(const T &value)
-{
- append(value);
- return *this;
-}
-
-template <typename T, int PreallocSize>
-Q_INLINE_TEMPLATE QArray<T, PreallocSize> &QArray<T, PreallocSize>::operator<<(const QArray<T, PreallocSize> &other)
-{
- append(other);
- return *this;
-}
-
-#ifndef QT_NO_DATASTREAM
-
-template <typename T, int PreallocSize>
-QDataStream& operator<<(QDataStream& stream, const QArray<T, PreallocSize>& array)
-{
- int size = array.size();
- stream << quint32(size);
- for (int index = 0; index < size; ++index)
- stream << array.at(index);
- return stream;
-}
-
-template <typename T, int PreallocSize>
-QDataStream& operator>>(QDataStream& stream, QArray<T, PreallocSize>& array)
-{
- array.clear();
- quint32 size;
- stream >> size;
- array.reserve(size);
- for (int index = 0; index < int(size); ++index) {
- T t;
- stream >> t;
- array.append(t);
- if (stream.atEnd())
- break;
- }
- return stream;
-}
-
-#endif
-
-#ifndef QT_NO_DEBUG_STREAM
-
-template <typename T, int PreallocSize>
-QDebug operator<<(QDebug dbg, const QArray<T, PreallocSize>& array)
-{
- dbg.nospace() << "QArray(\n";
- int size = array.size();
- for (int index = 0; index < size; ++index) {
- dbg << " " << index << ": " << array.at(index) << "\n";
- }
- dbg << ")\n";
- return dbg.space();
-}
-
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qcolor4ub.cpp b/src/gui/extern/Qt3D/arrays/qcolor4ub.cpp
deleted file mode 100644
index 0036fedfed5aa0cd0e679525386403133281031f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qcolor4ub.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qcolor4ub.h"
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QColor4ub
- \brief The QColor4ub class represents a color by four unsigned byte components.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- OpenGL applications commonly use four unsigned byte values to compactly
- represent a color value. QColor4ub provides a convenience
- class for manipulating such compact color values.
-
- An alternative is to represent a color value as four floating-point
- values between 0.0 and 1.0. The QVector4D class can be used for
- that purpose if required.
-*/
-
-/*!
- \fn QColor4ub::QColor4ub()
-
- Constructs a four-byte default color value of (0, 0, 0, 255).
-*/
-
-/*!
- \fn QColor4ub::QColor4ub(int red, int green, int blue, int alpha)
-
- Constructs a four-byte color value with the components \a red,
- \a green, \a blue, and \a alpha.
-*/
-
-/*!
- \fn QColor4ub::QColor4ub(const QColor& color)
-
- Constructs a four-byte color value from \a color.
-*/
-
-/*!
- \fn QColor4ub::QColor4ub(Qt::GlobalColor color)
-
- Constructs a four-byte color value from \a color.
-*/
-
-/*!
- \fn QColor4ub::QColor4ub(QRgb rgba)
-
- Constructs a four-byte color value from the red, green, blue, and
- alpha components of \a rgba.
-*/
-
-/*!
- \fn QColor4ub& QColor4ub::operator=(const QColor& color)
-
- Copies the red, green, blue, and alpha components of \a color
- into this object.
-*/
-
-/*!
- \fn QColor4ub& QColor4ub::operator=(Qt::GlobalColor color)
-
- Copies the red, green, blue, and alpha components of the
- specified global \a color name into this object.
-*/
-
-/*!
- \fn int QColor4ub::red() const
-
- Returns the red component of this color, between 0 and 255.
-
- \sa green(), blue(), alpha(), setRed(), redF()
-*/
-
-/*!
- \fn int QColor4ub::green() const
-
- Returns the green component of this color, between 0 and 255.
-
- \sa red(), blue(), alpha(), setGreen(), greenF()
-*/
-
-/*!
- \fn int QColor4ub::blue() const
-
- Returns the blue component of this color, between 0 and 255.
-
- \sa red(), green(), alpha(), setBlue(), blueF()
-*/
-
-/*!
- \fn int QColor4ub::alpha() const
-
- Returns the alpha component of this color, between 0 and 255.
-
- \sa red(), green(), blue(), setAlpha(), alphaF()
-*/
-
-/*!
- \fn void QColor4ub::setRed(int value)
-
- Sets the red component of this color to \a value, between 0 and 255.
-
- \sa setGreen(), setBlue(), setAlpha(), red(), setRedF()
-*/
-
-/*!
- \fn void QColor4ub::setGreen(int value)
-
- Sets the green component of this color to \a value, between 0 and 255.
-
- \sa setRed(), setBlue(), setAlpha(), green(), setGreenF()
-*/
-
-/*!
- \fn void QColor4ub::setBlue(int value)
-
- Sets the blue component of this color to \a value, between 0 and 255.
-
- \sa setRed(), setGreen(), setAlpha(), blue(), setBlueF()
-*/
-
-/*!
- \fn void QColor4ub::setAlpha(int value)
-
- Sets the alpha component of this color to \a value, between 0 and 255.
-
- \sa setRed(), setGreen(), setBlue(), alpha(), setAlphaF()
-*/
-
-/*!
- \fn qreal QColor4ub::redF() const { return m_red / 255.0f; }
-
- Returns the red component of this color as a floating-point
- value between 0 and 1.
-
- \sa greenF(), blueF(), alphaF(), setRedF(), red()
-*/
-
-/*!
- \fn qreal QColor4ub::greenF() const { return m_green / 255.0f; }
-
- Returns the green component of this color as a floating-point
- value between 0 and 1.
-
- \sa redF(), blueF(), alphaF(), setGreenF(), green()
-*/
-
-/*!
- \fn qreal QColor4ub::blueF() const { return m_blue / 255.0f; }
-
- Returns the blue component of this color as a floating-point
- value between 0 and 1.
-
- \sa redF(), greenF(), alphaF(), setBlueF(), blue()
-*/
-
-/*!
- \fn qreal QColor4ub::alphaF() const { return m_alpha / 255.0f; }
-
- Returns the alpha component of this color as a floating-point
- value between 0 and 1.
-
- \sa redF(), greenF(), blueF(), setAlphaF(), alpha()
-*/
-
-/*!
- \fn void QColor4ub::setRedF(qreal value)
-
- Sets the red component of this color to a floating-point \a value,
- between 0 and 1.
-
- \sa setGreenF(), setBlueF(), setAlphaF(), redF(), setRed()
-*/
-
-/*!
- \fn void QColor4ub::setGreenF(qreal value)
-
- Sets the green component of this color to a floating-point \a value,
- between 0 and 1.
-
- \sa setRedF(), setBlueF(), setAlphaF(), greenF(), setGreen()
-*/
-
-/*!
- \fn void QColor4ub::setBlueF(qreal value)
-
- Sets the blue component of this color to a floating-point \a value,
- between 0 and 1.
-
- \sa setRedF(), setGreenF(), setAlphaF(), blueF(), setBlue()
-*/
-
-/*!
- \fn void QColor4ub::setAlphaF(qreal value)
-
- Sets the alpha component of this color to a floating-point \a value,
- between 0 and 1.
-
- \sa setRedF(), setGreenF(), setBlueF(), alphaF(), setAlpha()
-*/
-
-/*!
- \fn void QColor4ub::setRgb(int red, int green, int blue, int alpha)
-
- Sets the components of this color to \a red, \a green, \a blue,
- and \a alpha. Each component is between 0 and 255.
-
- \sa setRgbF(), fromRgb()
-*/
-
-/*!
- \fn void QColor4ub::setRgbF(qreal red, qreal green, qreal blue, qreal alpha)
-
- Sets the components of this color to \a red, \a green, \a blue,
- and \a alpha. Each component is a floating-point value between 0 and 1.
-
- \sa setRgb(), fromRgbF()
-*/
-
-/*!
- \fn QColor4ub QColor4ub::fromRgb(int red, int green, int blue, int alpha)
-
- Returns a QColor4ub with the components \a red, \a green, \a blue,
- and \a alpha. Each component is between 0 and 255.
-
- \sa fromRgbF(), setRgb()
-*/
-
-/*!
- \fn QColor4ub QColor4ub::fromRgbF(qreal red, qreal green, qreal blue, qreal alpha)
-
- Returns a QColor4ub with the components \a red, \a green, \a blue,
- and \a alpha. Each component is a floating-point value between 0 and 1.
-
- \sa fromRgb(), setRgbF()
-*/
-
-/*!
- \fn QColor4ub QColor4ub::fromRaw(const uchar *data)
-
- Returns a QColor4ub with components from the first four elements
- in \a data. The \a data parameter must contain at least four
- elements and not be null.
-*/
-
-/*!
- \fn QColor QColor4ub::toColor() const
-
- Returns this color as a QColor.
-*/
-
-/*!
- \fn bool QColor4ub::operator==(const QColor4ub& other) const
-
- Returns true if this color is the same as \a other; false otherwise.
-*/
-
-/*!
- \fn bool QColor4ub::operator!=(const QColor4ub& other) const
-
- Returns true if this color is not the same as \a other; false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QColor4ub &color)
-{
- dbg.nospace() << "QColor4ub("
- << color.redF() << ", " << color.greenF() << ", "
- << color.blueF() << ", " << color.alphaF() << ')';
- return dbg.space();
-}
-
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qcolor4ub.h b/src/gui/extern/Qt3D/arrays/qcolor4ub.h
deleted file mode 100644
index 9c5bd601cd2d3b5e8f8b8276fbce1a79af10f9a6..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qcolor4ub.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QCOLOR4UB_H
-#define QCOLOR4UB_H
-
-#include "qt3dglobal.h"
-#include <QtGui/qcolor.h>
-#include <QtCore/qmetatype.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QColor4ub
-{
-public:
- QColor4ub();
- QColor4ub(int red, int green, int blue, int alpha = 255);
- QColor4ub(const QColor& color);
- QColor4ub(Qt::GlobalColor color);
- QColor4ub(QRgb rgba);
-
- QColor4ub& operator=(const QColor& color);
- QColor4ub& operator=(Qt::GlobalColor color);
-
- int red() const { return m_red; }
- int green() const { return m_green; }
- int blue() const { return m_blue; }
- int alpha() const { return m_alpha; }
-
- void setRed(int value) { m_red = uchar(value); }
- void setGreen(int value) { m_green = uchar(value); }
- void setBlue(int value) { m_blue = uchar(value); }
- void setAlpha(int value) { m_alpha = uchar(value); }
-
- qreal redF() const { return m_red / 255.0f; }
- qreal greenF() const { return m_green / 255.0f; }
- qreal blueF() const { return m_blue / 255.0f; }
- qreal alphaF() const { return m_alpha / 255.0f; }
-
- void setRedF(qreal value) { m_red = uchar(qRound(value * 255.0f)); }
- void setGreenF(qreal value) { m_green = uchar(qRound(value * 255.0f)); }
- void setBlueF(qreal value) { m_blue = uchar(qRound(value * 255.0f)); }
- void setAlphaF(qreal value) { m_alpha = uchar(qRound(value * 255.0f)); }
-
- void setRgb(int red, int green, int blue, int alpha = 255);
- void setRgbF(qreal red, qreal green, qreal blue, qreal alpha = 1.0f);
-
- static QColor4ub fromRgb(int red, int green, int blue, int alpha = 255);
- static QColor4ub fromRgbF
- (qreal red, qreal green, qreal blue, qreal alpha = 1.0f);
- static QColor4ub fromRaw(const uchar *data);
-
- QColor toColor() const;
-
- bool operator==(const QColor4ub& other) const;
- bool operator!=(const QColor4ub& other) const;
-
-private:
- QColor4ub(const uchar *data);
-
- uchar m_red;
- uchar m_green;
- uchar m_blue;
- uchar m_alpha;
-};
-
-inline QColor4ub::QColor4ub() : m_red(0), m_green(0), m_blue(0), m_alpha(255) {}
-
-inline QColor4ub::QColor4ub(int red, int green, int blue, int alpha)
- : m_red(uchar(red)), m_green(uchar(green)),
- m_blue(uchar(blue)), m_alpha(uchar(alpha)) {}
-
-inline QColor4ub::QColor4ub(const QColor& color)
- : m_red(uchar(color.red())), m_green(uchar(color.green())),
- m_blue(uchar(color.blue())), m_alpha(uchar(color.alpha())) {}
-
-inline QColor4ub::QColor4ub(Qt::GlobalColor color)
-{
- QColor c(color);
- m_red = uchar(c.red());
- m_green = uchar(c.green());
- m_blue = uchar(c.blue());
- m_alpha = uchar(c.alpha());
-}
-
-inline QColor4ub::QColor4ub(QRgb rgba)
- : m_red(uchar(qRed(rgba))), m_green(uchar(qGreen(rgba))),
- m_blue(uchar(qBlue(rgba))), m_alpha(uchar(qAlpha(rgba))) {}
-
-inline QColor4ub::QColor4ub(const uchar *data)
- : m_red(data[0]), m_green(data[1]), m_blue(data[2]), m_alpha(data[3]) {}
-
-inline QColor4ub& QColor4ub::operator=(const QColor& color)
-{
- m_red = uchar(color.red());
- m_green = uchar(color.green());
- m_blue = uchar(color.blue());
- m_alpha = uchar(color.alpha());
- return *this;
-}
-
-inline QColor4ub& QColor4ub::operator=(Qt::GlobalColor color)
-{
- QColor c(color);
- m_red = uchar(c.red());
- m_green = uchar(c.green());
- m_blue = uchar(c.blue());
- m_alpha = uchar(c.alpha());
- return *this;
-}
-
-inline void QColor4ub::setRgb(int red, int green, int blue, int alpha)
-{
- m_red = uchar(red);
- m_green = uchar(green);
- m_blue = uchar(blue);
- m_alpha = uchar(alpha);
-}
-
-inline void QColor4ub::setRgbF(qreal red, qreal green, qreal blue, qreal alpha)
-{
- m_red = uchar(qRound(red * 255.0f));
- m_green = uchar(qRound(green * 255.0f));
- m_blue = uchar(qRound(blue * 255.0f));
- m_alpha = uchar(qRound(alpha * 255.0f));
-}
-
-inline QColor4ub QColor4ub::fromRgb(int red, int green, int blue, int alpha)
-{
- return QColor4ub(red, green, blue, alpha);
-}
-
-inline QColor4ub QColor4ub::fromRgbF
- (qreal red, qreal green, qreal blue, qreal alpha)
-{
- return QColor4ub(qRound(red * 255.0f), qRound(green * 255.0f),
- qRound(blue * 255.0f), qRound(alpha * 255.0f));
-}
-
-inline QColor4ub QColor4ub::fromRaw(const uchar *data)
-{
- return QColor4ub(data);
-}
-
-inline QColor QColor4ub::toColor() const
-{
- return QColor(m_red, m_green, m_blue, m_alpha);
-}
-
-inline bool QColor4ub::operator==(const QColor4ub& other) const
-{
- return m_red == other.m_red && m_green == other.m_green &&
- m_blue == other.m_blue && m_alpha == other.m_alpha;
-}
-
-inline bool QColor4ub::operator!=(const QColor4ub& other) const
-{
- return m_red != other.m_red || m_green != other.m_green ||
- m_blue != other.m_blue || m_alpha != other.m_alpha;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QColor4ub &color);
-#endif
-
-Q_DECLARE_TYPEINFO(QColor4ub, Q_MOVABLE_TYPE);
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QColor4ub)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qcustomdataarray.cpp b/src/gui/extern/Qt3D/arrays/qcustomdataarray.cpp
deleted file mode 100644
index 831e4104d2d5ca64cf972508a8fa2f726270a44b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qcustomdataarray.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qcustomdataarray.h"
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QCustomDataArray
- \brief The QCustomDataArray class is a polymorphic array of data values suitable for use in 3D applications.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QArray is an efficient storage mechanism for vertex attributes.
- However, there are some situations where the element type of a custom
- vertex attribute is not known until runtime. QCustomDataArray is
- intended for use in those situations. It has a small performance
- penalty compared to QArray to achieve polymorphism.
-
- The elements that may be stored in a QCustomDataArray are limited
- to a few types: float, QVector2D, QVector3D, QVector4D, and
- QColor4ub. This provides a reasonable range of efficient use
- cases without overloading the API. QArray can be used on
- any type, but is restricted to types that are known at compile time.
-
- Like QArray, QCustomDataArray uses implicit sharing and
- copy-on-write semantics to support passing large arrays around
- an application with little overhead.
-
- \sa QArray
-*/
-
-/*!
- \enum QCustomDataArray::ElementType
- This enum defines the element type within a QCustomDataArray.
-
- \value Float The elements are of type float.
- \value Vector2D The elements are of type QVector2D.
- \value Vector3D The elements are of type QVector3D.
- \value Vector4D The elements are of type QVector4D.
- \value Color The elements are of type QColor4ub, which consists of
- four unsigned bytes. To represent colors as four floating-point
- values, use Vector4D as the element type.
-*/
-
-/*!
- \fn QCustomDataArray::QCustomDataArray()
-
- Constructs an empty custom data array. The elementType() will
- initially be QCustomDataArray::Float, which can be changed with a
- call to setElementType() before the elements are appended.
-
- \sa setElementType(), append()
-*/
-
-/*!
- Constructs an empty custom data array with elements represented
- by the specified \a type.
-
- \sa setElementType()
-*/
-QCustomDataArray::QCustomDataArray(QCustomDataArray::ElementType type)
-{
- setElementType(type);
-}
-
-/*!
- Constructs an empty custom data array with elements represented
- by the specified \a type. The array is initially resized to \a size;
- filling all elements with zeroes.
-
- \sa setElementType(), resize()
-*/
-QCustomDataArray::QCustomDataArray(QCustomDataArray::ElementType type, int size)
-{
- setElementType(type);
- resize(size);
-}
-
-/*!
- \fn QCustomDataArray::QCustomDataArray(const QCustomDataArray& other)
-
- Constructs a copy of \a other.
-*/
-
-/*!
- Constructs a copy of the floating-point QArray \a other.
-
- The elementType() will be set to QCustomDataArray::Float.
-
- \sa toFloatArray()
-*/
-QCustomDataArray::QCustomDataArray(const QArray<float>& other)
- : m_array(other),
- m_elementType(QCustomDataArray::Float),
- m_elementComponents(1)
-{
-}
-
-/*!
- Constructs a copy of the 2D vector QArray \a other.
-
- The elementType() will be set to QCustomDataArray::Vector2D.
-
- This constructor needs to make a complete copy of the data
- in \a other so it may be expensive performance-wise.
-
- \sa toVector2DArray()
-*/
-QCustomDataArray::QCustomDataArray(const QArray<QVector2D>& other)
- : m_elementType(QCustomDataArray::Vector2D),
- m_elementComponents(2)
-{
- int size = other.size();
- if (size > 0) {
- const QVector2D *src = other.constData();
- float *dst = m_array.extend(size * 2);
- qMemCopy(dst, src, size * sizeof(QVector2D));
- }
-}
-
-/*!
- Constructs a copy of the 3D vector QArray \a other.
-
- The elementType() will be set to QCustomDataArray::Vector3D.
-
- This constructor needs to make a complete copy of the data
- in \a other so it may be expensive performance-wise.
-
- \sa toVector3DArray()
-*/
-QCustomDataArray::QCustomDataArray(const QArray<QVector3D>& other)
- : m_elementType(QCustomDataArray::Vector3D),
- m_elementComponents(3)
-{
- int size = other.size();
- if (size > 0) {
- const QVector3D *src = other.constData();
- float *dst = m_array.extend(size * 3);
- qMemCopy(dst, src, size * sizeof(QVector3D));
- }
-}
-
-/*!
- Constructs a copy of the 4D vector QArray \a other.
-
- The elementType() will be set to QCustomDataArray::Vector4D.
-
- This constructor needs to make a complete copy of the data
- in \a other so it may be expensive performance-wise.
-
- \sa toVector3DArray()
-*/
-QCustomDataArray::QCustomDataArray(const QArray<QVector4D>& other)
- : m_elementType(QCustomDataArray::Vector4D),
- m_elementComponents(4)
-{
- int size = other.size();
- if (size > 0) {
- const QVector4D *src = other.constData();
- float *dst = m_array.extend(size * 4);
- qMemCopy(dst, src, size * sizeof(QVector4D));
- }
-}
-
-/*!
- Constructs a copy of the color QArray \a other.
-
- The elementType() will be set to QCustomDataArray::Color.
-
- This constructor needs to make a complete copy of the data
- in \a other so it may be expensive performance-wise.
-
- \sa toColorArray()
-*/
-QCustomDataArray::QCustomDataArray(const QArray<QColor4ub>& other)
- : m_elementType(QCustomDataArray::Color),
- m_elementComponents(1)
-{
- int size = other.size();
- qMemCopy(m_array.extend(size), other.constData(), sizeof(QColor4ub) * size);
-}
-
-/*!
- \fn QCustomDataArray::~QCustomDataArray()
-
- Destroys this custom data array.
-*/
-
-/*!
- \fn QCustomDataArray& QCustomDataArray::operator=(const QCustomDataArray& other)
-
- Assigns \a other to this custom data array and returns a reference
- to this custom data array.
-
- The previous elementType() for this custom data array will be
- replaced with the type from \a other. The element data is assigned
- directly without conversion.
-*/
-
-/*!
- \fn QCustomDataArray::ElementType QCustomDataArray::elementType() const
-
- Returns the representation type of elements in this custom data array.
-
- \sa setElementType()
-*/
-
-/*!
- Sets the representation \a type of elements in this custom data array.
- The array must be empty to change the element type.
-
- \sa elementType(), append()
-*/
-void QCustomDataArray::setElementType(QCustomDataArray::ElementType type)
-{
- Q_ASSERT(m_array.isEmpty());
- m_elementType = type;
- switch (type) {
- case QCustomDataArray::Float:
- m_elementComponents = 1;
- break;
- case QCustomDataArray::Vector2D:
- m_elementComponents = 2;
- break;
- case QCustomDataArray::Vector3D:
- m_elementComponents = 3;
- break;
- case QCustomDataArray::Vector4D:
- m_elementComponents = 4;
- break;
- case QCustomDataArray::Color:
- m_elementComponents = 1; // 4 bytes packed into a float.
- break;
- default:
- Q_ASSERT_X(false, "QCustomDataArray::setElementType",
- "unknown element type");
- m_elementComponents = 1;
- break;
- }
-}
-
-/*!
- \fn int QCustomDataArray::size() const
-
- Returns the number of elements in this custom data array.
-
- \sa resize(), capacity(), isEmpty()
-*/
-
-/*!
- \fn int QCustomDataArray::count() const
-
- Same as size(); provided for convenience.
-*/
-
-/*!
- \fn int QCustomDataArray::capacity() const
-
- Returns the number of elements that can be stored in this
- custom data array before reallocation.
-
- \sa reserve(), size()
-*/
-
-/*!
- \fn bool QCustomDataArray::isEmpty() const
-
- Returns true if this data array is empty; false otherwise.
-
- \sa size(), clear()
-*/
-
-/*!
- \fn int QCustomDataArray::elementSize() const
-
- Returns the size of individual elements in this custom data
- array, in bytes. For example, the element size of an array
- containing QVector3D values will be 3 * sizeof(float),
- normally 12.
-
- \sa setElementType()
-*/
-
-/*!
- \fn void QCustomDataArray::clear()
-
- Clears all elements from this custom data array and sets the size to zero.
-
- This function will deallocate any memory that is used on the heap
- to store the custom data array's elements. To reuse the same memory
- as before, call resize() with an argument of zero.
-
- \sa resize(), isEmpty()
-*/
-
-/*!
- \fn void QCustomDataArray::resize(int size)
-
- Sets the size of the custom data array to \a size. If \a size is greater
- than the current size, elements are added to the end; the new elements
- are initialized with all-zeroes. If \a size is less than the current
- size, elements are removed from the end.
-
- \sa size(), reserve(), squeeze()
-*/
-
-/*!
- \fn void QCustomDataArray::reserve(int size)
-
- Increases the capacity of this custom data array to reserve space for
- at least \a size elements. If the capacity is already larger
- than \a size, this function does nothing; in particular, it does
- not remove elements from the array like resize() does.
-
- This function can be useful when you know how roughly many elements
- will be appended ahead of time. Reserving the space once can avoid
- unnecessary realloc operations later.
-
- \sa capacity(), resize(), squeeze()
-*/
-
-/*!
- \fn void QCustomDataArray::squeeze()
-
- Releases any memory not required to store the custom data array's
- elements by reducing its capacity() to size().
-
- This function is intended for reclaiming memory in a custom data
- array that is being used over and over with different contents.
- As elements are added to a custom data array, it will be constantly
- expanded in size. This function can realloc the custom data array
- to a smaller size to reclaim unused memory.
-
- \sa reserve(), capacity()
-*/
-
-/*!
- Returns the value of the element at \a index in this custom
- data array as a QVariant.
-
- Color elements are returned as a QVariant containing a
- QColor4ub, not a QColor.
-
- \sa setAt(), append(), floatAt(), vector2DAt(), vector3DAt()
- \sa vector4DAt(), colorAt()
-*/
-QVariant QCustomDataArray::at(int index) const
-{
- Q_ASSERT(index >= 0 && index < size());
-
- const float *data;
- switch (m_elementType) {
-
- case QCustomDataArray::Float:
- return QVariant(m_array.at(index));
-
- case QCustomDataArray::Vector2D:
- data = m_array.constData() + index * 2;
- return qVariantFromValue(QVector2D(data[0], data[1]));
-
- case QCustomDataArray::Vector3D:
- data = m_array.constData() + index * 3;
- return qVariantFromValue(QVector3D(data[0], data[1], data[2]));
-
- case QCustomDataArray::Vector4D:
- data = m_array.constData() + index * 4;
- return qVariantFromValue
- (QVector4D(data[0], data[1], data[2], data[3]));
-
- case QCustomDataArray::Color:
- data = m_array.constData() + index;
- return qVariantFromValue
- (QColor4ub::fromRaw(reinterpret_cast<const uchar *>(data)));
-
- default: break;
- }
- return QVariant();
-}
-
-/*!
- Sets the element at \a index in this custom data array to \a value.
-
- The type of \a value must be consistent with elementType().
- The two exceptions to this are that a Float value can be
- specified by either a float or double QVariant, and a Color
- value can be specified as either a QColor4ub or QColor QVariant.
-
- \sa at(), elementType()
-*/
-void QCustomDataArray::setAt(int index, const QVariant& value)
-{
- Q_ASSERT(index >= 0 && index < size());
-
- switch (value.type()) {
-
- case (QVariant::Type)QMetaType::Float:
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- m_array[index] = value.toFloat();
- break;
-
- case QVariant::Double:
- // Convert Double into Float.
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- m_array[index] = float(value.toDouble());
- break;
-
- case QVariant::Vector2D:
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- *(reinterpret_cast<QVector2D *>(m_array.data() + index * 2))
- = qVariantValue<QVector2D>(value);
- break;
-
- case QVariant::Vector3D:
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- *(reinterpret_cast<QVector3D *>(m_array.data() + index * 3))
- = qVariantValue<QVector3D>(value);
- break;
-
- case QVariant::Vector4D:
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- *(reinterpret_cast<QVector4D *>(m_array.data() + index * 4))
- = qVariantValue<QVector4D>(value);
- break;
-
- case QVariant::Color:
- // Convert QColor into QColor4ub.
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- *(reinterpret_cast<QColor4ub *>(m_array.data() + index))
- = QColor4ub(qVariantValue<QColor>(value));
- break;
-
- case QVariant::UserType:
- if (value.userType() == qMetaTypeId<QColor4ub>()) {
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- *(reinterpret_cast<QColor4ub *>(m_array.data() + index))
- = qVariantValue<QColor4ub>(value);
- break;
- }
- // Fall through.
-
- default:
- Q_ASSERT_X(false, "QCustomDataArray::setAt",
- "QVariant type not supported for elements");
- break;
- }
-}
-
-/*!
- \fn void QCustomDataArray::setAt(int index, qreal x)
- \overload
-
- Sets the floating-point element at \a index in this custom data
- array to \a x. The elementType() must be QCustomDataArray::Float.
-
- \sa at(), elementType(), floatAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, qreal x, qreal y)
- \overload
-
- Sets the 2D vector element at \a index in this custom
- data array to (\a x, \a y). The elementType() must be
- QCustomDataArray::Vector2D.
-
- \sa at(), elementType(), vector2DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, qreal x, qreal y, qreal z)
- \overload
-
- Sets the 3D vector element at \a index in this custom
- data array to (\a x, \a y, \a z). The elementType() must be
- QCustomDataArray::Vector3D.
-
- \sa at(), elementType(), vector3DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, qreal x, qreal y, qreal z, qreal w)
- \overload
-
- Sets the 4D vector element at \a index in this custom
- data array to (\a x, \a y, \a z, \a w). The elementType() must be
- QCustomDataArray::Vector4D.
-
- \sa at(), elementType(), vector4DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, const QVector2D& value)
- \overload
-
- Sets the 2D vector element at \a index in this custom
- data array to \a value. The elementType() must be
- QCustomDataArray::Vector2D.
-
- \sa at(), elementType(), vector2DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, const QVector3D& value)
- \overload
-
- Sets the 3D vector element at \a index in this custom
- data array to \a value. The elementType() must be
- QCustomDataArray::Vector3D.
-
- \sa at(), elementType(), vector3DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, const QVector4D& value)
- \overload
-
- Sets the 4D vector element at \a index in this custom
- data array to \a value. The elementType() must be
- QCustomDataArray::Vector4D.
-
- \sa at(), elementType(), vector4DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, const QColor4ub& value)
- \overload
-
- Sets the color element at \a index in this custom data array to \a value.
- The elementType() must be QCustomDataArray::Color.
-
- \sa at(), elementType(), colorAt()
-*/
-
-/*!
- \fn void QCustomDataArray::setAt(int index, Qt::GlobalColor value)
- \overload
-
- Sets the color element at \a index in this custom data array to \a value.
- The elementType() must be QCustomDataArray::Color.
-
- \sa at(), elementType(), colorAt()
-*/
-
-/*!
- \fn qreal QCustomDataArray::floatAt(int index) const
-
- Returns the floating-point element at \a index in this custom data array.
- The elementType() must be QCustomDataArray::Float.
-
- \sa at(), setAt(), elementType()
-*/
-
-/*!
- \fn QVector2D QCustomDataArray::vector2DAt(int index) const
-
- Returns the 2D vector element at \a index in this custom data array.
- The elementType() must be QCustomDataArray::Vector2D.
-
- \sa at(), setAt(), elementType()
-*/
-
-/*!
- \fn QVector3D QCustomDataArray::vector3DAt(int index) const
-
- Returns the 3D vector element at \a index in this custom data array.
- The elementType() must be QCustomDataArray::Vector3D.
-
- \sa at(), setAt(), elementType()
-*/
-
-/*!
- \fn QVector4D QCustomDataArray::vector4DAt(int index) const
-
- Returns the 4D vector element at \a index in this custom data array.
- The elementType() must be QCustomDataArray::Vector4D.
-
- \sa at(), setAt(), elementType()
-*/
-
-/*!
- \fn QColor4ub QCustomDataArray::colorAt(int index) const
-
- Returns the color element at \a index in this custom data array.
- The elementType() must be QCustomDataArray::Color.
-
- \sa at(), setAt(), elementType()
-*/
-
-/*!
- \fn void QCustomDataArray::append(qreal x)
- \overload
-
- Appends the floating-point value \a x to this custom data array.
- The elementType() must be QCustomDataArray::Float.
-
- \sa setAt(), floatAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(qreal x, qreal y)
- \overload
-
- Appends the 2D vector value (\a x, \a y) to this custom data array.
- The elementType() must be QCustomDataArray::Vector2D.
-
- \sa setAt(), vector2DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(qreal x, qreal y, qreal z)
- \overload
-
- Appends the 3D vector value (\a x, \a y, \a z) to this custom
- data array. The elementType() must be QCustomDataArray::Vector3D.
-
- \sa setAt(), vector3DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(qreal x, qreal y, qreal z, qreal w)
- \overload
-
- Appends the 4D vector value (\a x, \a y, \a z, \a w) to this custom
- data array. The elementType() must be QCustomDataArray::Vector4D.
-
- \sa setAt(), vector4DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(const QVector2D& value)
- \overload
-
- Appends the 2D vector \a value to this custom data array.
- The elementType() must be QCustomDataArray::Vector2D.
-
- \sa setAt(), vector2DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(const QVector3D& value)
- \overload
-
- Appends the 3D vector \a value to this custom data array.
- The elementType() must be QCustomDataArray::Vector3D.
-
- \sa setAt(), vector3DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(const QVector4D& value)
- \overload
-
- Appends the 4D vector \a value to this custom data array.
- The elementType() must be QCustomDataArray::Vector4D.
-
- \sa setAt(), vector4DAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(const QColor4ub& value)
- \overload
-
- Appends the color \a value to this custom data array.
- The elementType() must be QCustomDataArray::Color.
-
- \sa setAt(), colorAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(Qt::GlobalColor value)
- \overload
-
- Appends the color \a value to this custom data array.
- The elementType() must be QCustomDataArray::Color.
-
- \sa setAt(), colorAt()
-*/
-
-/*!
- \fn void QCustomDataArray::append(const QCustomDataArray &array)
- \overload
-
- Appends the values in \a array to this custom data array. This
- custom data array must have the same element type as \a array,
- unless this custom data array is empty - in which case the
- element type and data of \a array will be assigned to this.
-*/
-
-/*!
- Appends \a value to this custom data array.
-
- The type of \a value must be consistent with elementType().
- The two exceptions to this are that a Float value can be
- specified by either a float or double QVariant, and a Color
- value can be specified as either a QColor4ub or QColor QVariant.
-
- \sa at(), setAt(), elementType()
-*/
-void QCustomDataArray::append(const QVariant& value)
-{
- switch (value.type()) {
-
- case (QVariant::Type)QMetaType::Float:
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- m_array.append(value.toFloat());
- break;
-
- case QVariant::Double:
- // Convert Double into Float.
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- m_array.append(float(value.toDouble()));
- break;
-
- case QVariant::Vector2D:
- append(qVariantValue<QVector2D>(value));
- break;
-
- case QVariant::Vector3D:
- append(qVariantValue<QVector3D>(value));
- break;
-
- case QVariant::Vector4D:
- append(qVariantValue<QVector4D>(value));
- break;
-
- case QVariant::Color:
- // Convert QColor into QColor4ub.
- append(QColor4ub(qVariantValue<QColor>(value)));
- break;
-
- case QVariant::UserType:
- if (value.userType() == qMetaTypeId<QColor4ub>()) {
- append(qVariantValue<QColor4ub>(value));
- break;
- }
- // Fall through.
-
- default:
- Q_ASSERT_X(false, "QCustomDataArray::append",
- "QVariant type not supported for elements");
- break;
- }
-}
-
-/*!
- Returns the contents of this custom data array as a QArray
- of float values.
-
- The elementType() must be QCustomDataArray::Float.
-*/
-QArray<float> QCustomDataArray::toFloatArray() const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- return m_array;
-}
-
-/*!
- Returns the contents of this custom data array as a QArray
- of QVector2D values.
-
- The elementType() must be QCustomDataArray::Vector2D.
-
- This function needs to make a complete copy of the data
- in this array so it may be expensive performance-wise.
-*/
-QArray<QVector2D> QCustomDataArray::toVector2DArray() const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- int size = m_array.size() / 2;
- QArray<QVector2D> result;
- if (size > 0) {
- QVector2D *dst = result.extend(size);
- const float *src = m_array.constData();
- qMemCopy(dst, src, size * sizeof(QVector2D));
- }
- return result;
-}
-
-/*!
- Returns the contents of this custom data array as a QArray
- of QVector3D values.
-
- The elementType() must be QCustomDataArray::Vector3D.
-
- This function needs to make a complete copy of the data
- in this array so it may be expensive performance-wise.
-*/
-QArray<QVector3D> QCustomDataArray::toVector3DArray() const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- int size = m_array.size() / 3;
- QArray<QVector3D> result;
- if (size > 0) {
- QVector3D *dst = result.extend(size);
- const float *src = m_array.constData();
- qMemCopy(dst, src, size * sizeof(QVector3D));
- }
- return result;
-}
-
-/*!
- Returns the contents of this custom data array as a QArray
- of QVector4D values.
-
- The elementType() must be QCustomDataArray::Vector4D.
-
- This function needs to make a complete copy of the data
- in this array so it may be expensive performance-wise.
-*/
-QArray<QVector4D> QCustomDataArray::toVector4DArray() const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- int size = m_array.size() / 4;
- QArray<QVector4D> result;
- if (size > 0) {
- QVector4D *dst = result.extend(size);
- const float *src = m_array.constData();
- qMemCopy(dst, src, size * sizeof(QVector4D));
- }
- return result;
-}
-
-/*!
- Returns the contents of this custom data array as a QArray
- of QColor4ub values.
-
- The elementType() must be QCustomDataArray::Color.
-
- This function needs to make a complete copy of the data
- in this array so it may be expensive performance-wise.
-*/
-QArray<QColor4ub> QCustomDataArray::toColorArray() const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- int size = m_array.size();
- QArray<QColor4ub> result;
- result.reserve(size);
- const QColor4ub *data =
- reinterpret_cast<const QColor4ub *>(m_array.constData());
- for (int index = 0; index < size; ++index)
- result.append(*data++);
- return result;
-}
-
-/*!
- \fn const void *QCustomDataArray::data() const
-
- Returns a const pointer to the data stored in the custom data array.
- The pointer can be used to access the items in the custom data array.
- The pointer remains valid as long as the custom data array isn't
- reallocated.
-
- This function is mostly useful to pass a custom data array to a function
- that accepts a plain C++ array.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QCustomDataArray &array)
-{
- dbg << "QCustomDataArray" << &array << " -- count:" << array.count();
- for (int i = 0; i < array.count(); ++i)
- dbg << array.at(i);
- return dbg;
-}
-#endif
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qcustomdataarray.h b/src/gui/extern/Qt3D/arrays/qcustomdataarray.h
deleted file mode 100644
index 0a7168b96fed551a81c1f60864e21e4ab589dfcb..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qcustomdataarray.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QCUSTOMDATAARRAY_H
-#define QCUSTOMDATAARRAY_H
-
-#include "qarray.h"
-#include "qcolor4ub.h"
-#include <QtCore/qvariant.h>
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLVertexBundleCustomAttribute;
-class QGeometryData;
-
-class Q_QT3D_EXPORT QCustomDataArray
-{
-public:
- enum ElementType
- {
- Float,
- Vector2D,
- Vector3D,
- Vector4D,
- Color
- };
-
- QCustomDataArray();
- explicit QCustomDataArray(QCustomDataArray::ElementType type);
- QCustomDataArray(QCustomDataArray::ElementType type, int size);
- QCustomDataArray(const QCustomDataArray& other);
- QCustomDataArray(const QArray<float>& other);
- QCustomDataArray(const QArray<QVector2D>& other);
- QCustomDataArray(const QArray<QVector3D>& other);
- QCustomDataArray(const QArray<QVector4D>& other);
- QCustomDataArray(const QArray<QColor4ub>& other);
- ~QCustomDataArray();
-
- QCustomDataArray& operator=(const QCustomDataArray& other);
-
- QCustomDataArray::ElementType elementType() const;
- void setElementType(QCustomDataArray::ElementType type);
-
- int size() const;
- int count() const;
-
- int capacity() const;
- bool isEmpty() const;
-
- int elementSize() const;
-
- void clear();
- void reserve(int size);
- void resize(int size);
- void squeeze();
-
- QVariant at(int index) const;
- void setAt(int index, const QVariant& value);
-
- void setAt(int index, qreal x);
- void setAt(int index, qreal x, qreal y);
- void setAt(int index, qreal x, qreal y, qreal z);
- void setAt(int index, qreal x, qreal y, qreal z, qreal w);
- void setAt(int index, const QVector2D& value);
- void setAt(int index, const QVector3D& value);
- void setAt(int index, const QVector4D& value);
- void setAt(int index, const QColor4ub& value);
- void setAt(int index, Qt::GlobalColor value);
-
- qreal floatAt(int index) const;
- QVector2D vector2DAt(int index) const;
- QVector3D vector3DAt(int index) const;
- QVector4D vector4DAt(int index) const;
- QColor4ub colorAt(int index) const;
-
- void append(qreal x);
- void append(qreal x, qreal y);
- void append(qreal x, qreal y, qreal z);
- void append(qreal x, qreal y, qreal z, qreal w);
- void append(const QVector2D& value);
- void append(const QVector3D& value);
- void append(const QVector4D& value);
- void append(const QColor4ub& value);
- void append(const QVariant& value);
- void append(Qt::GlobalColor value);
- void append(const QCustomDataArray &array);
-
- QArray<float> toFloatArray() const;
- QArray<QVector2D> toVector2DArray() const;
- QArray<QVector3D> toVector3DArray() const;
- QArray<QVector4D> toVector4DArray() const;
- QArray<QColor4ub> toColorArray() const;
-
- const void *data() const;
-
-private:
- QArray<float> m_array;
- QCustomDataArray::ElementType m_elementType;
- int m_elementComponents;
-
- friend class QGLVertexBundleCustomAttribute;
- friend class QGeometryData;
-};
-
-inline QCustomDataArray::QCustomDataArray()
- : m_elementType(QCustomDataArray::Float),
- m_elementComponents(1)
-{
-}
-
-inline QCustomDataArray::QCustomDataArray(const QCustomDataArray& other)
- : m_array(other.m_array),
- m_elementType(other.m_elementType),
- m_elementComponents(other.m_elementComponents)
-{
-}
-
-inline QCustomDataArray::~QCustomDataArray() {}
-
-inline QCustomDataArray& QCustomDataArray::operator=(const QCustomDataArray& other)
-{
- if (this != &other) {
- m_array = other.m_array;
- m_elementType = other.m_elementType;
- m_elementComponents = other.m_elementComponents;
- }
- return *this;
-}
-
-inline QCustomDataArray::ElementType QCustomDataArray::elementType() const
-{
- return m_elementType;
-}
-
-inline int QCustomDataArray::size() const
-{
- return m_array.size() / m_elementComponents;
-}
-
-inline int QCustomDataArray::count() const
-{
- return m_array.size() / m_elementComponents;
-}
-
-inline int QCustomDataArray::capacity() const
-{
- return m_array.capacity() / m_elementComponents;
-}
-
-inline bool QCustomDataArray::isEmpty() const
-{
- return m_array.isEmpty();
-}
-
-inline int QCustomDataArray::elementSize() const
-{
- return m_elementComponents * sizeof(float);
-}
-
-inline void QCustomDataArray::clear()
-{
- m_array.clear();
-}
-
-inline void QCustomDataArray::reserve(int size)
-{
- m_array.reserve(size * m_elementComponents);
-}
-
-inline void QCustomDataArray::resize(int size)
-{
- m_array.resize(size * m_elementComponents);
-}
-
-inline void QCustomDataArray::squeeze()
-{
- m_array.squeeze();
-}
-
-inline void QCustomDataArray::setAt(int index, qreal x)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- Q_ASSERT(index >= 0 && index < size());
- m_array[index] = float(x);
-}
-
-inline void QCustomDataArray::setAt(int index, qreal x, qreal y)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 2;
- data[0] = float(x);
- data[1] = float(y);
-}
-
-inline void QCustomDataArray::setAt(int index, qreal x, qreal y, qreal z)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 3;
- data[0] = float(x);
- data[1] = float(y);
- data[2] = float(z);
-}
-
-inline void QCustomDataArray::setAt(int index, qreal x, qreal y, qreal z, qreal w)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 4;
- data[0] = float(x);
- data[1] = float(y);
- data[2] = float(z);
- data[3] = float(w);
-}
-
-inline void QCustomDataArray::setAt(int index, const QVector2D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 2;
- data[0] = float(value.x());
- data[1] = float(value.y());
-}
-
-inline void QCustomDataArray::setAt(int index, const QVector3D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 3;
- data[0] = float(value.x());
- data[1] = float(value.y());
- data[2] = float(value.z());
-}
-
-inline void QCustomDataArray::setAt(int index, const QVector4D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- Q_ASSERT(index >= 0 && index < size());
- float *data = m_array.data() + index * 4;
- data[0] = float(value.x());
- data[1] = float(value.y());
- data[2] = float(value.z());
- data[3] = float(value.w());
-}
-
-inline void QCustomDataArray::setAt(int index, const QColor4ub& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- Q_ASSERT(index >= 0 && index < size());
- *(reinterpret_cast<QColor4ub *>(m_array.data() + index)) = value;
-}
-
-inline void QCustomDataArray::setAt(int index, Qt::GlobalColor value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- Q_ASSERT(index >= 0 && index < size());
- *(reinterpret_cast<QColor4ub *>(m_array.data() + index)) = QColor4ub(value);
-}
-
-inline qreal QCustomDataArray::floatAt(int index) const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- Q_ASSERT(index >= 0 && index < size());
- return m_array.at(index);
-}
-
-inline QVector2D QCustomDataArray::vector2DAt(int index) const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- Q_ASSERT(index >= 0 && index < size());
- const float *data = m_array.constData() + index * 2;
- return QVector2D(data[0], data[1]);
-}
-
-inline QVector3D QCustomDataArray::vector3DAt(int index) const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- Q_ASSERT(index >= 0 && index < size());
- const float *data = m_array.constData() + index * 3;
- return QVector3D(data[0], data[1], data[2]);
-}
-
-inline QVector4D QCustomDataArray::vector4DAt(int index) const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- Q_ASSERT(index >= 0 && index < size());
- const float *data = m_array.constData() + index * 4;
- return QVector4D(data[0], data[1], data[2], data[3]);
-}
-
-inline QColor4ub QCustomDataArray::colorAt(int index) const
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- Q_ASSERT(index >= 0 && index < size());
- return *(reinterpret_cast<const QColor4ub *>(m_array.constData() + index));
-}
-
-inline void QCustomDataArray::append(qreal x)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Float);
- m_array.append(float(x));
-}
-
-inline void QCustomDataArray::append(qreal x, qreal y)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- m_array.append(float(x), float(y));
-}
-
-inline void QCustomDataArray::append(qreal x, qreal y, qreal z)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- m_array.append(float(x), float(y), float(z));
-}
-
-inline void QCustomDataArray::append(qreal x, qreal y, qreal z, qreal w)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- m_array.append(float(x), float(y), float(z), float(w));
-}
-
-inline void QCustomDataArray::append(const QVector2D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector2D);
- m_array.append(float(value.x()), float(value.y()));
-}
-
-inline void QCustomDataArray::append(const QVector3D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector3D);
- m_array.append(float(value.x()), float(value.y()), float(value.z()));
-}
-
-inline void QCustomDataArray::append(const QVector4D& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Vector4D);
- m_array.append(float(value.x()), float(value.y()),
- float(value.z()), float(value.w()));
-}
-
-inline void QCustomDataArray::append(const QColor4ub& value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- *(reinterpret_cast<QColor4ub *>(m_array.extend(1))) = value;
-}
-
-inline void QCustomDataArray::append(Qt::GlobalColor value)
-{
- Q_ASSERT(m_elementType == QCustomDataArray::Color);
- *(reinterpret_cast<QColor4ub *>(m_array.extend(1))) = QColor4ub(value);
-}
-
-inline void QCustomDataArray::append(const QCustomDataArray &array)
-{
- Q_ASSERT(isEmpty() || (array.elementType() == elementType()));
- if (isEmpty())
- *this = array;
- else
- m_array.append(array.m_array);
-}
-
-inline const void *QCustomDataArray::data() const
-{
- return m_array.constData();
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QCustomDataArray &array);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglattributedescription.cpp b/src/gui/extern/Qt3D/arrays/qglattributedescription.cpp
deleted file mode 100644
index 0f3a765514399b2c921a2f483be48914c147d311..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributedescription.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglattributedescription.h"
-#include "qopenglfunctions.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAttributeDescription
- \brief The QGLAttributeDescription class encapsulates information about an OpenGL attribute value's layout and type.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- OpenGL has many functions that take a pointer to vertex attribute
- values: \c{glVertexPointer()}, \c{glNormalPointer()},
- \c{glVertexAttribPointer()}, etc. These functions typically
- take four arguments: tuple size (1, 2, 3, or 4), component type
- (e.g. GL_FLOAT), stride, and data pointer (\c{glNormalPointer()}
- does not use tuple size, assuming that it is 3). When used with
- vertex buffers, the data pointer may be an offset into the vertex
- buffer instead.
-
- QGLAttributeDescription encapsulates the vertex attribute() kind
- (QGL::Position, QGL::Normal, etc) with the type(), tupleSize(),
- and stride() information of an attribute. The companion
- QGLAttributeValue class adds the data pointer.
-
- \sa QGLAttributeValue
-*/
-
-/*!
- \fn QGLAttributeDescription::QGLAttributeDescription()
-
- Constructs a null attribute description with default parameters of
- tupleSize() and stride() set to zero, type() set to GL_FLOAT,
- and attribute() set to QGL::Position.
-
- \sa isNull()
-*/
-
-/*!
- \fn QGLAttributeDescription::QGLAttributeDescription(QGL::VertexAttribute attribute, int tupleSize, GLenum type, int stride)
-
- Constructs an attribute description with the fields \a attribute,
- \a tupleSize, \a type, and \a stride.
-*/
-
-/*!
- \fn bool QGLAttributeDescription::isNull() const
-
- Returns true if tupleSize() is zero, which indicates an unset
- attribute description; false otherwise.
-*/
-
-/*!
- \fn QGL::VertexAttribute QGLAttributeDescription::attribute() const
-
- Returns the vertex attribute that this description applies to.
- The default value is QGL::Position.
-
- \sa setAttribute(), type()
-*/
-
-/*!
- \fn void QGLAttributeDescription::setAttribute(QGL::VertexAttribute attribute)
-
- Sets the vertex \a attribute that this description applies to.
-
- \sa attribute()
-*/
-
-/*!
- \fn GLenum QGLAttributeDescription::type() const
-
- Returns the component type for this attribute description. The default
- value is GL_FLOAT.
-
- \sa setType(), sizeOfType(), attribute()
-*/
-
-/*!
- \fn void QGLAttributeDescription::setType(GLenum type)
-
- Sets the component \a type for this attribute description.
-
- \sa type(), sizeOfType()
-*/
-
-/*!
- Returns the size in bytes of type().
-
- \sa type(), tupleSize()
-*/
-int QGLAttributeDescription::sizeOfType() const
-{
- switch (m_type) {
- case GL_BYTE: return int(sizeof(GLbyte));
- case GL_UNSIGNED_BYTE: return int(sizeof(GLubyte));
- case GL_SHORT: return int(sizeof(GLshort));
- case GL_UNSIGNED_SHORT: return int(sizeof(GLushort));
- case GL_INT: return int(sizeof(GLint));
- case GL_UNSIGNED_INT: return int(sizeof(GLuint));
- case GL_FLOAT: return int(sizeof(GLfloat));
-#if defined(GL_DOUBLE) && !defined(QT_OPENGL_ES)
- case GL_DOUBLE: return int(sizeof(GLdouble));
-#endif
- default: return 0;
- }
-}
-
-/*!
- \fn int QGLAttributeDescription::tupleSize() const
-
- Returns the tuple size of this attribute in components. For example,
- a return value of 3 indicates a vector of 3-dimensional values.
- If tupleSize() is zero, then this attribute description is null.
-
- \sa setTupleSize(), isNull(), sizeOfType()
-*/
-
-/*!
- \fn void QGLAttributeDescription::setTupleSize(int tupleSize)
-
- Sets the tuple size of this attribute in components to \a tupleSize.
-
- \sa tupleSize()
-*/
-
-/*!
- \fn int QGLAttributeDescription::stride() const
-
- Returns the stride in bytes from one vertex element to the
- next for this attribute description. The default value of 0 indicates
- that the elements are tightly packed within the data array.
-
- \sa setStride()
-*/
-
-/*!
- \fn void QGLAttributeDescription::setStride(int stride)
-
- Sets the \a stride in bytes from one vertex element to the next
- for this attribute description.
-
- \sa stride()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qglattributedescription.h b/src/gui/extern/Qt3D/arrays/qglattributedescription.h
deleted file mode 100644
index 1ecd8399f2df77e94c49ee1bb93475a4d583f5fd..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributedescription.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLATTRIBUTEDESCRIPTION_H
-#define QGLATTRIBUTEDESCRIPTION_H
-
-#include <QtOpenGL/qgl.h>
-#include "qt3dglobal.h"
-#include "qglnamespace.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLAttributeDescription
-{
-public:
- QGLAttributeDescription();
- QGLAttributeDescription(QGL::VertexAttribute attribute,
- int tupleSize, GLenum type, int stride);
-
- bool isNull() const;
-
- QGL::VertexAttribute attribute() const;
- void setAttribute(QGL::VertexAttribute attribute);
-
- GLenum type() const;
- void setType(GLenum type);
-
- int sizeOfType() const;
-
- int tupleSize() const;
- void setTupleSize(int tupleSize);
-
- int stride() const;
- void setStride(int stride);
-
-private:
- QGL::VertexAttribute m_attribute;
- GLenum m_type;
- int m_tupleSize;
- int m_stride;
-};
-
-inline QGLAttributeDescription::QGLAttributeDescription()
- : m_attribute(QGL::Position), m_type(GL_FLOAT),
- m_tupleSize(0), m_stride(0)
-{
-}
-
-inline QGLAttributeDescription::QGLAttributeDescription
- (QGL::VertexAttribute attribute, int tupleSize, GLenum type, int stride)
- : m_attribute(attribute), m_type(type),
- m_tupleSize(tupleSize), m_stride(stride)
-{
- Q_ASSERT(tupleSize >= 1 && tupleSize <= 4);
-}
-
-inline bool QGLAttributeDescription::isNull() const
-{
- return m_tupleSize == 0;
-}
-
-inline QGL::VertexAttribute QGLAttributeDescription::attribute() const
-{
- return m_attribute;
-}
-
-inline void QGLAttributeDescription::setAttribute(QGL::VertexAttribute attribute)
-{
- m_attribute = attribute;
-}
-
-inline GLenum QGLAttributeDescription::type() const
-{
- return m_type;
-}
-
-inline void QGLAttributeDescription::setType(GLenum type)
-{
- m_type = type;
-}
-
-inline int QGLAttributeDescription::tupleSize() const
-{
- return m_tupleSize;
-}
-
-inline void QGLAttributeDescription::setTupleSize(int tupleSize)
-{
- Q_ASSERT(tupleSize >= 1 && tupleSize <= 4);
- m_tupleSize = tupleSize;
-}
-
-inline int QGLAttributeDescription::stride() const
-{
- return m_stride;
-}
-
-inline void QGLAttributeDescription::setStride(int stride)
-{
- m_stride = stride;
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglattributeset.cpp b/src/gui/extern/Qt3D/arrays/qglattributeset.cpp
deleted file mode 100644
index c20e0232417e23486ede1b53dce94d7c6d60d2d9..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributeset.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglattributeset.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAttributeSet
- \brief The QGLAttributeSet class provides a set of QGL::VertexAttribute indexes.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QGLAttributeSet is intended for checking if a specific vertex
- attribute is present in a piece of geometry, or has been set on a
- QGLPainter during rendering operations. The members of the set
- are instances of QGL::VertexAttribute, with the restriction that
- the index must be between 0 and 31.
-
- The most common use for this class is to determine if specific
- attributes have been supplied on a QGLPainter so as to adjust the
- current drawing effect accordingly. The following example will
- use a lit texture effect if texture co-ordinates were provided
- in the vertex bundle, or a simple lit material effect if
- texture co-ordinates were not provided:
-
- \code
- painter.clearAttributes();
- painter.setVertexBundle(bundle);
- if (painter.attributes().contains(QGL::TextureCoord0))
- painter.setStandardEffect(QGL::LitModulateTexture2D);
- else
- painter.setStandardEffect(QGL::LitMaterial);
- \endcode
-
- It is important to clear the attributes before setting the vertex
- bundle, so that attributes from a previous bundle will not leak
- through. Multiple vertex bundles may be supplied if they contain
- different parts of the same logical piece of geometry.
-
- \sa QGLVertexBundle::attributes(), QGLPainter::attributes()
-*/
-
-/*!
- \fn QGLAttributeSet::QGLAttributeSet()
-
- Constructs an empty attribute set.
-
- \sa isEmpty()
-*/
-
-/*!
- \fn bool QGLAttributeSet::isEmpty() const
-
- Returns true if this attribute set is empty; false otherwise.
-*/
-
-/*!
- \fn void QGLAttributeSet::clear()
-
- Clears this attribute set to empty.
-*/
-
-/*!
- \fn bool QGLAttributeSet::contains(QGL::VertexAttribute attr) const
-
- Returns true if this attribute set contains \a attr; false otherwise.
-
- \sa insert(), remove()
-*/
-
-/*!
- \fn void QGLAttributeSet::insert(QGL::VertexAttribute attr)
-
- Inserts \a attr into this attribute set. Note: \a attr must be
- within the range 0 to 31. Attribute indexes outside this range
- are ignored and not added to the set.
-
- \sa remove(), contains()
-*/
-
-/*!
- \fn void QGLAttributeSet::remove(QGL::VertexAttribute attr)
-
- Removes \a attr from this attribute set.
-
- \sa insert(), contains()
-*/
-
-/*!
- Returns the members of this attribute set as a list.
-
- \sa fromList()
-*/
-QList<QGL::VertexAttribute> QGLAttributeSet::toList() const
-{
- QList<QGL::VertexAttribute> list;
- quint32 attrs = m_attrs;
- int index = 0;
- while (attrs != 0) {
- if ((attrs & 1) != 0)
- list.append(QGL::VertexAttribute(index));
- ++index;
- attrs >>= 1;
- }
- return list;
-}
-
-/*!
- Returns a new attribute set that is initialized with the members
- of \a list.
-
- \sa toList(), insert()
-*/
-QGLAttributeSet QGLAttributeSet::fromList(const QList<QGL::VertexAttribute> &list)
-{
- QGLAttributeSet set;
- for (int index = 0; index < list.size(); ++index)
- set.insert(list.at(index));
- return set;
-}
-
-/*!
- \fn void QGLAttributeSet::unite(const QGLAttributeSet &other)
-
- Unites the contents of \a other with this attribute set
- and modifies this set accordingly.
-
- \sa intersect(), subtract(), insert()
-*/
-
-/*!
- \fn void QGLAttributeSet::intersect(const QGLAttributeSet &other)
-
- Intersects the contents of \a other with this attribute set
- and modifies this set accordingly.
-
- \sa unite(), subtract()
-*/
-
-/*!
- \fn void QGLAttributeSet::subtract(const QGLAttributeSet &other)
-
- Subtracts the contents of \a other from this attribute set
- and modifies this set accordingly.
-
- \sa unite(), intersect(), remove()
-*/
-
-/*!
- \fn bool QGLAttributeSet::operator==(const QGLAttributeSet &other) const
-
- Returns true if this attribute set has the same elements as \a other;
- false otherwise.
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QGLAttributeSet::operator!=(const QGLAttributeSet &other) const
-
- Returns true if this attribute set does not have the same elements as
- \a other; false otherwise.
-
- \sa operator==()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qglattributeset.h b/src/gui/extern/Qt3D/arrays/qglattributeset.h
deleted file mode 100644
index 40f43c824dd3498f156e8b9168347de22677c748..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributeset.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLATTRIBUTESET_H
-#define QGLATTRIBUTESET_H
-
-#include "qt3dglobal.h"
-#include "qglnamespace.h"
-#include <QtCore/qlist.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLAttributeSet
-{
-public:
- QGLAttributeSet() : m_attrs(0) {}
-
- bool isEmpty() const { return !m_attrs; }
- void clear() { m_attrs = 0; }
-
- bool contains(QGL::VertexAttribute attr) const;
- void insert(QGL::VertexAttribute attr);
- void remove(QGL::VertexAttribute attr);
-
- QList<QGL::VertexAttribute> toList() const;
- static QGLAttributeSet fromList(const QList<QGL::VertexAttribute> &list);
-
- void unite(const QGLAttributeSet &other);
- void intersect(const QGLAttributeSet &other);
- void subtract(const QGLAttributeSet &other);
-
- bool operator==(const QGLAttributeSet &other) const;
- bool operator!=(const QGLAttributeSet &other) const;
-
-private:
- bool isValidAttr(QGL::VertexAttribute attr) const;
-
- quint32 m_attrs;
-};
-
-inline bool QGLAttributeSet::isValidAttr(QGL::VertexAttribute attr) const
-{
- int a = int(attr);
- return (a > -1 && a < 32);
-}
-
-inline bool QGLAttributeSet::contains(QGL::VertexAttribute attr) const
-{
- quint32 flag = quint32(attr);
- return isValidAttr(attr) ? ((m_attrs & (((quint32)1) << flag)) != 0) : false;
-}
-
-inline void QGLAttributeSet::insert(QGL::VertexAttribute attr)
-{
- quint32 flag = quint32(attr);
- if (isValidAttr(attr))
- m_attrs |= (((quint32)1) << flag);
-}
-
-inline void QGLAttributeSet::remove(QGL::VertexAttribute attr)
-{
- quint32 flag = quint32(attr);
- if (isValidAttr(attr))
- m_attrs &= ~(((quint32)1) << flag);
-}
-
-inline void QGLAttributeSet::unite(const QGLAttributeSet &other)
-{
- m_attrs |= other.m_attrs;
-}
-
-inline void QGLAttributeSet::intersect(const QGLAttributeSet &other)
-{
- m_attrs &= other.m_attrs;
-}
-
-inline void QGLAttributeSet::subtract(const QGLAttributeSet &other)
-{
- m_attrs &= ~(other.m_attrs);
-}
-
-inline bool QGLAttributeSet::operator==(const QGLAttributeSet &other) const
-{
- return m_attrs == other.m_attrs;
-}
-
-inline bool QGLAttributeSet::operator!=(const QGLAttributeSet &other) const
-{
- return m_attrs != other.m_attrs;
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglattributevalue.cpp b/src/gui/extern/Qt3D/arrays/qglattributevalue.cpp
deleted file mode 100644
index 642e3a25540dfc4b077d43068d9ba7bc8ccf9910..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributevalue.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglattributevalue.h"
-#include "qopenglfunctions.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAttributeValue
- \brief The QGLAttributeValue class encapsulates information about an OpenGL attribute value.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- OpenGL has many functions that take a pointer to vertex attribute
- values: \c{glVertexPointer()}, \c{glNormalPointer()},
- \c{glVertexAttribPointer()}, etc. These functions typically
- take four arguments: tuple size (1, 2, 3, or 4), component type
- (e.g. GL_FLOAT), stride, and data pointer (\c{glNormalPointer()}
- does not use tuple size, assuming that it is 3). When used with
- vertex buffers, the data pointer may be an offset into the vertex
- buffer instead.
-
- QGLAttributeValue encapsulates these four values so that they can
- be easily manipulated as a set during OpenGL painting operations.
- Constructors are provided for converting QArray and
- QCustomDataArray objects into an attribute value.
-
- Because the data() value is a raw pointer to arbitrary memory,
- care should be taken that the memory remains valid until the
- QGLAttributeValue is no longer required.
-
- \sa QGLAttributeDescription, QArray, QCustomDataArray
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue()
-
- Constructs a null attribute value with default parameters of
- tupleSize(), and stride() set to zero, type() set to GL_FLOAT,
- and data() set to null.
-
- \sa isNull()
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QArray<float>& array)
-
- Constructs an attribute value that refers to the contents of \a array,
- setting tupleSize() to 1, type() to GL_FLOAT, and stride() to zero.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QArray<QVector2D>& array)
-
- Constructs an attribute value that refers to the contents of \a array,
- setting tupleSize() to 2, type() to GL_FLOAT, and stride() to zero.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QArray<QVector3D>& array)
-
- Constructs an attribute value that refers to the contents of \a array,
- setting tupleSize() to 3, type() to GL_FLOAT, and stride() to zero.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QArray<QVector4D>& array)
-
- Constructs an attribute value that refers to the contents of \a array,
- setting tupleSize() to 4, type() to GL_FLOAT, and stride() to zero.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QArray<QColor4ub>& array)
-
- Constructs an attribute value that refers to the contents of \a array,
- setting tupleSize() to 4, type() to GL_UNSIGNED_BYTE, and stride() to zero.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-
-/*!
- Constructs an attribute value that refers to the contents of \a array.
- The tupleSize() and type() of the attribute value will be set according
- to the QCustomDataArray::elementType() of \a array.
-
- The \a array must not be destroyed or modified until the attribute
- value is no longer required.
-*/
-QGLAttributeValue::QGLAttributeValue(const QCustomDataArray& array)
- : m_tupleSize(0), m_type(GL_FLOAT), m_stride(0)
- , m_data(array.data()), m_count(array.count())
-{
- switch (array.elementType()) {
- case QCustomDataArray::Float:
- m_tupleSize = 1;
- break;
- case QCustomDataArray::Vector2D:
- m_tupleSize = 2;
- break;
- case QCustomDataArray::Vector3D:
- m_tupleSize = 3;
- break;
- case QCustomDataArray::Vector4D:
- m_tupleSize = 4;
- break;
- case QCustomDataArray::Color:
- m_tupleSize = 4;
- m_type = GL_UNSIGNED_BYTE;
- break;
- }
-}
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(int tupleSize, GLenum type, int stride, const void *data, int count)
-
- Constructs an attribute value with the fields \a tupleSize, \a type,
- \a stride, \a data, and \a count.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(int tupleSize, GLenum type, int stride, int offset, int count)
-
- Constructs an attribute value with the fields \a tupleSize, \a type,
- \a stride, \a offset, and \a count.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QGLAttributeDescription& description, const void *data, int count)
-
- Constructs an attribute value with the supplied \a description,
- \a data, and \a count.
-*/
-
-/*!
- \fn QGLAttributeValue::QGLAttributeValue(const QGLAttributeDescription& description, int offset, int count)
-
- Constructs an attribute value with the supplied \a description,
- \a offset, and \a count.
-*/
-
-/*!
- \fn bool QGLAttributeValue::isNull() const
-
- Returns true if tupleSize() is zero, which indicates an unset
- attribute value; false otherwise.
-
- Note: it is possible for data() to be null, but isNull() returns true.
- This can happen when data() is actually a zero offset into a
- vertex buffer.
-*/
-
-/*!
- \fn QGLAttributeDescription QGLAttributeValue::description(QGL::VertexAttribute attribute) const
-
- Returns the description of this value, tagged with \a attribute.
-
- \sa type()
-*/
-
-/*!
- \fn GLenum QGLAttributeValue::type() const
-
- Returns the component type for this attribute value. The default
- value is GL_FLOAT.
-
- \sa sizeOfType(), description()
-*/
-
-/*!
- Returns the size in bytes of type().
-
- \sa type(), tupleSize()
-*/
-int QGLAttributeValue::sizeOfType() const
-{
- switch (m_type) {
- case GL_BYTE: return int(sizeof(GLbyte));
- case GL_UNSIGNED_BYTE: return int(sizeof(GLubyte));
- case GL_SHORT: return int(sizeof(GLshort));
- case GL_UNSIGNED_SHORT: return int(sizeof(GLushort));
- case GL_INT: return int(sizeof(GLint));
- case GL_UNSIGNED_INT: return int(sizeof(GLuint));
- case GL_FLOAT: return int(sizeof(GLfloat));
-#if defined(GL_DOUBLE) && !defined(QT_OPENGL_ES)
- case GL_DOUBLE: return int(sizeof(GLdouble));
-#endif
- default: return 0;
- }
-}
-
-/*!
- \fn int QGLAttributeValue::tupleSize() const
-
- Returns the tuple size of this attribute in components. For example,
- a return value of 3 indicates a vector of 3-dimensional values.
- If tupleSize() is zero, then this attribute value is null.
-
- \sa isNull(), sizeOfType()
-*/
-
-/*!
- \fn int QGLAttributeValue::stride() const
-
- Returns the stride in bytes from one vertex element to the
- next for this attribute value. The default value of 0 indicates
- that the elements are tightly packed within the data() array.
-*/
-
-/*!
- \fn const void *QGLAttributeValue::data() const
-
- Returns the data pointer for the elements in this attribute value.
-*/
-
-/*!
- \fn int QGLAttributeValue::count() const
-
- Returns the count of vertex elements in this attribute value;
- zero if the count is unknown.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qglattributevalue.h b/src/gui/extern/Qt3D/arrays/qglattributevalue.h
deleted file mode 100644
index b673ebbdb80f28778ecdb26fc75d15814f40d79a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglattributevalue.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLATTRIBUTEVALUE_H
-#define QGLATTRIBUTEVALUE_H
-
-#include "qglattributedescription.h"
-#include "qcustomdataarray.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLVertexBundle;
-
-class Q_QT3D_EXPORT QGLAttributeValue
-{
-public:
- QGLAttributeValue();
- QGLAttributeValue(const QArray<float>& array);
- QGLAttributeValue(const QArray<QVector2D>& array);
- QGLAttributeValue(const QArray<QVector3D>& array);
- QGLAttributeValue(const QArray<QVector4D>& array);
- QGLAttributeValue(const QArray<QColor4ub>& array);
- QGLAttributeValue(const QCustomDataArray& array);
- QGLAttributeValue(int tupleSize, GLenum type, int stride, const void *data, int count = 0);
- QGLAttributeValue(int tupleSize, GLenum type, int stride, int offset, int count = 0);
- QGLAttributeValue(const QGLAttributeDescription& description, const void *data, int count = 0);
- QGLAttributeValue(const QGLAttributeDescription& description, int offset, int count = 0);
-
- bool isNull() const;
-
- QGLAttributeDescription description(QGL::VertexAttribute attribute) const;
- GLenum type() const;
- int sizeOfType() const;
- int tupleSize() const;
- int stride() const;
- const void *data() const;
- int count() const;
-
-private:
- int m_tupleSize;
- GLenum m_type;
- int m_stride;
- const void *m_data;
- int m_count;
-
- void setStride(int stride) { m_stride = stride; }
- void setOffset(int offset)
- { m_data = reinterpret_cast<const void *>(offset); }
-
- friend class QGLVertexBundle;
-};
-
-inline QGLAttributeValue::QGLAttributeValue()
- : m_tupleSize(0), m_type(GL_FLOAT), m_stride(0), m_data(0), m_count(0)
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue(const QArray<float>& array)
- : m_tupleSize(1), m_type(GL_FLOAT), m_stride(0)
- , m_data(array.constData()), m_count(array.count())
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue(const QArray<QVector2D>& array)
- : m_tupleSize(2), m_type(GL_FLOAT), m_stride(0)
- , m_data(array.constData()), m_count(array.count())
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue(const QArray<QVector3D>& array)
- : m_tupleSize(3), m_type(GL_FLOAT), m_stride(0)
- , m_data(array.constData()), m_count(array.count())
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue(const QArray<QVector4D>& array)
- : m_tupleSize(4), m_type(GL_FLOAT), m_stride(0)
- , m_data(array.constData()), m_count(array.count())
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue(const QArray<QColor4ub>& array)
- : m_tupleSize(4), m_type(GL_UNSIGNED_BYTE), m_stride(0)
- , m_data(array.constData()), m_count(array.count())
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue
- (int tupleSize, GLenum type, int stride, const void *data, int count)
- : m_tupleSize(tupleSize), m_type(type), m_stride(stride)
- , m_data(data), m_count(count)
-{
- Q_ASSERT(tupleSize >= 1 && tupleSize <= 4);
-}
-
-inline QGLAttributeValue::QGLAttributeValue
- (int tupleSize, GLenum type, int stride, int offset, int count)
- : m_tupleSize(tupleSize), m_type(type), m_stride(stride)
- , m_data(reinterpret_cast<const void *>(offset)), m_count(count)
-{
- Q_ASSERT(tupleSize >= 1 && tupleSize <= 4);
-}
-
-inline QGLAttributeValue::QGLAttributeValue
- (const QGLAttributeDescription& description, const void *data, int count)
- : m_tupleSize(description.tupleSize()), m_type(description.type())
- , m_stride(description.stride()), m_data(data), m_count(count)
-{
-}
-
-inline QGLAttributeValue::QGLAttributeValue
- (const QGLAttributeDescription& description, int offset, int count)
- : m_tupleSize(description.tupleSize()), m_type(description.type())
- , m_stride(description.stride())
- , m_data(reinterpret_cast<const void *>(offset))
- , m_count(count)
-{
-}
-
-inline bool QGLAttributeValue::isNull() const
-{
- return m_tupleSize == 0;
-}
-
-inline QGLAttributeDescription QGLAttributeValue::description(QGL::VertexAttribute attribute) const
-{
- if (!isNull()) {
- return QGLAttributeDescription(attribute, m_tupleSize, m_type, m_stride);
- } else {
- QGLAttributeDescription desc;
- desc.setAttribute(attribute);
- return desc;
- }
-}
-
-inline GLenum QGLAttributeValue::type() const
-{
- return m_type;
-}
-
-inline int QGLAttributeValue::tupleSize() const
-{
- return m_tupleSize;
-}
-
-inline int QGLAttributeValue::stride() const
-{
- return m_stride;
-}
-
-inline const void *QGLAttributeValue::data() const
-{
- return m_data;
-}
-
-inline int QGLAttributeValue::count() const
-{
- return m_count;
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglindexbuffer.cpp b/src/gui/extern/Qt3D/arrays/qglindexbuffer.cpp
deleted file mode 100644
index 3142b0423507f69266610261b4dc30a4374c176a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglindexbuffer.cpp
+++ /dev/null
@@ -1,777 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglindexbuffer.h"
-#include "qglpainter.h"
-#include "qglpainter_p.h"
-#include "qglext_p.h"
-#include <QtOpenGL/qgl.h>
-#include <QtCore/qatomic.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLIndexBuffer
- \brief The QGLIndexBuffer class manages uploading of index arrays into a GL server.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-*/
-
-#ifdef QT_OPENGL_ES
-
-static bool qt_has_uint_buffers()
-{
- static bool done = false;
- static bool answer = false;
- if (!done) {
- QGLExtensionChecker extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
- answer = extensions.match("GL_OES_element_index_uint");
- done = true;
- }
- return answer;
-}
-
-#endif
-
-class QGLIndexBufferPrivate
-{
-public:
- QGLIndexBufferPrivate()
- : indexCount(0)
- , elementType(GL_UNSIGNED_SHORT)
- , buffer(QGLBuffer::IndexBuffer)
-#ifdef QT_OPENGL_ES
- , hasIntBuffers(qt_has_uint_buffers())
-#else
- , hasIntBuffers(true)
-#endif
- {
- ref = 1;
- }
-
- QBasicAtomicInt ref;
- int indexCount;
- QArray<ushort> indexesShort;
- QArray<uint> indexesInt;
- GLenum elementType;
- QGLBuffer buffer;
- bool hasIntBuffers;
-
- void append(const QGLIndexBufferPrivate *other, uint offset, int start);
- uint headIndex(int posn) const;
- uint tailIndex(int posn) const;
-};
-
-/*!
- Creates a new index buffer.
-*/
-QGLIndexBuffer::QGLIndexBuffer()
- : d_ptr(new QGLIndexBufferPrivate)
-{
-}
-
-/*!
- Creates a copy of \a other. Note that this just copies a reference
- to the index buffer. Any modifications to the copy will also
- affect the original object.
-*/
-QGLIndexBuffer::QGLIndexBuffer(const QGLIndexBuffer& other)
- : d_ptr(other.d_ptr)
-{
- d_ptr->ref.ref();
-}
-
-/*!
- Destroys this index buffer if this object is the last reference to it.
-*/
-QGLIndexBuffer::~QGLIndexBuffer()
-{
- if (!d_ptr->ref.deref())
- delete d_ptr;
-}
-
-/*!
- Assigns \a other to this object. Note that this just assigns a
- reference to the \a other index buffer. Any modifications to this
- object will also affect \a other.
-*/
-QGLIndexBuffer& QGLIndexBuffer::operator=(const QGLIndexBuffer& other)
-{
- if (d_ptr != other.d_ptr) {
- if (!d_ptr->ref.deref())
- delete d_ptr;
- d_ptr = other.d_ptr;
- d_ptr->ref.ref();
- }
- return *this;
-}
-
-/*!
- Returns the indexes in this buffer as an array of ushort values.
-
- Returns an empty array if type() is not \c GL_UNSIGNED_SHORT or the
- buffer has already been uploaded.
-*/
-QArray<ushort> QGLIndexBuffer::indexesUShort() const
-{
- Q_D(const QGLIndexBuffer);
- return d->indexesShort;
-}
-
-/*!
- Returns the indexes in this buffer as an array of uint values.
-
- Returns an empty array if type() is not \c GL_UNSIGNED_INT or the
- buffer has already been uploaded.
-*/
-QArray<uint> QGLIndexBuffer::indexesUInt() const
-{
- Q_D(const QGLIndexBuffer);
- return d->indexesInt;
-}
-
-/*!
- Returns the usage pattern for this index buffer.
- The default value is QGLBuffer::StaticDraw.
-
- \sa setUsagePattern()
-*/
-QGLBuffer::UsagePattern QGLIndexBuffer::usagePattern() const
-{
- Q_D(const QGLIndexBuffer);
- return d->buffer.usagePattern();
-}
-
-/*!
- Sets the usage pattern for this index buffer to \a value.
- This function must be called before upload() for the \a value
- to take effect.
-
- \sa usagePattern(), upload()
-*/
-void QGLIndexBuffer::setUsagePattern(QGLBuffer::UsagePattern value)
-{
- Q_D(QGLIndexBuffer);
- d->buffer.setUsagePattern(value);
-}
-
-static QArray<ushort> qt_qarray_uint_to_ushort(const QArray<uint> &array)
-{
- QArray<ushort> result;
- const uint *values = array.constData();
- int size = array.size();
- bool largeValue = false;
- result.reserve(size);
- while (size-- > 0) {
- uint value = *values++;
- if (ushort(value) != value)
- largeValue = true;
- result.append(ushort(value));
- }
- if (largeValue)
- qWarning("QGLIndexBuffer::setIndexes: large 32-bit value provided to a 16-bit only buffer");
- return result;
-}
-
-/*!
- Sets the index \a values in this index buffer, replacing the
- entire current contents.
-
- If the index buffer has been uploaded to the GL server, then this
- function must be called with a current GL context that is compatible
- with the uploaded buffer.
-
- \sa replaceIndexes()
-*/
-void QGLIndexBuffer::setIndexes(const QArray<ushort>& values)
-{
- Q_D(QGLIndexBuffer);
- if (d->buffer.isCreated()) {
- d->buffer.bind();
- d->buffer.allocate(values.constData(), values.size() * sizeof(ushort));
- d->buffer.release();
- // The element type may have changed from int to ushort.
- d->elementType = GL_UNSIGNED_SHORT;
- } else {
- d->indexesShort = values;
- d->elementType = GL_UNSIGNED_SHORT;
- d->indexesInt = QArray<uint>();
- }
- d->indexCount = values.size();
-}
-
-/*!
- Sets the index \a values in this index buffer, replacing the
- entire current contents.
-
- If the index buffer has been uploaded to the GL server, then this
- function must be called with a current GL context that is compatible
- with the uploaded buffer.
-
- OpenGL/ES systems usually do not support 32-bit index values unless
- they have a special extension for that purpose. On systems without
- 32-bit index values, this function will need to convert all values
- to 16-bit which may incur a performance penalty and lose information.
-
- \sa replaceIndexes()
-*/
-void QGLIndexBuffer::setIndexes(const QArray<uint>& values)
-{
- Q_D(QGLIndexBuffer);
- if (d->buffer.isCreated()) {
- if (d->hasIntBuffers) {
- d->buffer.bind();
- d->buffer.allocate(values.constData(), values.size() * sizeof(int));
- d->buffer.release();
- // The element type may have changed from ushort to int.
- d->elementType = GL_UNSIGNED_INT;
- } else {
- QArray<ushort> svalues = qt_qarray_uint_to_ushort(values);
- d->buffer.bind();
- d->buffer.allocate(svalues.constData(), svalues.size() * sizeof(ushort));
- d->buffer.release();
- }
- } else if (d->hasIntBuffers) {
- d->indexesInt = values;
- d->elementType = GL_UNSIGNED_INT;
- d->indexesShort = QArray<ushort>();
- } else {
- d->indexesShort = qt_qarray_uint_to_ushort(values);
- d->elementType = GL_UNSIGNED_SHORT;
- d->indexesInt = QArray<uint>();
- }
- d->indexCount = values.size();
-}
-
-/*!
- Replaces the elements of this index buffer, starting at \a index,
- with the contents of \a values. All other elements keep their
- current values.
-
- If the index buffer has been uploaded to the GL server, then this
- function must be called with a current GL context that is compatible
- with the uploaded buffer.
-
- The index buffer must have been originally created with the
- ushort element type.
-
- \sa setIndexes()
-*/
-void QGLIndexBuffer::replaceIndexes(int index, const QArray<ushort>& values)
-{
- Q_D(QGLIndexBuffer);
- Q_ASSERT_X(d->elementType == GL_UNSIGNED_SHORT,
- "QGLIndexBuffer::replaceIndexes()",
- "buffer created with int element type, replacing with ushort");
- if (d->elementType != GL_UNSIGNED_SHORT)
- return;
- if (d->buffer.isCreated()) {
- d->buffer.bind();
- d->buffer.write(index * sizeof(ushort),
- values.constData(), values.size() * sizeof(ushort));
- d->buffer.release();
- } else {
- d->indexesShort.replace(index, values.constData(), values.size());
- d->indexCount = d->indexesShort.size();
- }
-}
-
-/*!
- Replaces the elements of this index buffer, starting at \a index,
- with the contents of \a values. All other elements keep their
- current values.
-
- If the index buffer has been uploaded to the GL server, then this
- function must be called with a current GL context that is compatible
- with the uploaded buffer.
-
- The index buffer must have been originally created with the
- int element type.
-
- OpenGL/ES systems usually do not support 32-bit index values unless
- they have a special extension for that purpose. On systems without
- 32-bit index values, this function will need to convert all values
- to 16-bit which may incur a performance penalty and lose information.
-
- \sa setIndexes()
-*/
-void QGLIndexBuffer::replaceIndexes(int index, const QArray<uint>& values)
-{
- Q_D(QGLIndexBuffer);
- Q_ASSERT_X(d->elementType == GL_UNSIGNED_INT || !d->hasIntBuffers,
- "QGLIndexBuffer::replaceIndexes()",
- "buffer created with ushort element type, replacing with int");
- if (d->elementType != GL_UNSIGNED_INT && d->hasIntBuffers)
- return;
- if (d->buffer.isCreated()) {
- if (d->hasIntBuffers) {
- d->buffer.bind();
- d->buffer.write(index * sizeof(int),
- values.constData(), values.size() * sizeof(int));
- d->buffer.release();
- } else {
- QArray<ushort> svalues = qt_qarray_uint_to_ushort(values);
- d->buffer.bind();
- d->buffer.write(index * sizeof(ushort),
- svalues.constData(),
- svalues.size() * sizeof(ushort));
- d->buffer.release();
- }
- } else if (d->elementType == GL_UNSIGNED_INT) {
- d->indexesInt.replace(index, values.constData(), values.size());
- d->indexCount = d->indexesInt.size();
- } else {
- QArray<ushort> svalues = qt_qarray_uint_to_ushort(values);
- d->indexesShort.replace(index, svalues.constData(), svalues.size());
- d->indexCount = d->indexesShort.size();
- }
-}
-
-/*!
- Returns the element type for this index buffer, \c{GL_UNSIGNED_SHORT}
- or \c{GL_UNSIGNED_INT}.
-*/
-GLenum QGLIndexBuffer::elementType() const
-{
- Q_D(const QGLIndexBuffer);
- return d->elementType;
-}
-
-/*!
- Returns the number of indexes in this index buffer.
-*/
-int QGLIndexBuffer::indexCount() const
-{
- Q_D(const QGLIndexBuffer);
- return d->indexCount;
-}
-
-/*!
- \fn bool QGLIndexBuffer::isEmpty() const
-
- Returns true if indexCount() is zero; false otherwise.
-*/
-
-/*!
- Uploads the index data specified by a previous setIndexes()
- call into the GL server as an index buffer object.
-
- Returns true if the data could be uploaded; false if index buffer
- objects are not supported or there is insufficient memory to complete
- the request. Returns true if the data was already uploaded.
-
- Once the index data has been uploaded, the client-side copies of
- the data arrays will be released. If the index data could not be
- uploaded, then it is retained client-side. This way, regardless of
- whether the data could be uploaded or not, QGLPainter::draw() can
- be used to support drawing of primitives using this object.
-
- \sa isUploaded(), setIndexes(), QGLPainter::draw()
-*/
-bool QGLIndexBuffer::upload()
-{
- Q_D(QGLIndexBuffer);
- if (d->buffer.isCreated())
- return true;
- if (!d->buffer.create())
- return false;
- d->buffer.bind();
- if (d->elementType == GL_UNSIGNED_SHORT) {
- d->buffer.allocate(d->indexesShort.constData(),
- d->indexesShort.size() * sizeof(ushort));
- d->indexesShort = QArray<ushort>();
- } else {
- d->buffer.allocate(d->indexesInt.constData(),
- d->indexesInt.size() * sizeof(int));
- d->indexesInt = QArray<uint>();
- }
- d->buffer.release();
- return true;
-}
-
-/*!
- Returns true if the index data specified by previous a setIndexes()
- call has been uploaded into the GL server; false otherwise.
-
- \sa upload(), setIndexes()
-*/
-bool QGLIndexBuffer::isUploaded() const
-{
- Q_D(const QGLIndexBuffer);
- return d->buffer.isCreated();
-}
-
-/*!
- Returns the QGLBuffer in use by this index buffer object,
- so that its properties or contents can be modified directly.
-
- \sa isUploaded()
-*/
-QGLBuffer QGLIndexBuffer::buffer() const
-{
- Q_D(const QGLIndexBuffer);
- return d->buffer;
-}
-
-/*!
- Binds this index buffer to the current GL context. Returns false if
- binding was not possible, usually because upload() has not been called.
-
- The buffer must be bound to the same QGLContext current when upload()
- was called, or to another QGLContext that is sharing with it.
- Otherwise, false will be returned from this function.
-
- \sa release(), upload()
-*/
-bool QGLIndexBuffer::bind()
-{
- Q_D(QGLIndexBuffer);
- return d->buffer.bind();
-}
-
-/*!
- Releases this index buffer from the current GL context.
-
- This function must be called with the same QGLContext current
- as when bind() was called on the index buffer.
-
- \sa bind()
-*/
-void QGLIndexBuffer::release()
-{
- Q_D(QGLIndexBuffer);
- d->buffer.release();
-}
-
-void QGLIndexBufferPrivate::append
- (const QGLIndexBufferPrivate *other, uint offset, int start)
-{
- if (elementType == GL_UNSIGNED_SHORT &&
- other->elementType == GL_UNSIGNED_SHORT) {
- // Both buffers are ushort.
- const ushort *data = other->indexesShort.constData() + start;
- int count = other->indexesShort.count() - start;
- indexesShort.reserve(indexesShort.count() + count);
- indexCount += count;
- while (count-- > 0)
- indexesShort.append(ushort(*data++ + offset));
- } else if (elementType == GL_UNSIGNED_SHORT) {
- // Only first buffer is ushort: convert it to int first.
- const ushort *indexes = indexesShort.constData();
- int count = indexesShort.count();
- indexesInt.reserve(count + other->indexesInt.count());
- while (count-- > 0)
- indexesInt.append(*indexes++);
- indexesShort = QArray<ushort>();
- elementType = GL_UNSIGNED_INT;
- const uint *data = other->indexesInt.constData() + start;
- count = other->indexesInt.count() - start;
- indexCount += count;
- while (count-- > 0)
- indexesInt.append(*data++ + offset);
- } else if (other->elementType == GL_UNSIGNED_SHORT) {
- // Only second buffer is ushort.
- const ushort *data = other->indexesShort.constData() + start;
- int count = other->indexesShort.count() - start;
- indexesInt.reserve(indexesInt.count() + count);
- indexCount += count;
- while (count-- > 0)
- indexesInt.append(*data++ + offset);
- } else {
- // Neither buffer is ushort.
- const uint *data = other->indexesInt.constData() + start;
- int count = other->indexesInt.count() - start;
- indexesInt.reserve(indexesInt.count() + count);
- indexCount += count;
- while (count-- > 0)
- indexesInt.append(*data++ + offset);
- }
-}
-
-uint QGLIndexBufferPrivate::headIndex(int posn) const
-{
- if (indexCount <= posn)
- return uint(-1);
- if (elementType == GL_UNSIGNED_SHORT)
- return indexesShort[posn];
- else
- return indexesInt[posn];
-}
-
-uint QGLIndexBufferPrivate::tailIndex(int posn) const
-{
- if (indexCount <= posn)
- return uint(-1);
- if (elementType == GL_UNSIGNED_SHORT)
- return indexesShort[indexCount - posn - 1];
- else
- return indexesInt[indexCount - posn - 1];
-}
-
-/*!
- Appends the contents of \a buffer to this index buffer and adds
- \a offset to all of the entries in \a buffer.
-
- This function is typically used to combine multiple geometry meshes
- into a single mesh that can be bound as a single buffer.
-
- The request is ignored if this index buffer or \a buffer have already
- been uploaded, or \a buffer is this index buffer.
-
- \sa isUploaded(), setIndexes()
-*/
-void QGLIndexBuffer::append(const QGLIndexBuffer &buffer, uint offset)
-{
- Q_D(QGLIndexBuffer);
- const QGLIndexBufferPrivate *dbuf = buffer.d_ptr;
-
- // Bail out if the buffers are uploaded or identical.
- if (d->buffer.isCreated() || dbuf->buffer.isCreated())
- return;
- if (d == dbuf)
- return;
-
- // Append the two index arrays.
- d->append(dbuf, offset, 0);
-}
-
-/*!
- Appends the contents of \a buffer to this index buffer and adds
- \a offset to all of the entries in \a buffer.
-
- The two buffers will be merged at the join point according to
- \a combineMode. For example, if \a combineMode is QGL::TriangleStrip,
- then the result will be a single triangle strip. Indexes are
- dropped from the front of \a buffer as necessary to correctly
- merge the buffers.
-
- This function is typically used to combine multiple geometry meshes
- into a single mesh that can be bound as a single buffer.
-
- The request is ignored if this index buffer or \a buffer have already
- been uploaded, or \a buffer is this index buffer.
-
- \sa isUploaded(), setIndexes()
-*/
-void QGLIndexBuffer::append
- (const QGLIndexBuffer &buffer, uint offset, QGL::DrawingMode combineMode)
-{
- Q_D(QGLIndexBuffer);
- const QGLIndexBufferPrivate *dbuf = buffer.d_ptr;
-
- // Bail out if the buffers are uploaded or identical.
- if (d->buffer.isCreated() || dbuf->buffer.isCreated())
- return;
- if (d == dbuf)
- return;
-
- // Determine how to combine the buffers.
- switch (int(combineMode)) {
- case QGL::Points:
- case QGL::Lines:
- case QGL::Triangles:
- case QGL::LinesAdjacency:
- case QGL::TrianglesAdjacency:
- case 0x0007: // GL_QUADS
- // These can be done by just appending the raw data with no changes.
- d->append(dbuf, offset, 0);
- break;
-
- case QGL::LineLoop:
- case QGL::LineStrip:
- case 0x0009: // GL_POLYGON
- // Join the last index of the first buffer to the first
- // index of the second buffer to continue the loop or strip.
- if (d->tailIndex(0) == (dbuf->headIndex(0) + offset))
- d->append(dbuf, offset, 1);
- else
- d->append(dbuf, offset, 0);
- break;
-
- case QGL::TriangleStrip:
- // Join the last two indexes of the first buffer to the first
- // two indexes of the second buffer to continue the strip.
- // It is possible that the first two indexes of the second
- // buffer may be reversed for strip continuation depending
- // upon whether the first strip is odd or even in length.
- if (d->tailIndex(1) == (dbuf->headIndex(0) + offset) &&
- d->tailIndex(0) == (dbuf->headIndex(1) + offset))
- d->append(dbuf, offset, 2);
- else if (d->tailIndex(1) == (dbuf->headIndex(1) + offset) &&
- d->tailIndex(0) == (dbuf->headIndex(0) + offset))
- d->append(dbuf, offset, 2);
- else
- d->append(dbuf, offset, 0);
- break;
-
- case 0x0008: // GL_QUAD_STRIP
- // Join the last two indexes of the first buffer to the first
- // two indexes of the second buffer to continue the strip.
- if (d->tailIndex(1) == (dbuf->headIndex(0) + offset) &&
- d->tailIndex(0) == (dbuf->headIndex(1) + offset))
- d->append(dbuf, offset, 2);
- else
- d->append(dbuf, offset, 0);
- break;
-
- case QGL::TriangleFan:
- // The first index of both buffers should be the same, and the
- // last index of the first buffer should be the same as the second
- // index of the second buffer.
- if (d->headIndex(0) == (dbuf->headIndex(0) + offset) &&
- d->tailIndex(0) == (dbuf->headIndex(1) + offset))
- d->append(dbuf, offset, 2);
- else
- d->append(dbuf, offset, 0);
- break;
-
- case QGL::LineStripAdjacency:
- // Join the last three indexes of the first buffer to the first
- // three indexes of the second buffer to continue the strip.
- if (d->tailIndex(2) == (dbuf->headIndex(0) + offset) &&
- d->tailIndex(1) == (dbuf->headIndex(1) + offset) &&
- d->tailIndex(0) == (dbuf->headIndex(2) + offset))
- d->append(dbuf, offset, 3);
- else
- d->append(dbuf, offset, 0);
- break;
-
- case QGL::TriangleStripAdjacency:
- // Fourth last and second last of first buffer need to be the
- // same as the first and third of the second buffer.
- if (d->tailIndex(3) == (dbuf->headIndex(0) + offset) &&
- d->tailIndex(1) == (dbuf->headIndex(2) + offset))
- d->append(dbuf, offset, 4);
- else
- d->append(dbuf, offset, 0);
- break;
-
- default:
- qWarning("QGLIndexBuffer::append: unknown drawing mode 0x%04x",
- int(combineMode));
- break;
- }
-}
-
-/*!
- \overload
-
- Draws primitives using vertices from the arrays specified by
- setVertexAttribute(). The type of primitive to draw is
- specified by \a mode.
-
- This operation will consume all of the elements of \a indexes,
- which are used to index into the enabled arrays.
-
- If \a indexes has not been uploaded to the GL server as an index
- buffer, then this function will draw using a client-side array.
-
- \sa update(), QGLIndexBuffer::upload()
-*/
-void QGLPainter::draw(QGL::DrawingMode mode, const QGLIndexBuffer& indexes)
-{
- QGLIndexBufferPrivate *d = const_cast<QGLIndexBufferPrivate *>(indexes.d_func());
- update();
- GLuint id = d->buffer.bufferId();
- if (id != d_ptr->boundIndexBuffer) {
- if (id)
- d->buffer.bind();
- else
- QGLBuffer::release(QGLBuffer::IndexBuffer);
- d_ptr->boundIndexBuffer = id;
- }
- if (id) {
- glDrawElements(GLenum(mode), d->indexCount, d->elementType, 0);
- } else if (d->elementType == GL_UNSIGNED_SHORT) {
- glDrawElements(GLenum(mode), d->indexCount, GL_UNSIGNED_SHORT,
- d->indexesShort.constData());
- } else {
- glDrawElements(GLenum(mode), d->indexCount, GL_UNSIGNED_INT,
- d->indexesInt.constData());
- }
-}
-
-/*!
- \overload
-
- Draws primitives using vertices from the arrays specified by
- setVertexAttribute(). The type of primitive to draw is
- specified by \a mode.
-
- This operation will consume \a count elements of \a indexes,
- starting at \a offset, which are used to index into the enabled arrays.
-
- If \a indexes has not been uploaded to the GL server as an index
- buffer, then this function will draw using a client-side array.
-
- \sa update(), QGLIndexBuffer::upload()
-*/
-void QGLPainter::draw(QGL::DrawingMode mode, const QGLIndexBuffer& indexes, int offset, int count)
-{
- QGLIndexBufferPrivate *d = const_cast<QGLIndexBufferPrivate *>(indexes.d_func());
- update();
- GLuint id = d->buffer.bufferId();
- if (id != d_ptr->boundIndexBuffer) {
- if (id)
- d->buffer.bind();
- else
- QGLBuffer::release(QGLBuffer::IndexBuffer);
- d_ptr->boundIndexBuffer = id;
- }
- if (id) {
- if (d->elementType == GL_UNSIGNED_SHORT) {
- glDrawElements(GLenum(mode), count, GL_UNSIGNED_SHORT,
- reinterpret_cast<const void *>(offset * sizeof(ushort)));
- } else {
- glDrawElements(GLenum(mode), count, GL_UNSIGNED_INT,
- reinterpret_cast<const void *>(offset * sizeof(int)));
- }
- } else if (d->elementType == GL_UNSIGNED_SHORT) {
- glDrawElements(GLenum(mode), count, GL_UNSIGNED_SHORT,
- d->indexesShort.constData() + offset);
- } else {
- glDrawElements(GLenum(mode), count, GL_UNSIGNED_INT,
- d->indexesInt.constData() + offset);
- }
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qglindexbuffer.h b/src/gui/extern/Qt3D/arrays/qglindexbuffer.h
deleted file mode 100644
index 68a1d3cd26d4c0eb28d6b31cf55576fa1d958671..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglindexbuffer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLINDEXBUFFER_H
-#define QGLINDEXBUFFER_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtOpenGL/qglbuffer.h>
-#include "qglnamespace.h"
-#include "qarray.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLIndexBufferPrivate;
-class QGLPainter;
-
-class Q_QT3D_EXPORT QGLIndexBuffer
-{
-public:
- QGLIndexBuffer();
- QGLIndexBuffer(const QGLIndexBuffer& other);
- ~QGLIndexBuffer();
-
- QGLIndexBuffer& operator=(const QGLIndexBuffer& other);
-
- QGLBuffer::UsagePattern usagePattern() const;
- void setUsagePattern(QGLBuffer::UsagePattern value);
-
- QArray<ushort> indexesUShort() const;
- QArray<uint> indexesUInt() const;
-
- void setIndexes(const QArray<ushort>& values);
- void setIndexes(const QArray<uint>& values);
-
- void replaceIndexes(int index, const QArray<ushort>& values);
- void replaceIndexes(int index, const QArray<uint>& values);
-
- GLenum elementType() const;
-
- int indexCount() const;
- bool isEmpty() const { return indexCount() == 0; }
-
- bool upload();
- bool isUploaded() const;
-
- QGLBuffer buffer() const;
-
- bool bind();
- void release();
-
- void append(const QGLIndexBuffer &buffer, uint offset);
- void append(const QGLIndexBuffer &buffer, uint offset, QGL::DrawingMode combineMode);
-
-private:
- QGLIndexBufferPrivate *d_ptr;
-
- Q_DECLARE_PRIVATE(QGLIndexBuffer)
-
- friend class QGLPainter;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglvertexbundle.cpp b/src/gui/extern/Qt3D/arrays/qglvertexbundle.cpp
deleted file mode 100644
index 3515f36e66a4fa384be67c46128e3ea3d4167a4f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglvertexbundle.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglvertexbundle.h"
-#include "qglvertexbundle_p.h"
-#include "qglabstracteffect.h"
-#include <QtCore/qlist.h>
-#include <QtCore/qatomic.h>
-#include <QtOpenGL/qglshaderprogram.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLVertexBundle
- \brief The QGLVertexBundle class bundles vertex attribute arrays for efficient uploading into a GL server.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QGLVertexBundle provides an implementation of a static vertex
- buffer, where the vertex attributes are supplied once at construction
- time and then never modified until the bundle is destroyed.
- When the vertex attributes are sent ot the GL server by upload(),
- they may be repacked for greater drawing efficiency.
-
- For general-purpose vertex buffers that can be allocated and modified
- in-place, use QGLBuffer instead.
-*/
-
-/*!
- Constructs a new vertex bundle.
-*/
-QGLVertexBundle::QGLVertexBundle()
- : d_ptr(new QGLVertexBundlePrivate())
-{
-}
-
-/*!
- Creates a copy of \a other. Note that this just copies a reference
- to the vertex bundle. Any modifications to the copy will also
- affect the original object.
-*/
-QGLVertexBundle::QGLVertexBundle(const QGLVertexBundle& other)
- : d_ptr(other.d_ptr)
-{
- d_ptr->ref.ref();
-}
-
-/*!
- Destroys this vertex bundle if this object is the last reference to it.
-*/
-QGLVertexBundle::~QGLVertexBundle()
-{
- if (!d_ptr->ref.deref())
- delete d_ptr;
-}
-
-/*!
- Assigns \a other to this object. Note that this just assigns a
- reference to the \a other vertex bundle. Any modifications to this
- object will also affect \a other.
-*/
-QGLVertexBundle& QGLVertexBundle::operator=(const QGLVertexBundle& other)
-{
- if (d_ptr != other.d_ptr) {
- if (!d_ptr->ref.deref())
- delete d_ptr;
- d_ptr = other.d_ptr;
- d_ptr->ref.ref();
- }
- return *this;
-}
-
-/*!
- Adds the floating-point array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QArray<float>& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleFloatAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-/*!
- Adds the 2D vector array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QArray<QVector2D>& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleVector2DAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-/*!
- Adds the 3D vector array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QArray<QVector3D>& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleVector3DAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-/*!
- Adds the 4D vector array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QArray<QVector4D>& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleVector4DAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-/*!
- Adds the color array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QArray<QColor4ub>& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleColorAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-/*!
- Adds the custom data array \a value to this vertex bundle as the
- data for \a attribute.
-
- \sa upload()
-*/
-void QGLVertexBundle::addAttribute
- (QGL::VertexAttribute attribute, const QCustomDataArray& value)
-{
- Q_D(QGLVertexBundle);
- if (!d->buffer.isCreated()) {
- d->attributeSet.insert(attribute);
- d->attributes +=
- new QGLVertexBundleCustomAttribute(attribute, value);
- d->vertexCount = qMax(d->vertexCount, value.count());
- }
-}
-
-// Interleave a source array into a destination array.
-static void vertexBufferInterleave
- (float *dst, int dstStride, const float *src, int srcStride, int count)
-{
- switch (srcStride) {
- case 1:
- while (count-- > 0) {
- dst[0] = src[0];
- ++src;
- dst += dstStride;
- }
- break;
- case 2:
- while (count-- > 0) {
- dst[0] = src[0];
- dst[1] = src[1];
- src += 2;
- dst += dstStride;
- }
- break;
- case 3:
- while (count-- > 0) {
- dst[0] = src[0];
- dst[1] = src[1];
- dst[2] = src[2];
- src += 3;
- dst += dstStride;
- }
- break;
- case 4:
- while (count-- > 0) {
- dst[0] = src[0];
- dst[1] = src[1];
- dst[2] = src[2];
- dst[3] = src[3];
- src += 4;
- dst += dstStride;
- }
- break;
- default:
- while (count-- > 0) {
- for (int component = 0; component < srcStride; ++component)
- dst[component] = src[component];
- src += srcStride;
- dst += dstStride;
- }
- break;
- }
-}
-
-/*!
- Returns the set of attributes that are present in this vertex bundle.
-*/
-QGLAttributeSet QGLVertexBundle::attributes() const
-{
- Q_D(const QGLVertexBundle);
- return d->attributeSet;
-}
-
-/*!
- Returns the raw attribute value associated with \a attribute in
- this vertex bundle; null if \a attribute does not exist in the
- vertex bundle.
-
- If isUploaded() is true, then the returned value will contain a
- buffer offset to the attribute. If isUploaded() is false,
- then the returned value will contain a client-side data pointer
- to the attribute.
-
- \sa addAttribute()
-*/
-QGLAttributeValue QGLVertexBundle::attributeValue(QGL::VertexAttribute attribute) const
-{
- Q_D(const QGLVertexBundle);
- QGLVertexBundleAttribute *attr = 0;
- int attrIndex;
- for (attrIndex = 0; attrIndex < d->attributes.size(); ++attrIndex) {
- attr = d->attributes[attrIndex];
- if (attr->attribute == attribute)
- return attr->value;
- }
- return QGLAttributeValue();
-}
-
-/*!
- Returns the number of vertices that were defined by previous
- called to addAttribute().
-
- \sa addAttribute()
-*/
-int QGLVertexBundle::vertexCount() const
-{
- Q_D(const QGLVertexBundle);
- return d->vertexCount;
-}
-
-/*!
- \fn bool QGLVertexBundle::isEmpty() const
-
- Returns true if vertexCount() is zero; false otherwise.
-*/
-
-/*!
- Uploads the vertex data specified by previous addAttribute()
- calls into the GL server as a vertex buffer object.
-
- Returns true if the data could be uploaded; false if vertex buffer
- objects are not supported or there is insufficient memory to complete
- the request. Returns true if the data was already uploaded.
-
- Once the vertex data has been uploaded, the client-side copies of
- the data arrays will be released. If the vertex data could not be
- uploaded, then it is retained client-side. This way, regardless of
- whether the data could be uploaded or not, QGLPainter::setVertexBundle()
- can be used to support drawing of primitives using this object.
-
- \sa isUploaded(), addAttribute(), QGLPainter::setVertexBundle()
-*/
-bool QGLVertexBundle::upload()
-{
- Q_D(QGLVertexBundle);
- QGLVertexBundleAttribute *attr;
-
- // Nothing to do if already uploaded or there are no attributes.
- if (d->buffer.isCreated())
- return true;
- if (d->attributes.isEmpty())
- return false;
-
- // Create the VBO in the GL server and bind it.
- if (!d->buffer.create())
- return false;
- d->buffer.bind();
-
- // If there is only one attribute, then realloc and write in one step.
- if (d->attributes.size() == 1) {
- attr = d->attributes[0];
- d->buffer.allocate(attr->value.data(),
- attr->count() * attr->elementSize());
- attr->value.setOffset(0);
- attr->clear();
- d->buffer.release();
- return true;
- }
-
- // Calculate the total size of the VBO that we will need,
- // the maximum number of interleaved vertices, and the
- // interleaved stride.
- int size = 0;
- int stride = 0;
- int maxCount = 0;
- for (int index = 0; index < d->attributes.size(); ++index) {
- attr = d->attributes[index];
- int count = attr->count();
- if (count > maxCount)
- maxCount = count;
- int elemSize = attr->elementSize();
- size += count * elemSize;
- stride += elemSize;
- }
- int bufferSize = size;
- d->buffer.allocate(bufferSize);
- stride /= sizeof(float);
-
- // Determine how to upload the data, using a map if possible.
- // Interleave the data into the final buffer. We do it in
- // sections so as to keep locality problems to a minimum.
- void *mapped = d->buffer.map(QGLBuffer::WriteOnly);
- int offset = 0;
- QArray<float> temp;
- float *dst;
- if (mapped)
- dst = reinterpret_cast<float *>(mapped);
- else
- dst = temp.extend(1024);
- int sectionSize = 1024 / stride;
- for (int vertex = 0; vertex < maxCount; vertex += sectionSize) {
- int attrPosn = 0;
- for (int index = 0; index < d->attributes.size(); ++index) {
- attr = d->attributes[index];
- int count = attr->count() - vertex;
- if (count <= 0)
- continue;
- count = qMin(count, sectionSize);
- int components = attr->elementSize() / sizeof(float);
- vertexBufferInterleave
- (dst + attrPosn, stride,
- reinterpret_cast<const float *>(attr->value.data()) +
- vertex * components,
- components, count);
- attrPosn += attr->elementSize() / sizeof(float);
- }
- size = sectionSize * stride;
- if (mapped) {
- dst += size;
- } else {
- size *= sizeof(float);
- if ((offset + size) > bufferSize) // buffer overflow check
- size = bufferSize-offset;
- d->buffer.write(offset, dst, size);
- offset += size;
- }
- }
- offset = 0;
- for (int index = 0; index < d->attributes.size(); ++index) {
- attr = d->attributes[index];
- attr->value.setOffset(offset);
- attr->value.setStride(stride * sizeof(float));
- offset += attr->elementSize();
- attr->clear();
- }
- if (mapped)
- d->buffer.unmap();
-
- // Buffer is uploaded and ready to go.
- d->buffer.release();
- return true;
-}
-
-/*!
- Returns true if the vertex data specified by previous addAttribute()
- calls has been uploaded into the GL server; false otherwise.
-
- \sa upload(), addAttribute()
-*/
-bool QGLVertexBundle::isUploaded() const
-{
- Q_D(const QGLVertexBundle);
- return d->buffer.isCreated();
-}
-
-/*!
- Returns the QGLBuffer in use by this vertex bundle object,
- so that its properties or contents can be modified directly.
-
- \sa isUploaded()
-*/
-QGLBuffer QGLVertexBundle::buffer() const
-{
- Q_D(const QGLVertexBundle);
- return d->buffer;
-}
-
-/*!
- Binds the vertex buffer associated with this bundle to the current GL
- context. Returns false if binding was not possible, usually because
- upload() has not been called.
-
- The buffer must be bound to the same QGLContext current when upload()
- was called, or to another QGLContext that is sharing with it.
- Otherwise, false will be returned from this function.
-
- \sa release(), upload()
-*/
-bool QGLVertexBundle::bind()
-{
- Q_D(QGLVertexBundle);
- return d->buffer.bind();
-}
-
-/*!
- Releases the vertex buffer associated with this bundle from the
- current GL context.
-
- This function must be called with the same QGLContext current
- as when bind() was called on the vertex buffer.
-
- \sa bind()
-*/
-void QGLVertexBundle::release()
-{
- Q_D(QGLVertexBundle);
- d->buffer.release();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qglvertexbundle.h b/src/gui/extern/Qt3D/arrays/qglvertexbundle.h
deleted file mode 100644
index 2e4edd88f5ff454e0b117b848826e55973d0d7fb..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglvertexbundle.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLVERTEXBUNDLE_H
-#define QGLVERTEXBUNDLE_H
-
-#include <QtOpenGL/qglbuffer.h>
-#include "qcustomdataarray.h"
-#include "qglattributevalue.h"
-#include "qglattributeset.h"
-#include <QtCore/qlist.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLVertexBundlePrivate;
-class QGLPainter;
-class QGLAbstractEffect;
-class QGLShaderProgram;
-
-class Q_QT3D_EXPORT QGLVertexBundle
-{
-public:
- QGLVertexBundle();
- QGLVertexBundle(const QGLVertexBundle& other);
- ~QGLVertexBundle();
-
- QGLVertexBundle& operator=(const QGLVertexBundle& other);
-
- void addAttribute(QGL::VertexAttribute attribute,
- const QArray<float>& value);
- void addAttribute(QGL::VertexAttribute attribute,
- const QArray<QVector2D>& value);
- void addAttribute(QGL::VertexAttribute attribute,
- const QArray<QVector3D>& value);
- void addAttribute(QGL::VertexAttribute attribute,
- const QArray<QVector4D>& value);
- void addAttribute(QGL::VertexAttribute attribute,
- const QArray<QColor4ub>& value);
- void addAttribute(QGL::VertexAttribute attribute,
- const QCustomDataArray& value);
-
- QGLAttributeSet attributes() const;
-
- QGLAttributeValue attributeValue(QGL::VertexAttribute attribute) const;
-
- int vertexCount() const;
- bool isEmpty() const { return vertexCount() == 0; }
-
- bool upload();
- bool isUploaded() const;
-
- QGLBuffer buffer() const;
-
- bool bind();
- void release();
-
-private:
- QGLVertexBundlePrivate *d_ptr;
-
- Q_DECLARE_PRIVATE(QGLVertexBundle)
-
- friend class QGLPainter;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qglvertexbundle_p.h b/src/gui/extern/Qt3D/arrays/qglvertexbundle_p.h
deleted file mode 100644
index cddd437d89c2e332c332f72ffa4132a802464bca..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qglvertexbundle_p.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLVERTEXBUNDLE_P_H
-#define QGLVERTEXBUNDLE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglvertexbundle.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleAttribute(QGL::VertexAttribute attr) : attribute(attr) {}
- virtual ~QGLVertexBundleAttribute() {}
-
- virtual void clear() = 0;
- virtual QGLAttributeValue uploadValue() = 0;
- virtual int count() = 0;
- virtual int elementSize() = 0;
-
- QGL::VertexAttribute attribute;
- QGLAttributeValue value;
-};
-
-class QGLVertexBundleFloatAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleFloatAttribute
- (QGL::VertexAttribute attr, const QArray<float>& array)
- : QGLVertexBundleAttribute(attr), floatArray(array)
- {
- value = QGLAttributeValue(floatArray);
- }
-
- void clear() { floatArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(floatArray); }
- int count() { return floatArray.count(); }
- int elementSize() { return sizeof(float); }
-
- QArray<float> floatArray;
-};
-
-class QGLVertexBundleVector2DAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleVector2DAttribute
- (QGL::VertexAttribute attr, const QArray<QVector2D>& array)
- : QGLVertexBundleAttribute(attr), vector2DArray(array)
- {
- value = QGLAttributeValue(vector2DArray);
- }
-
- void clear() { vector2DArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(vector2DArray); }
- int count() { return vector2DArray.count(); }
- int elementSize() { return sizeof(QVector2D); }
-
- QArray<QVector2D> vector2DArray;
-};
-
-class QGLVertexBundleVector3DAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleVector3DAttribute
- (QGL::VertexAttribute attr, const QArray<QVector3D>& array)
- : QGLVertexBundleAttribute(attr), vector3DArray(array)
- {
- value = QGLAttributeValue(vector3DArray);
- }
-
- void clear() { vector3DArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(vector3DArray); }
- int count() { return vector3DArray.count(); }
- int elementSize() { return sizeof(QVector3D); }
-
- QArray<QVector3D> vector3DArray;
-};
-
-class QGLVertexBundleVector4DAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleVector4DAttribute
- (QGL::VertexAttribute attr, const QArray<QVector4D>& array)
- : QGLVertexBundleAttribute(attr), vector4DArray(array)
- {
- value = QGLAttributeValue(vector4DArray);
- }
-
- void clear() { vector4DArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(vector4DArray); }
- int count() { return vector4DArray.count(); }
- int elementSize() { return sizeof(QVector4D); }
-
- QArray<QVector4D> vector4DArray;
-};
-
-class QGLVertexBundleColorAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleColorAttribute
- (QGL::VertexAttribute attr, const QArray<QColor4ub>& array)
- : QGLVertexBundleAttribute(attr), colorArray(array)
- {
- value = QGLAttributeValue(colorArray);
- }
-
- void clear() { colorArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(colorArray); }
- int count() { return colorArray.count(); }
- int elementSize() { return sizeof(QColor4ub); }
-
- QArray<QColor4ub> colorArray;
-};
-
-class QGLVertexBundleCustomAttribute : public QGLVertexBundleAttribute
-{
-public:
- QGLVertexBundleCustomAttribute
- (QGL::VertexAttribute attr, const QCustomDataArray& array)
- : QGLVertexBundleAttribute(attr), customArray(array)
- {
- value = QGLAttributeValue(customArray);
- }
-
- void clear() { customArray.clear(); }
- QGLAttributeValue uploadValue()
- { return QGLAttributeValue(customArray); }
- int count() { return customArray.count(); }
- int elementSize() { return customArray.elementSize(); }
-
- QCustomDataArray customArray;
-};
-
-class QGLVertexBundlePrivate
-{
-public:
- QGLVertexBundlePrivate()
- : buffer(QGLBuffer::VertexBuffer),
- vertexCount(0)
- {
- ref = 1;
- }
- ~QGLVertexBundlePrivate()
- {
- qDeleteAll(attributes);
- }
-
- QBasicAtomicInt ref;
- QGLBuffer buffer;
- QList<QGLVertexBundleAttribute *> attributes;
- int vertexCount;
- QGLAttributeSet attributeSet;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qvector2darray.cpp b/src/gui/extern/Qt3D/arrays/qvector2darray.cpp
deleted file mode 100644
index 4cce0c5c812525a27cf7ec556deabdf7fcbb412c..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector2darray.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qvector2darray.h"
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QVector2DArray
- \brief The QVector2DArray class is a convenience for wrapping a QArray of QVector2D values.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QVector2DArray is used to build an array of 2D vector values
- based on floating-point x and y arguments:
-
- \code
- QVector2DArray array;
- array.append(1.0f, 2.0f);
- array.append(-1.0f, 2.0f);
- array.append(1.0f, -2.0f);
- \endcode
-
- This is more convenient and readable than the equivalent with
- QArray:
-
- \code
- QArray<QVector2D> array;
- array.append(QVector2D(1.0f, 2.0f));
- array.append(QVector2D(-1.0f, 2.0f));
- array.append(QVector2D(1.0f, -2.0f));
- \endcode
-
- QVector2DArray also has convenience functions for transforming
- the contents of the array with translate(), translated(),
- transform(), and transformed().
-
- \sa QArray, QVector3DArray, QVector4DArray
-*/
-
-/*!
- \fn QVector2DArray::QVector2DArray()
-
- Constructs an empty array of QVector2D values.
-*/
-
-/*!
- \fn QVector2DArray::QVector2DArray(int size, const QVector2D& value)
-
- Constructs an array of QVector2D values with an initial \a size.
- All elements in the array are initialized to \a value.
-*/
-
-/*!
- \fn QVector2DArray::QVector2DArray(const QArray<QVector2D>& other)
-
- Constructs a copy of \a other.
-*/
-
-/*!
- \fn void QVector2DArray::append(qreal x, qreal y)
- \overload
-
- Appends (\a x, \a y) to this array of QVector2D values.
-*/
-
-/*!
- \fn void QVector2DArray::append(const QPointF& point)
- \overload
-
- Appends \a point to this array of QVector2D values.
-*/
-
-/*!
- \fn void QVector2DArray::append(const QPoint& point);
- \overload
-
- Appends \a point to this array of QVector2D values.
-*/
-
-/*!
- Multiplies the elements in this array of QVector2D values by
- the \a scale.
-
- \sa scaled()
-*/
-void QVector2DArray::scale(qreal scale)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector2D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ *= scale;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector2D> result;
- int size = count();
- const QVector2D *src = constData();
- QVector2D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector2D values, multiplied
- by the \a scale.
-
- \sa scale()
-*/
-QVector2DArray QVector2DArray::scaled(qreal scale) const
-{
- const qreal identity = 1.0;
- if (qFuzzyCompare(scale, identity))
- return *this;
- QArray<QVector2D> result;
- int size = count();
- const QVector2D *src = constData();
- QVector2D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- return result;
-}
-
-/*!
- Translates the elements in this array of QVector2D values
- by the components of \a value.
-
- \sa translated()
-*/
-void QVector2DArray::translate(const QVector2D& value)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector2D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ += value;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector2D> result;
- int size = count();
- const QVector2D *src = constData();
- QVector2D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- *this = result;
- }
-}
-
-/*!
- \fn void QVector2DArray::translate(qreal x, qreal y)
- \overload
-
- Translates the elements in this array of QVector2D values
- by (\a x, \a y).
-
- \sa translated()
-*/
-
-/*!
- Returns a copy of this array of QVector2D values, translated
- by the components of \a value.
-
- \sa translate()
-*/
-QArray<QVector2D> QVector2DArray::translated(const QVector2D& value) const
-{
- QArray<QVector2D> result;
- int size = count();
- QVector2D *dst = result.extend(size);
- const QVector2D *src = constData();
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- return result;
-}
-
-/*!
- \fn QArray<QVector2D> QVector2DArray::translated(qreal x, qreal y) const
- \overload
-
- Returns a copy of this array of QVector2D values, translated
- by (\a x, \a y).
-
- \sa translate()
-*/
-
-/*!
- Transforms the elements in this array of QVector2D values
- by \a matrix.
-
- \sa transformed()
-*/
-void QVector2DArray::transform(const QMatrix4x4& matrix)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector2D *dst = data();
- for (int index = 0; index < size; ++index) {
- *dst = (matrix * QVector3D(*dst, 0.0f)).toVector2D();
- ++dst;
- }
- } else {
- // Create a new array, transform the values, and assign.
- QArray<QVector2D> result;
- int size = count();
- const QVector2D *src = constData();
- QVector2D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = (matrix * QVector3D(*src++, 0.0f)).toVector2D();
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector2D values,
- transformed by \a matrix.
-
- \sa transform()
-*/
-QArray<QVector2D> QVector2DArray::transformed(const QMatrix4x4& matrix) const
-{
- QArray<QVector2D> result;
- int size = count();
- const QVector2D *src = constData();
- QVector2D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = (matrix * QVector3D(*src++, 0.0f)).toVector2D();
- return result;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qvector2darray.h b/src/gui/extern/Qt3D/arrays/qvector2darray.h
deleted file mode 100644
index 14176a440dc248cc18cfd39d94d0824c0392f65d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector2darray.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QVECTOR2DARRAY_H
-#define QVECTOR2DARRAY_H
-
-#include "qarray.h"
-#include <QtGui/qvector2d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QVector2DArray : public QArray<QVector2D>
-{
-public:
- QVector2DArray();
- QVector2DArray(int size, const QVector2D& value = QVector2D());
- QVector2DArray(const QArray<QVector2D>& other);
-
- void append(qreal x, qreal y);
- void append(const QPointF& point);
- void append(const QPoint& point);
-
- void scale(qreal scale);
- QVector2DArray scaled(qreal scale) const;
-
- void translate(const QVector2D& value);
- void translate(qreal x, qreal y);
-
- QArray<QVector2D> translated(const QVector2D& value) const;
- QArray<QVector2D> translated(qreal x, qreal y) const;
-
- void transform(const QMatrix4x4& matrix);
- QArray<QVector2D> transformed(const QMatrix4x4& matrix) const;
-
-#if !defined(Q_NO_USING_KEYWORD) || defined(Q_QDOC)
- using QArray<QVector2D>::append;
-#else
- inline void append(const QVector2D& value)
- { QArray<QVector2D>::append(value); }
- inline void append(const QVector2D& value1, const QVector2D& value2)
- { QArray<QVector2D>::append(value1, value2); }
- inline void append(const QVector2D& value1, const QVector2D& value2, const QVector2D& value3)
- { QArray<QVector2D>::append(value1, value2, value3); }
- inline void append(const QVector2D& value1, const QVector2D& value2, const QVector2D& value3, const QVector2D& value4)
- { QArray<QVector2D>::append(value1, value2, value3, value4); }
- inline void append(const QVector2D *values, int count)
- { QArray<QVector2D>::append(values, count); }
- inline void append(const QArray<QVector2D>& other)
- { QArray<QVector2D>::append(other); }
-#endif
-};
-
-inline QVector2DArray::QVector2DArray() {}
-
-inline QVector2DArray::QVector2DArray(int size, const QVector2D& value)
- : QArray<QVector2D>(size, value) {}
-
-inline QVector2DArray::QVector2DArray(const QArray<QVector2D>& other)
- : QArray<QVector2D>(other) {}
-
-inline void QVector2DArray::append(qreal x, qreal y)
- { QArray<QVector2D>::append(QVector2D(x, y)); }
-
-inline void QVector2DArray::append(const QPointF& point)
- { QArray<QVector2D>::append(QVector2D(point)); }
-
-inline void QVector2DArray::append(const QPoint& point)
- { QArray<QVector2D>::append(QVector2D(point)); }
-
-inline void QVector2DArray::translate(qreal x, qreal y)
- { translate(QVector2D(x, y)); }
-
-inline QArray<QVector2D> QVector2DArray::translated(qreal x, qreal y) const
- { return translated(QVector2D(x, y)); }
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qvector3darray.cpp b/src/gui/extern/Qt3D/arrays/qvector3darray.cpp
deleted file mode 100644
index 834f2bdea38654a6be8907ff8d1ff53c881b441a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector3darray.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qvector3darray.h"
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QVector3DArray
- \brief The QVector3DArray class is a convenience for wrapping a QArray of QVector3D values.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QVector3DArray is used to build an array of 3D vector values
- based on floating-point x, y, and z arguments:
-
- \code
- QVector3DArray array;
- array.append(1.0f, 2.0f, 3.0f);
- array.append(-1.0f, 2.0f, 3.0f);
- array.append(1.0f, -2.0f, 3.0f);
- \endcode
-
- This is more convenient and readable than the equivalent with
- QArray:
-
- \code
- QArray<QVector3D> array;
- array.append(QVector3D(1.0f, 2.0f, 3.0f));
- array.append(QVector3D(-1.0f, 2.0f, 3.0f));
- array.append(QVector3D(1.0f, -2.0f, 3.0f));
- \endcode
-
- QVector3DArray also has convenience functions for transforming
- the contents of the array with translate(), translated(),
- transform(), and transformed().
-
- \sa QArray, QVector2DArray, QVector4DArray
-*/
-
-/*!
- \fn QVector3DArray::QVector3DArray()
-
- Constructs an empty array of QVector3D values.
-*/
-
-/*!
- \fn QVector3DArray::QVector3DArray(int size, const QVector3D& value)
-
- Constructs an array of QVector3D values with an initial \a size.
- All elements in the array are initialized to \a value.
-*/
-
-/*!
- \fn QVector3DArray::QVector3DArray(const QArray<QVector3D>& other)
-
- Constructs a copy of \a other.
-*/
-
-/*!
- \fn void QVector3DArray::append(qreal x, qreal y, qreal z)
-
- Appends (\a x, \a y, \a z) to this array of QVector3D values.
-*/
-
-/*!
- Multiplies the elements in this array of QVector3D values by
- the \a scale.
-
- \sa scaled()
-*/
-void QVector3DArray::scale(qreal scale)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector3D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ *= scale;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector3D values, multiplied
- by the \a scale.
-
- \sa scale()
-*/
-QVector3DArray QVector3DArray::scaled(qreal scale) const
-{
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- return result;
-}
-
-/*!
- Translates the elements in this array of QVector3D values
- by the components of \a value.
-
- \sa translated()
-*/
-void QVector3DArray::translate(const QVector3D& value)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector3D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ += value;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- *this = result;
- }
-}
-
-/*!
- \fn void QVector3DArray::translate(qreal x, qreal y, qreal z)
- \overload
-
- Translates the elements in this array of QVector3D values
- by (\a x, \a y, \a z).
-
- \sa translated()
-*/
-
-/*!
- Returns a copy of this array of QVector3D values, translated
- by the components of \a value.
-
- \sa translate()
-*/
-QArray<QVector3D> QVector3DArray::translated(const QVector3D& value) const
-{
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- return result;
-}
-
-/*!
- \fn QArray<QVector3D> QVector3DArray::translated(qreal x, qreal y, qreal z) const
- \overload
-
- Returns a copy of this array of QVector3D values, translated
- by (\a x, \a y, \a z).
-
- \sa translate()
-*/
-
-/*!
- Transforms the elements in this array of QVector3D values
- by \a matrix.
-
- \sa transformed()
-*/
-void QVector3DArray::transform(const QMatrix4x4& matrix)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector3D *dst = data();
- for (int index = 0; index < size; ++index) {
- *dst = matrix * *dst;
- ++dst;
- }
- } else {
- // Create a new array, transform the values, and assign.
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = matrix * *src++;
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector3D values, transformed
- by \a matrix.
-
- \sa transform()
-*/
-QArray<QVector3D> QVector3DArray::transformed(const QMatrix4x4& matrix) const
-{
- QArray<QVector3D> result;
- int size = count();
- const QVector3D *src = constData();
- QVector3D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = matrix * *src++;
- return result;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qvector3darray.h b/src/gui/extern/Qt3D/arrays/qvector3darray.h
deleted file mode 100644
index 56e77f589289f9c4acdebb59e18c48ea89528c3d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector3darray.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QVECTOR3DARRAY_H
-#define QVECTOR3DARRAY_H
-
-#include "qarray.h"
-#include <QtGui/qvector3d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QVector3DArray : public QArray<QVector3D>
-{
-public:
- QVector3DArray();
- QVector3DArray(int size, const QVector3D& value = QVector3D());
- QVector3DArray(const QArray<QVector3D>& other);
-
- void append(qreal x, qreal y, qreal z);
-
- void scale(qreal scale);
- QVector3DArray scaled(qreal scale) const;
-
- void translate(const QVector3D& value);
- void translate(qreal x, qreal y, qreal z);
-
- QArray<QVector3D> translated(const QVector3D& value) const;
- QArray<QVector3D> translated(qreal x, qreal y, qreal z) const;
-
- void transform(const QMatrix4x4& matrix);
- QArray<QVector3D> transformed(const QMatrix4x4& matrix) const;
-
-#if !defined(Q_NO_USING_KEYWORD) || defined(Q_QDOC)
- using QArray<QVector3D>::append;
-#else
- inline void append(const QVector3D& value)
- { QArray<QVector3D>::append(value); }
- inline void append(const QVector3D& value1, const QVector3D& value2)
- { QArray<QVector3D>::append(value1, value2); }
- inline void append(const QVector3D& value1, const QVector3D& value2, const QVector3D& value3)
- { QArray<QVector3D>::append(value1, value2, value3); }
- inline void append(const QVector3D& value1, const QVector3D& value2, const QVector3D& value3, const QVector3D& value4)
- { QArray<QVector3D>::append(value1, value2, value3, value4); }
- inline void append(const QVector3D *values, int count)
- { QArray<QVector3D>::append(values, count); }
- inline void append(const QArray<QVector3D>& other)
- { QArray<QVector3D>::append(other); }
-#endif
-};
-
-inline QVector3DArray::QVector3DArray() {}
-
-inline QVector3DArray::QVector3DArray(int size, const QVector3D& value)
- : QArray<QVector3D>(size, value) {}
-
-inline QVector3DArray::QVector3DArray(const QArray<QVector3D>& other)
- : QArray<QVector3D>(other) {}
-
-inline void QVector3DArray::append(qreal x, qreal y, qreal z)
- { QArray<QVector3D>::append(QVector3D(x, y, z)); }
-
-inline void QVector3DArray::translate(qreal x, qreal y, qreal z)
- { translate(QVector3D(x, y, z)); }
-
-inline QArray<QVector3D> QVector3DArray::translated(qreal x, qreal y, qreal z) const
- { return translated(QVector3D(x, y, z)); }
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/arrays/qvector4darray.cpp b/src/gui/extern/Qt3D/arrays/qvector4darray.cpp
deleted file mode 100644
index cd0408ab356d43fae35afba28e0c68f3e3b2608d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector4darray.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qvector4darray.h"
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QVector4DArray
- \brief The QVector4DArray class is a convenience for wrapping a QArray of QVector4D values.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::arrays
-
- QVector4DArray is used to build an array of 4D vector values
- based on floating-point x, y, and z arguments:
-
- \code
- QVector4DArray array;
- array.append(1.0f, 2.0f, 3.0f, -4.0f);
- array.append(-1.0f, 2.0f, 3.0f, -4.0f);
- array.append(1.0f, -2.0f, 3.0f, -4.0f);
- \endcode
-
- This is more convenient and readable than the equivalent with
- QArray:
-
- \code
- QArray<QVector4D> array;
- array.append(QVector4D(1.0f, 2.0f, 3.0f, -4.0f));
- array.append(QVector4D(-1.0f, 2.0f, 3.0f, -4.0f));
- array.append(QVector4D(1.0f, -2.0f, 3.0f, -4.0f));
- \endcode
-
- QVector4DArray also has convenience functions for transforming
- the contents of the array with translate(), translated(),
- transform(), and transformed().
-
- \sa QArray, QVector2DArray, QVector3DArray
-*/
-
-/*!
- \fn QVector4DArray::QVector4DArray()
-
- Constructs an empty array of QVector4D values.
-*/
-
-/*!
- \fn QVector4DArray::QVector4DArray(int size, const QVector4D& value)
-
- Constructs an array of QVector4D values with an initial \a size.
- All elements in the array are initialized to \a value.
-*/
-
-/*!
- \fn QVector4DArray::QVector4DArray(const QArray<QVector4D>& other)
-
- Constructs a copy of \a other.
-*/
-
-/*!
- \fn void QVector4DArray::append(qreal x, qreal y, qreal z, qreal w)
-
- Appends (\a x, \a y, \a z, \a w) to this array of QVector4D values.
-*/
-
-/*!
- Multiplies the elements in this array of QVector4D values by
- the \a scale.
-
- \sa scaled()
-*/
-void QVector4DArray::scale(qreal scale)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector4D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ *= scale;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector4D values, multiplied
- by the \a scale.
-
- \sa scale()
-*/
-QVector4DArray QVector4DArray::scaled(qreal scale) const
-{
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ * scale;
- return result;
-}
-
-/*!
- Translates the elements in this array of QVector4D values
- by the components of \a value.
-
- \sa translated()
-*/
-void QVector4DArray::translate(const QVector4D& value)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector4D *dst = data();
- for (int index = 0; index < size; ++index)
- *dst++ += value;
- } else {
- // Create a new array, translate the values, and assign.
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- *this = result;
- }
-}
-
-/*!
- \fn void QVector4DArray::translate(qreal x, qreal y, qreal z, qreal w);
- \overload
-
- Translates the elements in this array of QVector4D values
- by (\a x, \a y, \a z, \a w).
-
- \sa translated()
-*/
-
-/*!
- Returns a copy of this array of QVector4D values, translated
- by the components of \a value.
-
- \sa translate()
-*/
-QArray<QVector4D> QVector4DArray::translated(const QVector4D& value) const
-{
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = *src++ + value;
- return result;
-}
-
-/*!
- \fn QArray<QVector4D> QVector4DArray::translated(qreal x, qreal y, qreal z, qreal w) const
- \overload
-
- Returns a copy of this array of QVector4D values, translated
- by (\a x, \a y, \a z, \a w).
-
- \sa translate()
-*/
-
-/*!
- Transforms the elements in this array of QVector4D values
- by \a matrix.
-
- \sa transformed()
-*/
-void QVector4DArray::transform(const QMatrix4x4& matrix)
-{
- if (isDetached()) {
- // Modify the array in-place.
- int size = count();
- QVector4D *dst = data();
- for (int index = 0; index < size; ++index) {
- *dst = matrix * *dst;
- ++dst;
- }
- } else {
- // Create a new array, transform the values, and assign.
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = matrix * *src++;
- *this = result;
- }
-}
-
-/*!
- Returns a copy of this array of QVector3D values, transformed
- by \a matrix.
-
- \sa transform()
-*/
-QArray<QVector4D> QVector4DArray::transformed(const QMatrix4x4& matrix) const
-{
- QArray<QVector4D> result;
- int size = count();
- const QVector4D *src = constData();
- QVector4D *dst = result.extend(size);
- for (int index = 0; index < size; ++index)
- *dst++ = matrix * *src++;
- return result;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/arrays/qvector4darray.h b/src/gui/extern/Qt3D/arrays/qvector4darray.h
deleted file mode 100644
index 14e3f546793cf305da8da8fd898b0e85df737697..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/arrays/qvector4darray.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QVECTOR4DARRAY_H
-#define QVECTOR4DARRAY_H
-
-#include "qarray.h"
-#include <QtGui/qvector4d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QVector4DArray : public QArray<QVector4D>
-{
-public:
- QVector4DArray();
- QVector4DArray(int size, const QVector4D& value = QVector4D());
- QVector4DArray(const QArray<QVector4D>& other);
-
- void append(qreal x, qreal y, qreal z, qreal w);
-
- void scale(qreal scale);
- QVector4DArray scaled(qreal scale) const;
-
- void translate(const QVector4D& value);
- void translate(qreal x, qreal y, qreal z, qreal w);
-
- QArray<QVector4D> translated(const QVector4D& value) const;
- QArray<QVector4D> translated
- (qreal x, qreal y, qreal z, qreal w) const;
-
- void transform(const QMatrix4x4& matrix);
- QArray<QVector4D> transformed(const QMatrix4x4& matrix) const;
-
-#if !defined(Q_NO_USING_KEYWORD) || defined(Q_QDOC)
- using QArray<QVector4D>::append;
-#else
- inline void append(const QVector4D& value)
- { QArray<QVector4D>::append(value); }
- inline void append(const QVector4D& value1, const QVector4D& value2)
- { QArray<QVector4D>::append(value1, value2); }
- inline void append(const QVector4D& value1, const QVector4D& value2, const QVector4D& value3)
- { QArray<QVector4D>::append(value1, value2, value3); }
- inline void append(const QVector4D& value1, const QVector4D& value2, const QVector4D& value3, const QVector4D& value4)
- { QArray<QVector4D>::append(value1, value2, value3, value4); }
- inline void append(const QVector4D *values, int count)
- { QArray<QVector4D>::append(values, count); }
- inline void append(const QArray<QVector4D>& other)
- { QArray<QVector4D>::append(other); }
-#endif
-};
-
-inline QVector4DArray::QVector4DArray() {}
-
-inline QVector4DArray::QVector4DArray(int size, const QVector4D& value)
- : QArray<QVector4D>(size, value) {}
-
-inline QVector4DArray::QVector4DArray(const QArray<QVector4D>& other)
- : QArray<QVector4D>(other) {}
-
-inline void QVector4DArray::append(qreal x, qreal y, qreal z, qreal w)
- { QArray<QVector4D>::append(QVector4D(x, y, z, w)); }
-
-inline void QVector4DArray::translate(qreal x, qreal y, qreal z, qreal w)
- { translate(QVector4D(x, y, z, w)); }
-
-inline QArray<QVector4D> QVector4DArray::translated
- (qreal x, qreal y, qreal z, qreal w) const
- { return translated(QVector4D(x, y, z, w)); }
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/effects/CMakeLists.txt b/src/gui/extern/Qt3D/effects/CMakeLists.txt
deleted file mode 100644
index 988ac2c2cf4a667050147a6de32f8e8cfe9caa7e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-target_sources( gui
- PRIVATE
- qglcolladafxeffectloader.h
- qglshaderprogrameffect.h
- qgllittextureeffect.cpp
- qglflatcoloreffect.cpp
- qgllittextureeffect_p.h
- qglflattextureeffect.cpp
- qglcolladafxeffectloader.cpp
- qgllitmaterialeffect_p.h
- qgllitmaterialeffect.cpp
- qglcolladafxeffect_p.h
- qglflatcoloreffect_p.h
- qglcolladafxeffect.h
- qglcolladafxeffectfactory.h
- qglcolladafxeffectfactory.cpp
- qglshaderprogrameffect.cpp
- qglflattextureeffect_p.h
- qglcolladafxeffect.cpp
- )
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffect.cpp b/src/gui/extern/Qt3D/effects/qglcolladafxeffect.cpp
deleted file mode 100644
index 6c73f053b74b62ad90af6c9e0fa0317d6351be04..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffect.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 <QString>
-#include <QXmlStreamReader>
-#include <QFile>
-#include <QDebug>
-#include <QImage>
-#include "qgl.h"
-#include "qgltexture2d.h"
-#include "qglcolladafxeffect.h"
-#include "qglcolladafxeffect_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QGLColladaFxEffect::QGLColladaFxEffect() : QGLShaderProgramEffect()
- , d( new QGLColladaFxEffectPrivate )
-{
-}
-
-QGLColladaFxEffect::QGLColladaFxEffect(const QGLColladaFxEffect&) : QGLShaderProgramEffect()
-{
- Q_ASSERT(false);
-};
-
-
-QGLColladaFxEffect::~QGLColladaFxEffect()
-{
- delete d;
-}
-
-
-
-QGLColladaFxEffectPrivate::QGLColladaFxEffectPrivate() : id()
- , sid()
- , name()
- , emissiveTexture(0)
- , ambientTexture(0)
- , diffuseTexture(0)
- , specularTexture(0)
- , lighting(QGLColladaFxEffect::NoLighting)
- , material(0)
-{
- resetGlueSnippets();
-}
-
-
-
-QGLColladaFxEffectPrivate::~QGLColladaFxEffectPrivate()
-{
- delete emissiveTexture;
- emissiveTexture = 0;
- delete ambientTexture;
- ambientTexture = 0;
- delete diffuseTexture;
- diffuseTexture = 0;
- delete specularTexture;
- specularTexture = 0;
- delete material;
- material = 0;
-
-}
-
-
-
-inline void QGLColladaFxEffectPrivate::updateMaterialChannelSnippets(QString channelName, QGLTexture2D* texture, int* textureUnit, QColor fallbackColor)
-{
- QString qVariableName = QLatin1String("q") + channelName;
- if (texture != 0)
- {
- QString sourceVariableName = QLatin1String("texture") + channelName;
- QString texVariableName = QString(QLatin1String("texCoord%1")).arg(*textureUnit);
- // Take care of texture coordinates
- QString varyingSnippet = QString(QLatin1String("varying vec4 %1;")).arg(texVariableName);
- vertexShaderDeclarationSnippets.append(varyingSnippet);
- vertexShaderVariableNames.append(texVariableName);
- fragmentShaderDeclarationSnippets.append(varyingSnippet);
- fragmentShaderVariableNames.append(texVariableName);
-
- vertexShaderCodeSnippets.append(QString(QLatin1String("%1 = texCoords; // TODO: dynamically add tex attributes\n")).arg(texVariableName));
- vertexShaderVariableNames.append(texVariableName);
-
- // Declare the color variable in the fragment shader
- fragmentShaderDeclarationSnippets.append(QString(QLatin1String("lowp vec4 %1;")).arg(qVariableName));
- fragmentShaderVariableNames.append(qVariableName);
- fragmentShaderDeclarationSnippets.append(QString(QLatin1String("uniform sampler2D %1;")).arg(sourceVariableName));
- fragmentShaderVariableNames.append(sourceVariableName);
-
- // Assign a colour to the variable out of the appropriate sampler
- fragmentShaderCodeSnippets.append(QLatin1String(" mediump vec4 ") + qVariableName + QLatin1String(" = texture2D(") + sourceVariableName + QLatin1String(", ") + texVariableName + QLatin1String(".st);"));
- fragmentShaderVariableNames.append(qVariableName);
- // mediump? lowp?
-
- *textureUnit++;
- } else {
- fragmentShaderDeclarationSnippets.append(QString (QLatin1String("const vec4 %1 = vec4(%2, %3, %4, %5);")).arg( qVariableName).arg(fallbackColor.redF(), 0, 'f', 6).arg(fallbackColor.greenF(), 0, 'f', 6).arg(fallbackColor.blueF(), 0, 'f', 6).arg(fallbackColor.alphaF(), 0, 'f', 6 ));
- fragmentShaderVariableNames.append(qVariableName);
- }
-}
-
-
-
-inline void QGLColladaFxEffectPrivate::setTextureUniform(QGLShaderProgram *program, QGLPainter* painter, QString channelName, QGLTexture2D* texture, int* textureUnit, QColor fallbackColor)
-{
- QString qVariableName = QLatin1String("q") + channelName;
-
- if (texture != 0)
- {
- QString sourceVariableName = QLatin1String("texture") + channelName;
- QString texVariableName = QString(QLatin1String("texCoord%1")).arg(*textureUnit);
- painter->glActiveTexture(GL_TEXTURE0 + *textureUnit);
- texture->bind();
- program->setUniformValue(sourceVariableName.toAscii().data(), *textureUnit);
- }
- else
- {
- // It's just a const value, so set it that way in the fragment shader.
- program->setUniformValue(qVariableName.toAscii().data(), fallbackColor);
- }
-}
-
-
-
-void QGLColladaFxEffect::update(QGLPainter *painter, QGLPainter::Updates updates)
-{
- QGLShaderProgramEffect::update(painter, updates);
-
- if (updates && QGLPainter::UpdateMaterials)
- {
-
- if (program() == 0)
- {
- qWarning() << "no program in QGLColladaFxEffect::update()";
- return;
- }
-
- // Start from texture unit 1 so as not to stomp a texture set on the
- // painter.
- int textureUnit = 1;
- d->setTextureUniform(
- program(), painter, QLatin1String("Emissive"), d->emissiveTexture,
- &textureUnit,
- material() ? material()->emittedLight() : QColor());
-
- d->setTextureUniform(
- program(), painter, QLatin1String("Ambient"), d->ambientTexture, &textureUnit,
- material() ? material()->ambientColor() : QColor());
-
- d->setTextureUniform(
- program(), painter, QLatin1String("Diffuse"), d->diffuseTexture, &textureUnit,
- material() ? material()->diffuseColor() : QColor());
-
- d->setTextureUniform(
- program(), painter, QLatin1String("Specular"), d->specularTexture,
- &textureUnit,
- material() ? material()->specularColor() : QColor());
- }
-}
-
-
-
-void QGLColladaFxEffect::setId(QString id)
-{
- d->id = id;
-}
-
-
-
-QString QGLColladaFxEffect::id()
-{
- return d->id;
-}
-
-
-
-void QGLColladaFxEffect::setSid(QString sid)
-{
- d->sid = sid;
-}
-
-
-
-void QGLColladaFxEffectPrivate::addMaterialChannelsToShaderSnippets(const QGLMaterial *material)
-{
- int textureUnit = 1;
-
- updateMaterialChannelSnippets(QLatin1String("Emissive"), emissiveTexture, &textureUnit, material->emittedLight());
- updateMaterialChannelSnippets(QLatin1String("Ambient"), ambientTexture, &textureUnit, material->ambientColor());
- updateMaterialChannelSnippets(QLatin1String("Diffuse"), diffuseTexture, &textureUnit, material->diffuseColor());
- updateMaterialChannelSnippets(QLatin1String("Specular"), specularTexture, &textureUnit, material->specularColor());
-}
-
-
-
-void QGLColladaFxEffect::addBlinnPhongLighting()
-{
- d->addMaterialChannelsToShaderSnippets(material());
-
- // Fragment shader declarations:
- d->fragmentShaderDeclarationSnippets.append(QLatin1String("uniform mediump sampler2D texture0;"));
- d->fragmentShaderVariableNames.append(QLatin1String("texture0"));
- d->fragmentShaderDeclarationSnippets.append(QLatin1String("varying highp vec4 qt_TexCoord0;"));
- d->fragmentShaderVariableNames.append(QLatin1String("qt_TexCoord0"));
-
- // Fragment Shader code
- d->fragmentShaderCodeSnippets.append(QLatin1String(
- " vec4 specularComponent = vec4( 0.0, 0.0, 0.0, 0.0 );\n"\
- " if (intensity > 0.0)\n"\
- " {\n"\
- " float specularIntensity = max( dot(perPixelNormal, qHalfVector), 0.0 );\n"\
- " if (specularIntensity > 0.0)\n"\
- " specularComponent = qSpecular * pow(specularIntensity, shininess);\n"\
- " }\n"));
- d->fragmentShaderVariableNames.append(QLatin1String("lighting"));
-
-
- // Replace the "end glue" to set colour from lighting
- d->fragmentShaderEndGlueSnippet = QLatin1String(
- " vec4 texture0Color = texture2D(texture0, qt_TexCoord0.st);\n"\
- " vec4 diffuseColor = qDiffuse;\n"\
- " vec4 lightingColor = qAmbient + diffuseColor * intensity + specularComponent;\n"\
- " vec4 texturedColor = vec4(lightingColor.xyz * (1.0 - texture0Color.a)\n"\
- "+ (texture0Color.xyz + specularComponent.rgb) * texture0Color.a, lightingColor.a);\n"\
- " gl_FragColor = texturedColor;\n"\
- "}");
- generateShaders();
-}
-
-
-
-void QGLColladaFxEffect::generateShaders()
-{
- if (vertexShader().isEmpty())
- {
- QString shader =
- d->vertexShaderDeclarationSnippets.join(QLatin1String("\n"))
- + QLatin1String("\n") + d->vertexShaderMainGlueSnippet
- + d->vertexShaderCodeSnippets.join(QLatin1String("\n"))
- + QLatin1String("\n") + d->vertexShaderEndGlueSnippet;
- setVertexShader(shader.toLatin1());
- }
-
- if (fragmentShader().isEmpty())
- {
- QString shader =
- d->fragmentShaderDeclarationSnippets.join(QLatin1String("\n"))
- + QLatin1String("\n") + d->fragmentShaderMainGlueSnippet
- + d->fragmentShaderCodeSnippets.join(QLatin1String("\n"))
- + QLatin1String("\n") + d->fragmentShaderEndGlueSnippet;
- setFragmentShader(shader.toLatin1());
- }
-}
-
-
-
-void QGLColladaFxEffectPrivate::resetGlueSnippets()
-{
- vertexShaderMainGlueSnippet = QLatin1String(
- "attribute highp vec4 vertex;\n"\
- "attribute highp vec4 normal;\n"\
- "attribute highp vec4 texCoords;\n"\
- "uniform highp mat4 matrix;\n"\
- "uniform highp mat3 qt_NormalMatrix;\n"\
- "varying mediump vec3 qNormal;\n"\
- "varying mediump vec3 qLightDirection;\n"\
- "varying mediump vec3 qHalfVector;\n"\
- "uniform mediump vec3 pli; // Position of the light\n"\
- "varying highp vec4 qt_TexCoord0; // TEMP\n" /* Got to get rid of this*/\
- "\n"\
- "void qLightVertex(vec4 vertex, vec3 normal)\n"\
- "{\n"\
- " vec3 toEye;\n"\
- " qLightDirection = normalize(pli);\n"\
- " toEye = vec3(0, 0, 1); // assume viewer at infinity\n"\
- " qHalfVector = normalize(qLightDirection + toEye);\n"\
- "}\n"\
- "\n"\
- "void main(void)\n"\
- "{\n"\
- " qNormal = normalize(qt_NormalMatrix * vec3(normal));\n"\
- " qLightVertex(vertex, qNormal);\n"\
- " qt_TexCoord0 = texCoords;\n"\
- );
-
- vertexShaderEndGlueSnippet = QLatin1String (
- " gl_Position = matrix * vertex;\n"\
- "}\n");
-
-
- fragmentShaderEndGlueSnippet = QLatin1String(
- " gl_FragColor = color;\n"\
- "}\n"
- );
-
- fragmentShaderMainGlueSnippet = QLatin1String(
- "varying mediump vec3 qNormal;\n"\
- "varying mediump vec3 qLightDirection;\n"\
- "varying mediump vec3 qHalfVector;\n"\
- "uniform float shininess;\n"\
- "uniform vec4 color;\n"\
- "vec3 perPixelNormal;"
- "\n"\
- "void main()\n"\
- "{\n"\
- " perPixelNormal = normalize(qNormal);\n"\
- " float intensity = max(dot(perPixelNormal, qLightDirection), 0.0);\n"
- );
-}
-
-
-
-QString QGLColladaFxEffect::sid()
-{
- return d->sid;
-}
-
-
-
-QGLTexture2D* QGLColladaFxEffect::diffuseTexture()
-{
- return d->diffuseTexture;
-}
-
-
-void QGLColladaFxEffect::setLighting(int lighting)
-{
- d->lighting = lighting;
-}
-
-int QGLColladaFxEffect::lighting()
-{
- return d->lighting;
-}
-
-/*!
- Sets this effect to use \a newMaterial. If \a newMaterial is 0, sets this
- effect to have no material, and instead use whatever material is set
- on the QGLPainter.
-
- \sa QGLPainter, material()
-*/
-void QGLColladaFxEffect::setMaterial(QGLMaterial* newMaterial)
-{
- d->material = newMaterial;
-}
-
-/*!
- Returns a pointer to the material of this effect. If the effect has no material,
- this function returns 0;
-*/
-QGLMaterial* QGLColladaFxEffect::material()
-{
- return d->material;
-}
-
-/*!
- Returns true if the effect is currently active (applied to a QGLPainter)
- and false if it is not.
- */
-bool QGLColladaFxEffect::isActive()
-{
- return d->currentlyActive;
-}
-
-void QGLColladaFxEffect::setActive(QGLPainter *painter, bool flag)
-{
- d->currentlyActive = flag && !vertexShader().isEmpty() &&
- !fragmentShader().isEmpty();
- QGLShaderProgramEffect::setActive(painter, d->currentlyActive);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffect.h b/src/gui/extern/Qt3D/effects/qglcolladafxeffect.h
deleted file mode 100644
index a300393c427c35590c28bbea684853127511c368..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffect.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCOLLADAEFFECT_H
-#define QGLCOLLADAEFFECT_H
-
-#include <QStack>
-#include <QList>
-#include <QGLShaderProgram>
-#include "qglshaderprogrameffect.h"
-
-QT_BEGIN_NAMESPACE
-
-class QXmlStreamReader;
-class QGLColladaParam;
-class QGLColladaFxEffectPrivate;
-
-class Q_QT3D_EXPORT QGLColladaFxEffect : public QGLShaderProgramEffect
-{
- friend class QGLColladaFxEffectFactory;
-
-public:
- enum Lighting
- {
- NoLighting,
- BlinnLighting,
- PhongLighting,
- ConstantLighting,
- LambertLighting,
- CustomLighting
- };
-
- QGLColladaFxEffect();
- ~QGLColladaFxEffect();
- void update(QGLPainter *painter, QGLPainter::Updates updates);
- void generateShaders();
- void addBlinnPhongLighting();
-
- void setId(QString);
- void setSid(QString);
- QString id();
- QString sid();
-
- void setLighting(int lighting);
- int lighting();
- void setMaterial(QGLMaterial* newMaterial);
- QGLMaterial* material();
-
- QGLTexture2D* diffuseTexture();
-
- bool isActive();
- void setActive(QGLPainter *painter, bool flag);
-private:
- QGLColladaFxEffect(const QGLColladaFxEffect&);
- QGLColladaFxEffectPrivate* d;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLCOLLADAEFFECT_H
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffect_p.h b/src/gui/extern/Qt3D/effects/qglcolladafxeffect_p.h
deleted file mode 100644
index d0b58aacd9d7df09650b9ecd1c7bce746fb0cd2f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffect_p.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCOLLADAFXEFFECT_P_H
-#define QGLCOLLADAFXEFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QString>
-#include <QMap>
-#include <QColor>
-#include "qgltexture2d.h"
-#include "qglcolladafxeffect.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGLPainter;
-class QGLShaderProgram;
-class QGLMaterial;
-
-class QGLColladaFxEffectPrivate
-{
- friend class QGLColladaFxEffectFactory;
-public:
- QGLColladaFxEffectPrivate();
- ~QGLColladaFxEffectPrivate();
-
- void addMaterialChannelsToShaderSnippets(const QGLMaterial *material);
- void resetGlueSnippets();
- void setTextureUniform(QGLShaderProgram *program, QGLPainter* painter, QString channelName, QGLTexture2D* texture, int* textureUnit, QColor fallbackColor);
- void updateMaterialChannelSnippets(QString channelName, QGLTexture2D* texture, int* textureUnit, QColor fallbackColor);
-
- QString id;
- QString sid;
- QString name;
-
- // The spec allows for 3D textures as well, but for now only 2D is
- // supported
- QGLTexture2D* emissiveTexture;
- QGLTexture2D* ambientTexture;
- QGLTexture2D* diffuseTexture;
- QGLTexture2D* specularTexture;
- int lighting;
- QGLMaterial* material;
-
- QStringList vertexShaderCodeSnippets;
- QStringList vertexShaderDeclarationSnippets;
- QStringList vertexShaderVariableNames;
-
- QStringList fragmentShaderCodeSnippets;
- QStringList fragmentShaderDeclarationSnippets;
- QStringList fragmentShaderVariableNames;
-
- QString vertexShaderEndGlueSnippet;
- QString vertexShaderMainGlueSnippet;
- QString fragmentShaderEndGlueSnippet;
- QString fragmentShaderMainGlueSnippet;
-
- bool currentlyActive;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLCOLLADAFXEFFECT_P_H
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.cpp b/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.cpp
deleted file mode 100644
index 14b2bfaf9079334411e5b1789ca98dd2f443c87f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.cpp
+++ /dev/null
@@ -1,1694 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 <QVector>
-#include <QFile>
-#include <QFileInfo>
-#include <QTime>
-#include <QDir>
-#include "qgltexture2d.h"
-#include "qgl.h"
-
-#include "qglcolladafxeffect.h"
-#include "qglcolladafxeffectfactory.h"
-//#include "qglcolladafxeffectfactory_p.h"
-#include "qglcolladafxeffect_p.h"
-
-QT_BEGIN_NAMESPACE
-
-// The QGLColladaFxFactory class creates a list of QGLColladaFx objects from
-// COLLADA FX information according to the 1.4.1 March 2008 Release from
-// http://www.khronos.org/collada/
-
-//#define DEBUG_QGL_COLLADA_PARSING
-//#define DEBUG_MATERIALS
-
-#define INDENT_SIZE 4
-
-static int QGLColladaIndentLevel = 0;
-
-// This is a simple RAII helper class to conveniently indent across
-// various functions when building up the collada elements.
-// Instantiate an indent to increment the indent level with that scope.
-// add an indent object to the beginning of a string to indent it
-// the correct amount.
-class Indent
-{
-public:
- static int currentIndent() { return QGLColladaIndentLevel; };
- Indent()
- {
- ++QGLColladaIndentLevel;
- };
- ~Indent()
- {
- --QGLColladaIndentLevel;
- }
-};
-
-QString operator +(Indent&, QString string)
-{
- return QString(QGLColladaIndentLevel * INDENT_SIZE, QLatin1Char(' ')) + string;
-}
-
-QString operator +(char c, Indent&)
-{
- return QLatin1Char(c) + QString(QGLColladaIndentLevel * INDENT_SIZE, QLatin1Char(' '));
-}
-
-// xml convenience function - find the first end tag with the given tagname
-// Note that this is not as smart as xml.skipCurrentElement(), and does
-// not handle the case where (grand)children node share tagName
-// With this caveat, can be called from within any (grand)child node.
-static inline void findEndTag( QXmlStreamReader& xml, QString tagName )
-{
- while ( !xml.atEnd() && !( xml.tokenType() == xml.EndElement && xml.name() == tagName))
- {
- xml.readNext();
- }
-}
-
-
-
-/*!
- \internal
- Convenience function to find parameters in \a resultState that have an id,
- sid, or name that is equal to \a stringToMatch
- Note that this using this is not in line with the Collada specification,
- and that non-unique sids will always return the last parameter parsed.
- */
-static inline QVariant findParameterVariant(ResultState* resultState, QString stringToMatch)
-{
- QVariant result = resultState->paramSids.value(stringToMatch);
-
- if ( result.isNull() )
- result = resultState->paramIds.value(stringToMatch);
-
- if ( result.isNull() )
- result = resultState->paramNames.value(stringToMatch);
-
- return result;
-}
-
-/*!
- Parse a collada 1.4 or 1.5 .dae file \a fileName, find the effects in the
- library_effects element, and convert these into a list of QGLColladaFxEffect objects
- suitable for use with Qt3D. Specific effects can be identified out of
- this list using their sid.
-
- This is the only function intended to be called from outside this class, e.g.:
-
- QList<QGLColladaFxEffect*> colladaEffects = QGLColladaFxEffectFactory::loadEffectsFromFile("myColladaFile.dae");
-
- \sa QGLColladaFxEffect
-*/
-QList<QGLColladaFxEffect*> QGLColladaFxEffectFactory::loadEffectsFromFile( const QString& fileName )
-{
- QFile file( fileName );
- if ( !file.open( QIODevice::ReadOnly ))
- {
- qWarning() << "Warning: QGLColladaFxEffect failed to open file" << fileName;
- return QList<QGLColladaFxEffect*>();
- }
-
-
- QXmlStreamReader xml;
- xml.setDevice( &file );
- if (xml.tokenType() == QXmlStreamReader::Invalid)
- file.readLine();
- xml.setDevice( &file );
-
- QFileInfo fileInfo(file);
-
- return loadEffectsFromXml( xml, fileInfo.dir() );
-}
-
-
-
-QString QGLColladaFxEffectFactory::exportEffect(QGLColladaFxEffect *effect, QString effectId, QString techniqueSid)
-{
- QStringList result;
-
- result += QLatin1String("<?xml version=\"1.0\"?>");
-
- result += QLatin1String("<COLLADA "\
- "xmlns=\"http://www.collada.org/2005/11/COLLADASchema\" version=\"1.5.0\" >");
-
- {
- Indent indent;
- result += indent + QLatin1String("<asset>");
- {
- Indent indent;
- QDateTime time = QDateTime::currentDateTime();
- result += indent + QLatin1String("<created>") + time.toString(Qt::ISODate) + QLatin1String("</created>");
- result += indent + QLatin1String("<modified>") + time.toString(Qt::ISODate) + QLatin1String("</modified>");
- }
- result += indent + QLatin1String("</asset>");
-
- result += indent + QLatin1String("<library_effects>");
- {
- Indent indent;
- result += indent + QLatin1String("<effect id=\"") + effectId + QLatin1String("\">");
- result += glslProfileFromEffect(effect, techniqueSid);
- result += indent + QLatin1String("</effect>");
- }
- result += indent + QLatin1String("</library_effects>");
- result += QLatin1String("</COLLADA>");
- return result.join(QLatin1String("\n"));
- }
-}
-
-
-/*!
- \internal
- parse the top level \a xml from a .dae file and process the library_effects elements therein.
-*/
-QList<QGLColladaFxEffect*> QGLColladaFxEffectFactory::loadEffectsFromXml( QXmlStreamReader& xml, QDir homeDirectory )
-{
- ResultState resultState;
- resultState.sourceDir = homeDirectory;
- QList<QGLColladaFxEffect*> result;
-
- while ( !xml.atEnd() ) {
- xml.readNextStartElement();
- if ( xml.name() == "library_effects" ) {
- result += processLibraryEffectsElement( xml , &resultState );
- } else if (xml.name() == "library_images")
- {
- processLibraryImagesElement( xml, &resultState );
- }
- }
-
- // Try and resolve outstanding textures
- QList<QGLTexture2D*> unresolvedTexturePointers = resultState.unresolvedTexture2Ds.keys();
- for (int i = 0; i < unresolvedTexturePointers.count(); i++)
- {
- QGLTexture2D* texture = unresolvedTexturePointers[i];
- QString parameterName = resultState.unresolvedTexture2Ds.value(texture);
- resolveTexture2DImage(texture, &resultState, parameterName);
- }
- return result;
-}
-
-
-
-QGLColladaParam::~QGLColladaParam()
-{
-
-}
-
-
-
-/*!
- \internal
-*/
-int QGLColladaParam::type()
-{
- return mType;
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaParam::sid()
-{
- return mSid;
-}
-
-
-
-/*!
- \internal
-*/
-QVector<float> QGLColladaParam::value() {
- return mValue;
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaParam::QGLColladaParam(QString sid, int type) : mSid(sid)
- , mType(type)
-{
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaParam::id()
-{
- return mId;
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaParam::typeString(int type)
-{
- const char* typeStringArray[] = {
- "UnkownType",
- "Sampler2DType",
- "Texture2DType",
- "SurfaceType",
- "ImageType"};
-
- if (type >= UserDefinedType)
- return QLatin1String("UserDefinedType");
- else if ( type < 0 || type > ImageType)
- return QLatin1String("Unrecognized Type");
- else
- return QLatin1String(typeStringArray[type]);
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaTextureParam::QGLColladaTextureParam(QString sid, QGLTexture2D* texture) : QGLColladaParam(sid, Texture2DType)
-{
- mTexture = texture;
-}
-
-
-
-/*!
- \internal
-*/
-QGLTexture2D* QGLColladaTextureParam::texture()
-{
- Q_ASSERT( mType == Sampler2DType || mType == Texture2DType);
- return mTexture;
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaTextureParam::samplerSid()
-{
- return sampler2DSid;
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaFxEffectFactory::QGLColladaFxEffectFactory()
-{
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaSampler2DParam::QGLColladaSampler2DParam(QString sid, QGLTexture2D* texture)
- : QGLColladaParam(sid, QGLColladaParam::Sampler2DType)
- , mTexture(texture)
-{
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaSampler2DParam::QGLColladaSampler2DParam(QString sid, QString sourceSid)
- : QGLColladaParam(sid, QGLColladaParam::Sampler2DType)
- , mTexture(0)
- , mSourceSid(sourceSid)
-{
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaSampler2DParam::sourceSid()
-{
- return mSourceSid;
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaSurfaceParam::QGLColladaSurfaceParam(QString sid) : QGLColladaParam(sid, QGLColladaParam::SurfaceType)
- , mInitFrom()
- , mFormat()
- , mFormatHint()
- , mSize()
- , mSizeVector( 3, 0 )
- , mViewportRatio( 1.0, 1.0 )
- , mMipLevels( 0 )
- , mMipMapGenerate( false )
- , mExtra()
- , mGenerator()
-{
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaImageParam::QGLColladaImageParam(QString sid, QImage image)
- : QGLColladaParam(sid, QGLColladaParam::ImageType)
- , mImage(image)
-{
-}
-
-
-
-/*!
- \internal
-*/
-QImage QGLColladaImageParam::image()
-{
- return mImage;
-}
-
-
-
-/*!
- \internal
-*/
-QString QGLColladaImageParam::name()
-{
- return mName;
-}
-
-
-
-/*!
- \internal
-*/
-QGLColladaSurfaceParam* QGLColladaFxEffectFactory::processSurfaceElement( QXmlStreamReader& xml , ResultState* resultState, QString passedInSid)
-{
- Q_UNUSED(resultState);
- QXmlStreamAttributes attributes = xml.attributes();
- QString surfaceSid = attributes.value(QLatin1String("sid")).toString();
- // Surfaces are the only children of a newparam, but don't have their own
- // sids. For simplicity, use the parent's sid.
-
- if (surfaceSid.isEmpty() && !passedInSid.isEmpty())
- surfaceSid = passedInSid;
- QGLColladaSurfaceParam* result = new QGLColladaSurfaceParam( surfaceSid );
- xml.readNextStartElement();
- if ( xml.name().toString().left(4) == QLatin1String("init") )
- {
- if (xml.name().toString() != QLatin1String("init_from"))
- qWarning() << "Warning: only ""init_from"" supported in surface element ( line:" << xml.lineNumber() << ")";
- QString init_from = xml.readElementText();
- result->mInitFrom = init_from;
- resultState->paramSids[surfaceSid] = init_from;
- }
- return result;
-}
-
-
-
-/*!
- \internal
- Processes a list of floating point numbers. If the list contains only 1
- element, a QVariant<float> is returned. If the list containst 2, 3 or 4
- elements, they are converted into a QVariant containing a QVector2D,
- QVector3D, or QVector4D respectively.
- If the list containst more elements than that, they are returned as a
- QArray<float>.
-
-*/
-QVariant QGLColladaFxEffectFactory::processFloatList( QXmlStreamReader& xml )
-{
- QArray<float> floats;
- QString elementString = xml.readElementText();
- QStringList list = elementString.split( QRegExp( QLatin1String("\\s+") ), QString::SkipEmptyParts );
- bool ok;
- float f;
- foreach ( QString string, list )
- {
- f = string.toFloat( &ok );
- if ( ok )
- floats.append(string.toFloat());
- else
- {
- qWarning() << "Warning: malformed float ( line" << xml.lineNumber() << ")";
- }
- }
-
- switch(floats.count())
- {
- case 0:
- return QVariant();
- // no break necessary
- case 1:
- return QVariant(floats[0]);
- // no break necessary
- case 2:
- return QVariant(QVector2D(floats[0], floats[1]));
- // no break necessary
- case 3:
- return QVariant(QVector3D(floats[0], floats[1], floats[2]));
- // no break necessary
- case 4:
- return QVariant(QVector4D(floats[0], floats[1], floats[2], floats[3]));
- // no break necessary
- default:
- {
- QVariant result;
- result.setValue(floats);
- return result;
- }
- }
- // Function should always return out of switch statement
-}
-
-
-
-/*!
- \internal
-*/
-void QGLColladaFxEffectFactory::processSampler2DElement( QXmlStreamReader& xml, ResultState* resultState, QString passedInSid )
-{
- Q_UNUSED(resultState);
- QXmlStreamAttributes attributes = xml.attributes();
- QString sid = attributes.value(QLatin1String("sid")).toString();
- if (sid.isEmpty() && !passedInSid.isEmpty())
- {
- sid = passedInSid;
- }
-
- xml.readNextStartElement();
- if ( xml.name() == QLatin1String("source"))
- {
- // Collada 1.4 Spec
- QString sourceSurfaceSid = xml.readElementText().trimmed();
- resultState->paramSids[sid] = sourceSurfaceSid;
- }
-
- if ( xml.name() == QLatin1String("instance_image") )
- {
- // Collada 1.5 Spec
- qWarning() << "collada 1.5 sampler elements not supported ( line:" << xml.lineNumber() << ")";
- }
- // exit cleanly, just in case.
- findEndTag( xml, QLatin1String("sampler2D"));
- return;
-}
-
-
-
-/*!
- \internal
- Parses and consumes a color collada element from \a xml.
-*/
-QColor QGLColladaFxEffectFactory::processColorElement( QXmlStreamReader& xml )
-{
- QVariant floatList = processFloatList( xml );
-
- QColor result( 0, 0, 0, 255 );
- if (floatList.type() == QVariant::Vector3D)
- {
- QVector3D vector3D = floatList.value<QVector3D>();
- if ( !vector3D.isNull())
- {
- result.setRgbF( vector3D.x()
- , vector3D.y()
- , vector3D.z()
- , 1.0 );
- return result;
- }
- }
- else if (floatList.type() == QVariant::Vector4D)
- {
- QVector4D vector4D = floatList.value<QVector4D>();
- if (!vector4D.isNull())
- {
- result.setRgbF( vector4D.x()
- , vector4D.y()
- , vector4D.z()
- , vector4D.w() );
- return result;
- }
- }
- qWarning() << "Warning: Malformed color element ( line" << xml.lineNumber() << ")";
- return result;
-}
-
-
-
-/*!
- \internal
- Parses and consumes an fx_common_color_or_texture_type collada element from \a xml.
-*/
-QVariant QGLColladaFxEffectFactory::processColorOrTextureElement( QXmlStreamReader& xml )
-{
- if ( xml.name() == QLatin1String("color"))
- {
- return processColorElement( xml );
- } else if ( xml.name() == QLatin1String("texture") )
- {
- qWarning() << "Warning: texture element not supported ( line" << xml.lineNumber()<<")";
- } else
- {
- qWarning() << "Color or Texture expected ( line" << xml.lineNumber() << ")";
- }
- xml.skipCurrentElement();
- return( QColor( 0, 0, 0,255 ));
-}
-
-
-
-/*!
- \internal
- Parses an fx_common_float_or_param_type collada element from \a xml.
- Always consumes the element.
-*/
-float QGLColladaFxEffectFactory::processParamOrFloatElement( QXmlStreamReader& xml )
-{
- if ( xml.name() == QLatin1String("param") )
- {
- qWarning() << "Warning: params not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- return 0.0;
- } else
- {
- return xml.readElementText().toFloat();
- }
-}
-
-
-
-/*!
- Parses and consumes a library_images collada element pointed to by \a xml,
- and pushes any images found onto the \a resultState for use in resolving
- elements later.
-*/
-void QGLColladaFxEffectFactory::processLibraryImagesElement( QXmlStreamReader& xml, ResultState* resultState )
-{
- xml.readNextStartElement();
-
- if ( xml.name() == QLatin1String("asset") )
- {
- qWarning() << "Warning: effect asset handling not supported in library_images element ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("image") && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- processImageElement( xml , resultState );
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-}
-
-
-/*!
- \internal
-*/
-QList<QGLColladaFxEffect*> QGLColladaFxEffectFactory::processLibraryEffectsElement( QXmlStreamReader& xml, ResultState* resultState )
-{
- QList<QGLColladaFxEffect*> result;
- // A collada library_effects is
- // 0 or 1 <asset>
- // 1 or more <effect>,
- // 0 or more <extra>;
- xml.readNextStartElement();
-
- if ( xml.name() == QLatin1String("asset") )
- {
- qWarning() << "Warning: effect asset handling not supported in effects library ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("effect") && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- result += processEffectElement( xml , resultState );
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("extra") )
- {
- qWarning() << "Warning: extra element not handled in effects library ( line" << xml.lineNumber() << ")";
- xml.readNextStartElement();
- }
-
- // be sure to exit cleanly
- findEndTag(xml, QLatin1String("library_effects"));
- return result;
-}
-
-
-
-/*!
- \internal
- Parses and consumes an effect element from \a xml.
-*/
-QList<QGLColladaFxEffect*> QGLColladaFxEffectFactory::processEffectElement( QXmlStreamReader& xml, ResultState* resultState )
-{
- // An effect element is:
- // 0 or 1 <annotate>
- // 0 or more newparam
- // 1 or more profile ( either <profile_BRIDGE>, <profile_CG>, <profile_GLES>, <profile_GLES2>, <profile_GLSL>, or <profile_COMMON>
- // 0 or more <extra>
-
- QList<QGLColladaFxEffect*> result;
- xml.readNextStartElement();
-
- if ( xml.name() == QLatin1String("annotate") )
- {
- qWarning() << "effect annotation not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("newparam") && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- processNewparamElement( xml , resultState );
- xml.readNextStartElement();
- }
-
- // find any of the profile_* elements defined in the spec
- QRegExp profileRegExp( QLatin1String("profile_(BRIDGE|CG|GLES2?|GLSL|COMMON)") );
- while ( profileRegExp.indexIn( xml.name().toString() ) == 0 && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- result += processProfileElement( xml, resultState );
- xml.readNextStartElement();
- }
-
- findEndTag(xml, QLatin1String("effect"));
- return result;
-}
-
-
-
-/*!
- \internal
-*/
-QList<QGLColladaFxEffect*> QGLColladaFxEffectFactory::processProfileElement( QXmlStreamReader& xml, ResultState* resultState )
-{
- // A profile_GLES2 element is:
- // 0 or 1 <asset>
- // 0 or more <code> or <include>
- // 0 or more <newparam>
- // 1 or more <technique>
-
- // A profile_GLSL element is:
- // 0 or 1 <asset>
- // 0 or more <code>
- // 0 or more <include>
- // 0 or more <newparam>
- // 1 or more <technique>
- // 0 or more <extra>
-
- // A profile_COMMON element is
- // an optional id element
- // 0 or 1 <asset>
- // 0 or more <newparam>
- // 1 <technique>
- // 0 or more <extra>
-
- // Note: techniques need to be handled differently for different profiles
-
- QString rootNodeString = xml.name().toString();
- QList<QGLColladaFxEffect*> result;
-
- xml.readNextStartElement();
- if ( xml.name() == QLatin1String("asset") )
- {
- qWarning() << "Warning: asset element not supported in " << rootNodeString << "elements ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if (rootNodeString == QLatin1String("profile_GLSL"))
- {
- while ( xml.name() == QLatin1String("code") )
- {
- QString codeSid = xml.attributes().value(QLatin1String("sid")).toString();
- QString codeText = xml.readElementText();
- resultState->paramSids[codeSid] = codeText;
-
- findEndTag(xml, QLatin1String("code"));
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("include") )
- {
- QString includeSid = xml.attributes().value(QLatin1String("sid")).toString();
- QString includeUrl = xml.attributes().value(QLatin1String("url")).toString();
-
- // create an include param?
- qWarning() << "Warning: include element not supported in " << rootNodeString << "elements ( line" << xml.lineNumber() << ")";
-
- findEndTag(xml, QLatin1String("include"));
- xml.readNextStartElement();
- }
-
- }
-
- while ( xml.tokenType() == QXmlStreamReader::StartElement &&
- ( xml.name() == QLatin1String("newparam") || xml.name() == QLatin1String("image") ))
- {
- if ( xml.name() == QLatin1String("newparam") )
- processNewparamElement( xml , resultState );
- else if ( xml.name() == QLatin1String("image") )
- processImageElement( xml , resultState );
-
- xml.readNextStartElement();
- }
-
-
- while ( xml.name() == QLatin1String("technique") )
- {
- result.append(
- processTechniqueElement( xml, resultState, rootNodeString ));
- xml.readNextStartElement();
- // only 1 technique in profile_COMMON
- if ( rootNodeString == QLatin1String("profile_COMMON"))
- {
- break;
- }
- };
-
- while ( xml.name() == QLatin1String("extra") )
- {
- qWarning() << "extra elements currently not supported in " << rootNodeString << "elements ( line" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("extra") );
- xml.readNextStartElement();
- };
-
- findEndTag( xml, rootNodeString );
- return result;
-}
-
-
-QGLColladaParam* QGLColladaFxEffectFactory::processPassElement( QXmlStreamReader& xml, ResultState* resultState, QGLColladaFxEffect* effect )
-{
- QGLColladaParam* result = 0;
- // a profile_GLSL pass is:
- // 0 or 1 <annotate>
- // 0 or 1 <states>
- // 0 or 1 <program> (CG, GLES2 or GLSL only)
- // 0 or 1 <evaluate>
- // 0 or 1 <extra>
-
- xml.readNextStartElement();
-
- if ( xml.name() == QLatin1String("annotate") )
- {
- qWarning() << "Warning: annotate element not supported ( line" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("annotate") );
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("states") )
- {
- qWarning() << "Warning: states element not supported ( line" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("states") );
- xml.readNextStartElement();
- }
-
- // 0 or 1 <program> (CG, GLES2 or GLSL only)
- if ( xml.name() == QLatin1String("program") )
- {
- processProgramElement( xml, resultState, effect );
- findEndTag( xml, QLatin1String("program") );
- xml.readNextStartElement();
- }
-
- // 0 or 1 <evaluate>
- if ( xml.name() == QLatin1String("evaluate") )
- {
- qWarning() << "Warning: evaluate element not supported ( line" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("evaluate") );
- xml.readNextStartElement();
- }
-
- // 0 or more <extra>
- while ( xml.name() == QLatin1String("extra") )
- {
- qWarning() << "Warning: extra element not supported ( line" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("extra") );
- xml.readNextStartElement();
- }
-
- findEndTag( xml, QLatin1String("pass"));
- return result;
-}
-
-QGLColladaFxEffect* QGLColladaFxEffectFactory::processTechniqueElement( QXmlStreamReader& xml, ResultState* resultState, QString &profileName )
-{
- // A 1.4 technique is:
- // 0 or 1 <asset>
- // 0 or more <newparam> or <image> (in any order)
- // 0 or more of <constant>, <lambert>, <phong>, <blinn>
- // 0 or more <extra>
-
- // A 1.5 profile_COMMON technique is:
- // 0 or 1 <asset>
- // exactly 1 of <blinn>, <constant>, <lambert>, or <phong>
- // 0 or more <extra>
-
- // a profile_GLSL technique is:
- // 0 or 1 <asset>
- // 0 or more <annotate>
- // 1 or more <pass>
- // 0 or more <extra>
-
- QGLColladaFxEffect* effect = new QGLColladaFxEffect();
-
- QXmlStreamAttributes attributes = xml.attributes();
- effect->setSid( attributes.value( QLatin1String("sid") ).toString() );
- QStringRef id = attributes.value( QLatin1String("id") );
- Q_UNUSED( id );
-
- xml.readNextStartElement();
-
- if ( xml.name() == QLatin1String("asset") )
- {
- qWarning() << "Warning: asset element not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("annotate") && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- qWarning() << "Warning: annotate element not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- // Collada specifies exactly one of blinn, lambert, constant or phong
- // If the effect is malformed, default QGLMaterial will be used.
- QGLMaterial* material = new QGLMaterial;
-
- if ( profileName == QLatin1String("profile_COMMON") &&
- (xml.name() == QLatin1String("blinn") || xml.name() == QLatin1String("phong") ||
- xml.name() == QLatin1String("constant") || xml.name() == QLatin1String("lambert")) )
- {
- if ( xml.name() == QLatin1String("blinn") )
- {
- effect->setLighting( QGLColladaFxEffect::BlinnLighting );
- } else if ( xml.name() == QLatin1String("phong") ) {
- effect->setLighting( QGLColladaFxEffect::PhongLighting );
- } else if ( xml.name() == QLatin1String("constant") ) {
- effect->setLighting( QGLColladaFxEffect::ConstantLighting );
- } else if ( xml.name() == QLatin1String("lambert") ) {
- effect->setLighting( QGLColladaFxEffect::LambertLighting );
- }
-
- // TODO: get appropriate shader fragments for the specified lighting models
- if ( xml.readNextStartElement() )
- {
- // a blinn element is 0 or 1 of each of:
- // <emission>
- // <diffuse>
- // <specular>
- // <shininess>
- // <reflectivity>
- // <transparent>
- // <transparency>
- // <index_of_refraction>
-
- if ( xml.name() == QLatin1String("emission") )
- {
- if ( xml.readNextStartElement() )
- {
- // handle color or texture element:
- if (xml.name() == QLatin1String("color"))
- {
- material->setEmittedLight( processColorElement( xml ));
-#ifdef DEBUG_MATERIALS
- qDebug() << "set emitted light to " << material->emittedLight();
-#endif
- }
- else if ( xml.name() == QLatin1String("texture"))
- {
- effect->d->emissiveTexture = processTextureElement( xml, resultState );
-#ifdef DEBUG_MATERIALS
- qDebug() << "set emissive texture to " << effect->d->emissiveTexture;
-#endif
- } else if ( xml.name() == QLatin1String("param"))
- {
- qWarning() << "params not supported in lighting elements ( line" << xml.lineNumber() << ")";
- }
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("ambient") )
- {
- if ( xml.readNextStartElement() )
- {
- // handle color or texture element:
- if (xml.name() == QLatin1String("color"))
- {
- material->setAmbientColor( processColorElement( xml ));
-#ifdef DEBUG_MATERIALS
- qDebug() << "set ambient color to " << material->ambientColor();
-#endif
- }
- else if ( xml.name() == QLatin1String("texture"))
- {
- effect->d->ambientTexture = processTextureElement( xml, resultState );
-#ifdef DEBUG_MATERIALS
- qDebug() << "set ambient texture to " << effect->d->ambientTexture;
-#endif
- } else if ( xml.name() == QLatin1String("param"))
- {
- qWarning() << "params not supported in lighting elements ( line" << xml.lineNumber() << ")";
- }
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("diffuse") )
- {
- if ( xml.readNextStartElement() )
- {
- // handle color or texture element:
- if (xml.name() == QLatin1String("color"))
- {
- material->setDiffuseColor( processColorElement( xml ));
-#ifdef DEBUG_MATERIALS
- qDebug() << "set diffuse color to " << material->diffuseColor();
-#endif
- }
- else if ( xml.name() == QLatin1String("texture"))
- {
- effect->d->diffuseTexture = processTextureElement( xml, resultState );
-#ifdef DEBUG_MATERIALS
- qDebug() << "set diffuse texture to " << effect->d->diffuseTexture;
-#endif
- } else if ( xml.name() == QLatin1String("param"))
- {
- qWarning() << "params not supported in lighting elements ( line" << xml.lineNumber() << ")";
- }
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("specular") )
- {
- if ( xml.readNextStartElement() )
- {
- // handle color or texture element:
- if (xml.name() == QLatin1String("color"))
- {
- material->setSpecularColor( processColorElement( xml ));
-#ifdef DEBUG_MATERIALS
- qDebug() << "set specular color to " << material->specularColor();
-#endif
- }
- else if ( xml.name() == QLatin1String("texture"))
- {
- effect->d->specularTexture = processTextureElement( xml, resultState );
-#ifdef DEBUG_MATERIALS
- qDebug() << "set specular texture to " << effect->d->specularTexture;
-#endif
- } else if ( xml.name() == QLatin1String("param"))
- {
- qWarning() << "params not supported in lighting elements ( line" << xml.lineNumber() << ")";
- }
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("shininess") )
- {
- if ( xml.readNextStartElement() )
- {
- float shininess = processParamOrFloatElement( xml );
- if ( 0.0 < shininess && shininess < 1.0 )
- {
- qWarning() << "Warning: Blinn-Torrance-Sparrow specular lighting not suported ( line" << xml.lineNumber()
- << "), converting to Blinn-Phong specular model";
- material->setShininess( int( shininess * 128.0 ));
- }
- else
- material->setShininess( int( shininess ) );
-#ifdef DEBUG_MATERIALS
- qDebug() << "set shininess to " << material->shininess();
-#endif
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("reflective") )
- {
- qWarning() << "Warning reflective not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("reflectivity") )
- {
- qWarning() << "Warning: reflectivity not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("transparent") )
- {
- if ( xml.readNextStartElement() )
- {
- if (xml.name() == QLatin1String("texture"))
- {
- QGLTexture2D* transparentTexture = processTextureElement( xml , resultState );
- Q_UNUSED(transparentTexture);
- qWarning() << "Warning: transparent not supported ( line" << xml.lineNumber() << ")";
-#ifdef DEBUG_MATERIALS
- qDebug() << "unused transparent texture" << transparentTexture;
-#endif
- }
- else if (xml.name() == QLatin1String("color"))
- {
- QColor transparent = processColorElement( xml );
- Q_UNUSED( transparent );
- qWarning() << "Warning: transparent not supported ( line" << xml.lineNumber() << ")";
-#ifdef DEBUG_MATERIALS
- qDebug() << "unused transparent color of " << transparent;
-#endif
- }
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if ( xml.name() == QLatin1String("transparency") )
- {
- if ( xml.readNextStartElement() )
- {
- float transparency = processParamOrFloatElement( xml );
- if ( transparency < 1.0 )
- {
- qWarning() << "Warning: transparency not supported";
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
- }
-
- if ( xml.name() == QLatin1String("index_of_refraction") )
- {
- if ( xml.readNextStartElement() )
- {
- float indexOfRefraction = processParamOrFloatElement( xml );
- Q_UNUSED( indexOfRefraction );
- qWarning() << "Warning: index_of_refraction not supported ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- }
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
- }
- // end of lighting scope
-
- effect->setMaterial( material );
-
- switch(effect->lighting())
- {
- case QGLColladaFxEffect::PhongLighting:
- case QGLColladaFxEffect::LambertLighting:
- qWarning() << "Warning: requested lighting not supported, using Blinn-Phong instead";
- case QGLColladaFxEffect::BlinnLighting:
- effect->addBlinnPhongLighting();
- case QGLColladaFxEffect::ConstantLighting:
- case QGLColladaFxEffect::NoLighting:
- default:
- break;
- }
- };
-
- while ( xml.name() == QLatin1String("pass") && xml.tokenType() == QXmlStreamReader::StartElement )
- {
- processPassElement( xml, resultState, effect);
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- // Make sure to exit cleanly
- findEndTag( xml, QLatin1String("technique") );
-
- return effect;
-}
-
-
-
-QGLColladaParam* QGLColladaFxEffectFactory::processNewparamElement( QXmlStreamReader& xml, ResultState* resultState)
-{
- QXmlStreamAttributes attributes = xml.attributes();
- QString sidString = attributes.value(QLatin1String("sid")).toString();
- QGLColladaParam* result = 0;
- if (xml.readNextStartElement())
- {
- if (xml.name().toString().left(5) == QLatin1String("float"))
- {
-
- QVariant floatValues = processFloatList( xml );
- resultState->paramSids[sidString] = floatValues;
-
- if ( xml.name() == QLatin1String("float")
- && ( floatValues.type() !=
- static_cast<QVariant::Type>(QMetaType::Float )))
- {
- qWarning() << "Warning: parsed type incorrectly, expected float ( line" << xml.lineNumber() << ")";
- resultState->paramSids[sidString] = floatValues.value<float>();
- }
- else if ( xml.name() == QLatin1String("float2")
- && floatValues.type() != QVariant::Vector2D )
- {
- qWarning() << "Warning: parsed type incorrectly, expected float2 ( line" << xml.lineNumber() << ")";
- }
- else if ( xml.name() == QLatin1String("float3")
- && floatValues.type() != QVariant::Vector3D )
- {
- qWarning() << "Warning: parsed type incorrectly, expected float3 ( line" << xml.lineNumber() << ")";
- }
- else if ( xml.name() == QLatin1String("float4")
- && floatValues.type() != QVariant::Vector4D)
- {
- qWarning() << "Warning: parsed type incorrectly, expected float4 ( line" << xml.lineNumber() << ")";
- }
- } else if ( xml.name() == QLatin1String("sampler2D") )
- {
- processSampler2DElement( xml , resultState, sidString );
- } else if ( xml.name() == QLatin1String("surface") )
- {
- result = processSurfaceElement( xml, resultState, sidString);
- } else {
- qWarning() << "unrecognized parameter type ( line:" << xml.lineNumber() << ")";
- findEndTag( xml, QLatin1String("newparam") );
- return 0;
- }
- }
- findEndTag(xml, QLatin1String("newparam"));
- return result;
-}
-
-
-/*!
- \internal
- the library_images can come after the library_effects, so textures referenced
- in effects might not have been defined when the effect was created. Try and
- resolve those images now. (Other properties - wrap, mipmap and filters etc
- should have been resolved when the texture was originally parsed).
- */
-bool QGLColladaFxEffectFactory::resolveTexture2DImage(QGLTexture2D *texture, ResultState *resultState, QString paramName)
-{
- if (texture == 0)
- {
- qWarning() << "Warning: Cannot resolve images for null QGLTexture2D";
- return false;
- }
- QVariant samplerParam = findParameterVariant(resultState, paramName);
- QString surfaceName = samplerParam.value<QString>();
- QImage image;
-
- if (!surfaceName.isEmpty())
- {
- QVariant surfaceParam = findParameterVariant(resultState, surfaceName);
- QString initFrom = surfaceParam.value<QString>();
- if (!initFrom.isEmpty())
- {
- image = resolveImageURI(resultState, initFrom);
- }
- }
-
- // If that's failed, try again with the passed in paramName
- if (image.isNull())
- {
- image = resolveImageURI(resultState, paramName);
- }
-
- texture->setImage(image);
- return !image.isNull();
-}
-
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QGLTexture2D*);
-
-QT_BEGIN_NAMESPACE
-/*!
- \internal
- Parses and consumes a texture collada element from \a xml.
-*/
-QGLTexture2D* QGLColladaFxEffectFactory::processTextureElement( QXmlStreamReader& xml , ResultState* resultState )
-{
- QGLTexture2D* result = new QGLTexture2D();
- QXmlStreamAttributes attributes = xml.attributes();
-
- foreach (QXmlStreamAttribute attribute, attributes)
- {
- if ( attribute.name() == QLatin1String("texture") )
- {
- QString paramName = attribute.value().toString();
-
- // in Collada Fx Textures must reference a previously defined
- // sampler2D param.
- // However, this sampler may refer to images in the library_images,
- // which is parsed after the library_effects, so try and resolve
- // now, but save failures to try again later.
-
- if (!resolveTexture2DImage(result, resultState, paramName))
- {
- resultState->unresolvedTexture2Ds[result] = paramName;
- }
- } else if ( attribute.name() == QLatin1String("texcoord") )
- {
- // TODO: Create a repository for this sort of data, to be used in creating the shader progams later
- // I'm pretty sure the effect is going to need to be passed in.
- qWarning() << "texcoord not supported yet: " << attribute.name() << attribute.value() << " ( line" << xml.lineNumber() << ")";
- } else if (attribute.name() == QLatin1String("extra"))
- {
- qWarning() << "extra elements in texture elements not supported ( line" << xml.lineNumber() << ")";
- }
- }
- xml.skipCurrentElement();
-
- return result;
-}
-
-/*!
- \internal
- Try and get an image to attach to a texture. The URI could be a reference to
- a param in the collada document (which may in turn be a reference), or
- file referenced either absolutely or relative to the original dae file.
- (It could concievably be a web URL, but that is not handled here.)
- */
-QImage QGLColladaFxEffectFactory::resolveImageURI(ResultState *resultState, QString URI)
-{
- QImage result;
- QString imageFileName;
- QString workingURI = URI;
- if (workingURI.length() > 0 && workingURI.at(0) == QLatin1Char('#'))
- {
- workingURI = workingURI.right(workingURI.length() - 1);
- }
-
- QVariant potentialParameter = findParameterVariant(resultState, workingURI);
- // Might be parameter itself:
- if ( !potentialParameter.value<QImage>().isNull() )
- return potentialParameter.value<QImage>();
- // or might be another URI
- if (!potentialParameter.value<QString>().isNull())
- {
- imageFileName = potentialParameter.value<QString>();
- } else {
- imageFileName = workingURI;
- }
-
- // First try as a relative path.
- QString filePath = resultState->sourceDir.path() + QLatin1Char('/') + imageFileName;
- result.load(filePath);
- if (result.isNull())
- {
- // No relative file found, so try as an absolute path
- result.load(imageFileName);
- }
- return result;
-}
-
-/*!
- \internal
- Parses and consumes an image element from \a xml.
-*/
-void QGLColladaFxEffectFactory::processImageElement( QXmlStreamReader& xml, ResultState* resultState )
-{
- // 1.4 has a bunch of optional values in the attributes:
- QString sid = xml.attributes().value(QLatin1String("sid")).toString();
- QString id = xml.attributes().value(QLatin1String("id")).toString();
- QString name = xml.attributes().value(QLatin1String("name")).toString();
-
- QString height = xml.attributes().value(QLatin1String("height")).toString();
- QString width = xml.attributes().value(QLatin1String("width")).toString();
- QString depth = xml.attributes().value(QLatin1String("depth")).toString();
-
- Q_UNUSED(height);
- Q_UNUSED(width);
- Q_UNUSED(depth);
-
- QImage result;
-
- xml.readNextStartElement();
- if (xml.name() == QLatin1String("asset"))
- {
- qWarning() << "asset element not supported in image elements ( line" << xml.lineNumber() << ")";
- xml.skipCurrentElement();
- xml.readNextStartElement();
- }
-
- if (xml.name() == QLatin1String("init_from"))
- {
- QString imageFileName = xml.readElementText().trimmed();
- QDir sourceDir = resultState->sourceDir;
- // ignore path information for resources
- QString filePath = sourceDir.path() + QLatin1Char('/') + imageFileName;
- result.load(filePath);
- if (result.isNull())
- {
- // Catch resources or files with absolute paths
- result.load(imageFileName);
- }
- if (!sid.isEmpty())
- resultState->paramSids[sid] = result;
- if (!id.isEmpty())
- resultState->paramIds[id] = result;
- if (!name.isEmpty())
- resultState->paramNames[name] = result;
- }
-
- // exit cleanly
- findEndTag( xml, QLatin1String("image"));
-}
-
-QStringList QGLColladaFxEffectFactory::glslProfileFromEffect(QGLColladaFxEffect* effect, QString sid)
-{
- Q_UNUSED(effect)
- Indent indent;
- QStringList result;
- result += indent + QLatin1String("<profile_GLSL>");
- {
- result += generateCodeElements(effect, sid);
- result += indent + QLatin1String("<technique sid=\"") + sid + QLatin1String("\">");
- {
- Indent indent;
- result += indent + QLatin1String("<pass>");
- result += generateProgramElement(effect, sid);
- result += indent + QLatin1String("</pass>");
- }
- result += indent + QLatin1String("</technique>");
- }
- result += indent + QLatin1String("</profile_GLSL>");
-
- return result;
-}
-
-QStringList QGLColladaFxEffectFactory::generateProgramElement(QGLColladaFxEffect* effect, QString techniqueSid)
-{
- QStringList result;
- QString vertexShaderRefSid = QLatin1String("VertexShaderRefSidRefsCodeOrIncludeAtProfileOrEffectLevel");
- QString fragmentShaderRefSid = QLatin1String("FragmentShaderRefSidRefsCodeOrIncludeAtProfileOrEffectLevel");
- Indent indent;
- result += indent + QLatin1String("<program>");
- result += generateShaderElement(effect, techniqueSid + QLatin1String("VertexShader"), techniqueSid + QLatin1String("FragmentShader"));
- // 0 or more
- result += generateBindAttributeElement( effect );
- // 0 or more
- result += generateBindUniformElements( effect );
- result += indent + QLatin1String("</program>");
- return result;
-}
-
-QStringList QGLColladaFxEffectFactory::generateShaderElement( QGLColladaFxEffect* effect, QString vertexShaderRefSid, QString fragmentShaderRefSid )
-{
- Q_UNUSED(effect);
- QStringList result;
- Indent indent;
- result += indent + QLatin1String("<shader stage=\"VERTEX\">");
- {
- Indent indent;
- result += indent + QLatin1String("<sources>");
- {
- // 0 or more <import> elements
- Indent indent;
- result += indent + QLatin1String("<import ref=\"") + vertexShaderRefSid + QLatin1String("\"/>");
- }
- result += indent + QLatin1String("</sources>");
- // 0 or <extra> elements;
- }
- result += indent + QLatin1String("</shader>");
-
- result += indent + QLatin1String("<shader stage=\"FRAGMENT\">");
- {
- Indent indent;
- result += indent + QLatin1String("<sources>");
- {
- Indent indent;
- result += indent + QLatin1String("<import ref=\"") + fragmentShaderRefSid + QLatin1String("\"/>");
- }
- result += indent + QLatin1String("</sources>");
- // <extra> element(s) here if necessary;
- }
- result += indent + QLatin1String("</shader>");
- return result;
-}
-
-QStringList QGLColladaFxEffectFactory::generateBindAttributeElement( QGLColladaFxEffect* effect )
-{
- // Currently no need for bind_attribute elements.
- Q_UNUSED(effect);
- QStringList result;
- // Indent indent;
- // result += indent + "<bind_attribute>";
- // result += indent + "</bind_attribute>";
- return result;
-}
-
-QStringList generateBindUniformParamElement( QString symbol, QString ref)
-{
- QStringList result;
- // 0 or more <bind_uniform> elements
- Indent indent;
- result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
- {
- Indent indent;
- result += indent + QLatin1String("<param ref=\"") + ref + QLatin1String("\">");
- }
- result += indent + QLatin1String("</bind_uniform>");
- return result;
-}
-
-QStringList generateBindUniformParamElement( QString symbol, const QVector3D& value)
-{
- QStringList result;
- // 0 or more <bind_uniform> elements
- Indent indent;
- result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
- {
- Indent indent;
- result += indent + QString(QLatin1String("<float3> %1 %2 %3 </float3>")).arg(value.x()).arg(value.y()).arg(value.z());
- }
- result += indent + QLatin1String("</bind_uniform>");
- return result;
-}
-
-QStringList generateBindUniformParamElement( QString symbol, const QColor& value)
-{
- QStringList result;
- // 0 or more <bind_uniform> elements
- Indent indent;
- result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
- {
- Indent indent;
- result += indent + QString(QLatin1String("<float3> %1 %2 %3 </float3>")).arg(value.redF()).arg(value.greenF()).arg(value.blueF());
- }
- result += indent + QLatin1String("</bind_uniform>");
- return result;
-}
-
-
-QStringList QGLColladaFxEffectFactory::generateBindUniformElements( QGLColladaFxEffect* effect )
-{
- QStringList result;
- if (effect == 0)
- return result;
- // // 0 or more <bind_uniform> elements
- // Example uniforms
- // result += generateBindUniformParamElement( "exampleRefSymbol", QString("exampleRef"));
- // result += generateBindUniformParamElement( "exampleFloat3Symbol", QVector3D(0.1, 0.2, 0.3) );
-
- if (effect->material() != 0)
- {
- QGLMaterial* material = effect->material();
-
- // Actual uniforms:
- result += generateBindUniformParamElement( QLatin1String("ambientColor"), material->ambientColor());
- result += generateBindUniformParamElement( QLatin1String("diffuseColor"), material->diffuseColor());
- result += generateBindUniformParamElement( QLatin1String("emittedLight"), material->emittedLight());
- result += generateBindUniformParamElement( QLatin1String("objectName"), material->objectName());
- result += generateBindUniformParamElement( QLatin1String("shininess"), material->shininess());
- result += generateBindUniformParamElement( QLatin1String("specularColor"), material->specularColor());
-
- effect->supportsPicking();
-
- // TODO: Find and store effect uniforms
- // effect->bindProgramUniforms();
- }
- return result;
-}
-
-QStringList QGLColladaFxEffectFactory::generateCodeElements( QGLColladaFxEffect* effect, QString baseSid )
-{
- QStringList result;
- // 0 or more <bind_uniform> elements
- Indent indent;
-
- // put all this on one line to avoid adding carriage returns to the
- // shader programs
- result += indent + QLatin1String("<code sid=\"") + baseSid + QLatin1String("VertexShader\">")
- + effect->vertexShader() + QLatin1String("</code>");
-
- result += indent + QLatin1String("<code sid=\"") + baseSid + QLatin1String("FragmentShader\">")
- + effect->fragmentShader() + QLatin1String("</code>");
-
- return result;
-}
-
-void QGLColladaFxEffectFactory::processProgramElement( QXmlStreamReader& xml, ResultState* resultState, QGLColladaFxEffect* effect )
-{
- // A profile_GLSL shader element is
- // 0 or more <shader>
- // 0 or more <bind_attribute>
- // 0 or more <bind_uniform>
-
- xml.readNextStartElement();
-
- while ( xml.name() == QLatin1String("shader") )
- {
- // in profile_GLSL a shader is
- // exactly 1 <source>
- // 0 or more <extra>
-
- QString stage = xml.attributes().value(QLatin1String("stage")).toString();
- xml.readNextStartElement();
- if ( xml.name() == QLatin1String("sources") )
- {
- // a <sources> element is
- // 1 or more <inline> elements
- // 0 or more <import> elements
- // Note: child elements can appear in any order
-
- xml.readNextStartElement();
- while ( (xml.name() == QLatin1String("inline") || xml.name() == QLatin1String("import")) && xml.tokenType() == QXmlStreamReader::StartElement)
- {
- if ( xml.name() == QLatin1String("import"))
- {
- QString ref = xml.attributes().value(QLatin1String("ref")).toString();
-
- QXmlStreamAttribute attr;
- if (xml.attributes().count())
- {
- attr = xml.attributes().first();
- }
-
- QVariant param = findParameterVariant(resultState, ref);
- if (param.isNull() || param.type() != QVariant::String)
- {
- qWarning() << "null or unexpected parameter found in import element ( line"
- << xml.lineNumber()<<")";
- }
- else
- {
- if (stage == QLatin1String("VERTEX"))
- {
- effect->setVertexShader( param.value<QString>().toLatin1() );
- }
- else if (stage == QLatin1String("FRAGMENT"))
- {
- effect->setFragmentShader( param.value<QString>().toLatin1() );
- } else
- {
- qWarning() << "unrecognized shader stage: "
- << stage << " ( line" << xml.lineNumber()<<")";
- }
- }
-
- } else if ( xml.name() == QLatin1String("inline"))
- {
-
- }
- xml.readNextStartElement();
- }
- } else {
- qWarning() << "collada parsing error. expected <sources> element ( line"
- << xml.lineNumber()<<")";
- }
-
- if (xml.name() == QLatin1String("extra"))
- qWarning() << "Warning: extra element not supported in profile_GLSL <shader> element ( line" << xml.lineNumber()<<")";
-
- findEndTag ( xml, QLatin1String("shader"));
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("bind_attribute") )
- {
- qWarning() << "Warning: bind_attribute element not supported ( line" << xml.lineNumber()<<")";
- findEndTag ( xml, QLatin1String("bind_attribute"));
- xml.readNextStartElement();
- }
-
- while ( xml.name() == QLatin1String("bind_uniform") )
- {
- qWarning() << "Warning: bind_uniform element not supported ( line" << xml.lineNumber()<<")";
- findEndTag ( xml, QLatin1String("bind_uniform"));
- xml.readNextStartElement();
- }
-
- findEndTag(xml, QLatin1String("program"));
- return;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.h b/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.h
deleted file mode 100644
index f5bc0997e4b5c34defcf6262c47d37f025c3fa49..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffectfactory.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCOLLADAFXEFFECTFACTORY_H
-#define QGLCOLLADAFXEFFECTFACTORY_H
-
-#include <QVector>
-#include <QXmlStreamReader>
-#include <QDir>
-#include "qgl.h"
-#include "qgltexture2d.h"
-
-#include "qglcolladafxeffect.h"
-
-Q_DECLARE_METATYPE(QArray<float>)
-
-QT_BEGIN_NAMESPACE
-
-class QGLColladaFxEffect;
-class QGLColladaImageParam;
-class QGLColladaSurfaceParam;
-class QGLColladaSampler2DParam;
-
-typedef struct _ResultState
-{
- QMap<QString, QVariant> paramSids;
- QMap<QString, QVariant> paramIds;
- QMap<QString, QVariant> paramNames;
- QDir sourceDir;
- QMap<QGLTexture2D*, QString> unresolvedTexture2Ds;
-} ResultState;
-
-
-
-
-class Q_QT3D_EXPORT QGLColladaFxEffectFactory
-{
-public:
- // Collada parsing functions
- static QList<QGLColladaFxEffect*> loadEffectsFromFile(const QString& fileName );
-
-protected:
- static QList<QGLColladaFxEffect*> loadEffectsFromXml( QXmlStreamReader& xml, QDir homeDirectory = QDir());
- static void processLibraryImagesElement( QXmlStreamReader& xml, ResultState* stateStack );
- static QList<QGLColladaFxEffect*> processLibraryEffectsElement( QXmlStreamReader& xml, ResultState* stateStack );
- static QList<QGLColladaFxEffect*> processEffectElement( QXmlStreamReader& xml, ResultState* stateStack );
- static QList<QGLColladaFxEffect*> processProfileElement( QXmlStreamReader& xml, ResultState* stateStack );
-
- static QGLColladaParam* processPassElement( QXmlStreamReader& xml, ResultState* stateStack, QGLColladaFxEffect* effect );
- static QGLColladaFxEffect* processTechniqueElement( QXmlStreamReader& xml, ResultState* stateStack, QString &profileName );
- static QGLColladaParam* processNewparamElement( QXmlStreamReader& xml, ResultState* stateStack );
- static void processImageElement( QXmlStreamReader& xml, ResultState* stateStack );
- static QGLColladaSurfaceParam* processSurfaceElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid = "");
- static void processSampler2DElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid );
- static QGLTexture2D* processTextureElement( QXmlStreamReader& xml , ResultState* stateStack );
- static QVariant processFloatList( QXmlStreamReader& xml );
- static QColor processColorElement( QXmlStreamReader& xml );
- static float processParamOrFloatElement( QXmlStreamReader& xml );
- static QVariant processColorOrTextureElement( QXmlStreamReader& xml );
- QGLColladaFxEffectFactory();
- static void processProgramElement( QXmlStreamReader& xml, ResultState* stateStack, QGLColladaFxEffect* effect );
-
- // Collada generation functions
-public:
- static QString exportEffect(QGLColladaFxEffect *effect, QString effectId, QString techniqueSid);
-
-protected:
- static QStringList glslProfileFromEffect(QGLColladaFxEffect* effect, QString techniqueSid);
- static QStringList generateProgramElement(QGLColladaFxEffect* effect, QString techniqueSid);
- static QStringList generateShaderElement( QGLColladaFxEffect* effect, QString vertexShaderRefSid, QString fragmentShaderRefSid );
- static QStringList generateBindUniformElement( QGLColladaFxEffect* effect );
- static QStringList generateBindAttributeElement( QGLColladaFxEffect* effect );
- static QStringList generateBindUniformElements( QGLColladaFxEffect* effect );
- static QStringList generateCodeElements( QGLColladaFxEffect* effect, QString baseSid );
-
- static QImage resolveImageURI(ResultState *resultState, QString imageFileName);
- static bool resolveTexture2DImage(QGLTexture2D *result, ResultState *resultState, QString paramName);
-};
-
-
-
-class QGLColladaParam
-{
- friend class QGLColladaFxEffectFactory;
-public:
- enum {
- UnknownType = 0,
- Sampler2DType,
- Texture2DType,
- SurfaceType,
- ImageType,
- UserDefinedType = 100
- };
-
- virtual ~QGLColladaParam();
-
- int type();
- QVector<float> value();
- QString sid();
- QString id();
-
- static QString typeString(int);
-
-protected:
- QGLColladaParam(QString sid, int type);
- QString mSid;
- QString mId;
- int mType;
- QVector<float> mValue;
-};
-
-
-
-class QGLColladaTextureParam : public QGLColladaParam
-{
- friend class QGLColladaFxEffectFactory;
-public:
- QGLColladaTextureParam(QString sid, QGLTexture2D* texture);
- QGLTexture2D* texture();
- QString samplerSid();
-protected:
- QGLTexture2D* mTexture;
- QString sampler2DSid;
- QString texCoordSid;
-};
-
-
-
-class QGLColladaSurfaceParam : public QGLColladaParam
-{
- friend class QGLColladaFxEffectFactory;
-public:
- QGLColladaSurfaceParam(QString sid);
-protected:
- QString mInitFrom;
- QString mFormat;
- QString mFormatHint;
- QString mSize;
- QVector<int> mSizeVector;
- QPointF mViewportRatio;
- int mMipLevels;
- bool mMipMapGenerate;
- QString mExtra;
- QString mGenerator;
-};
-
-
-
-class QGLColladaSampler2DParam : public QGLColladaParam
-{
- friend class QGLColladaFxEffectFactory;
-public:
- QGLColladaSampler2DParam(QString sid, QGLTexture2D* sampler);
- QGLColladaSampler2DParam(QString sid, QString sourceSid);
- QGLTexture2D sampler();
- QString sourceSid();
-protected:
- QGLTexture2D* mTexture;
- QString mSourceSid;
-};
-
-
-
-// "image" isn't really a param, but it shares enough that it seems sensible
-// to re-use the QGLColladaParam base.
-class QGLColladaImageParam : public QGLColladaParam
-{
- friend class QGLColladaFxEffectFactory;
-public:
- QGLColladaImageParam(QString sid, QImage image);
- QImage image();
- QString name();
-protected:
- QImage mImage;
- QString mName;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLCOLLADAFXEFFECTFACTORY_H
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.cpp b/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.cpp
deleted file mode 100644
index 936e7ce5e5ad767992f17c5d5fd009f36ff16f3d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcolladafxeffectloader.h"
-
-#include <QList>
-#include "qglcolladafxeffectfactory.h"
-#include "qglcolladafxeffect.h"
-
-#include <QStringList>
-
-//Q_DECLARE_METATYPE(QGLColladaFxEffect)
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLColladaFxEffectLoader
- \brief The QGLColladaFxEffectLoader class is a convenient way to load
- effects from collada files for use with Qt3D.
- \since 4.8
- \ingroup qt3d
-
- QGLColladaFxEffectLoader provides a simple class to create and store
- QGLColladaEffect objects from Collada Fx files. It currently supports
- a simple subset of the Collada 1.5 Fx specification.
-
- The QGLColladaEffect effects are destroyed automatically when the loader
- is destroyed. If finer control over effect lifetime is required, use
- QGLColladaFxEffectFactory::loadEffectsFromFile() directly.
-*/
-
-class QGLColladaFxEffectLoaderPrivate
-{
-public:
- QList<QGLColladaFxEffect*> effects;
- ~QGLColladaFxEffectLoaderPrivate()
- {
- deleteAndClearEffects();
- }
-
- void deleteAndClearEffects()
- {
- while (effects.count())
- {
- delete effects.back();
- effects.pop_back();
- }
- }
-
-};
-
-
-/*!
- Constructs an empty QGLColladaFxEffectLoader object.
-*/
-QGLColladaFxEffectLoader::QGLColladaFxEffectLoader() :
- d_ptr(new QGLColladaFxEffectLoaderPrivate())
-{
-}
-
-/*!
- Destroys the QGLColladaFxEffectLoader and any generated QGLColladaFxEffect
- objects.
-*/
-QGLColladaFxEffectLoader::~QGLColladaFxEffectLoader()
-{
-}
-
-/*!
- Reads the collada file indicated by \a filename and generates
- QGLColladaFxEffect objects from it.
-
- The QGLColladaFxEffectFactory owns all the effects it generates, and destroys
- them when it is destroyed, or when a new file is loaded.
-
- If effects are needed from multiple files, use one QGLColladaFxEffectLoader
- per file.
-
- Returns true if at least one effect was generated.
-
- \sa effectNames(), effect(), operator[](), QGLColladaFxEffectFactory::loadEffectsFromFile()
- */
-bool QGLColladaFxEffectLoader::load(QString filename)
-{
- Q_D(QGLColladaFxEffectLoader);
- d->deleteAndClearEffects();
- d->effects = QGLColladaFxEffectFactory::loadEffectsFromFile(filename);
- return d->effects.count() > 0;
-}
-
-/*!
- Returns a list of the sid attributes of effects that have been generated
- \sa effect()
- */
-QStringList QGLColladaFxEffectLoader::effectNames()
-{
- Q_D(QGLColladaFxEffectLoader);
- QStringList result;
- QGLColladaFxEffect *effect;
- foreach (effect, d->effects)
- {
- result.append(effect->sid());
- }
- return result;
-}
-
-/*!
- Returns a pointer to the effect with an sid matching \a effectName, or
- 0 if no such effect exists.
-
- \sa load()
- */
-QGLColladaFxEffect* QGLColladaFxEffectLoader::effect(QString effectName)
-{
- Q_D(QGLColladaFxEffectLoader);
- QGLColladaFxEffect* effect;
-
- foreach (effect, d->effects)
- {
- if (effect && effect->sid() == effectName)
- {
- return effect;
- }
- }
- return 0;
-}
-
-/*!
- Returns the number of effects the loader has generated and stored.
- */
-int QGLColladaFxEffectLoader::count()
-{
- Q_D(QGLColladaFxEffectLoader);
- return d->effects.count();
-}
-
-/*!
- Returns a pointer to the effect in position \a i. QGLColladaFxEffectLoader
- makes no guarantee about the ordering of effects relative to their position
- in a collada document, but does not reorder effects once they have been read.
-
- \sa load()
- */
-QGLColladaFxEffect *QGLColladaFxEffectLoader::operator[](int i)
-{
- Q_D(QGLColladaFxEffectLoader);
- Q_ASSERT(i < d->effects.count());
-
- return d->effects.at(i);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.h b/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.h
deleted file mode 100644
index 517c74bd38216170669fa313181012f8099f1013..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglcolladafxeffectloader.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCOLLADAFXEFFECTLOADER_H
-#define QGLCOLLADAFXEFFECTLOADER_H
-
-#include <qglobal.h>
-#include <QString>
-#include <QStringList>
-#include <QtCore/qscopedpointer.h>
-#include "qt3dglobal.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGLColladaFxEffect;
-class QGLColladaFxEffectLoaderPrivate;
-
-class Q_QT3D_EXPORT QGLColladaFxEffectLoader
-{
-public:
- QGLColladaFxEffectLoader();
- ~QGLColladaFxEffectLoader();
- bool load(QString filename);
- QStringList effectNames();
- QGLColladaFxEffect *effect(QString effectName);
- int count();
- QGLColladaFxEffect* operator[](int);
-private:
- Q_DECLARE_PRIVATE(QGLColladaFxEffectLoader);
- QScopedPointer<QGLColladaFxEffectLoaderPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLCOLLADAFXEFFECTLOADER_H
diff --git a/src/gui/extern/Qt3D/effects/qglflatcoloreffect.cpp b/src/gui/extern/Qt3D/effects/qglflatcoloreffect.cpp
deleted file mode 100644
index ff07452dd1ee064fe377d4bcb4678abb9550de53..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglflatcoloreffect.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglflatcoloreffect_p.h"
-#include "qglabstracteffect_p.h"
-#include <QtOpenGL/qglshaderprogram.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLFlatColorEffect
- \since 4.8
- \brief The QGLFlatColorEffect class provides a standard effect that draws fragments with a flat unlit color.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-/*!
- \class QGLPerVertexColorEffect
- \since 4.8
- \brief The QGLPerVertexColorEffect class provides a standard effect that draws fragments with a per-vertex unlit color.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-class QGLFlatColorEffectPrivate
-{
-public:
- QGLFlatColorEffectPrivate()
- : program(0)
- , matrixUniform(-1)
- , colorUniform(-1)
- , isFixedFunction(false)
- {
- }
-
- QGLShaderProgram *program;
- int matrixUniform;
- int colorUniform;
- bool isFixedFunction;
-};
-
-/*!
- Constructs a new flat color effect.
-*/
-QGLFlatColorEffect::QGLFlatColorEffect()
- : d_ptr(new QGLFlatColorEffectPrivate)
-{
-}
-
-/*!
- Destroys this flat color effect.
-*/
-QGLFlatColorEffect::~QGLFlatColorEffect()
-{
-}
-
-/*!
- \reimp
-*/
-bool QGLFlatColorEffect::supportsPicking() const
-{
- return true;
-}
-
-/*!
- \reimp
-*/
-void QGLFlatColorEffect::setActive(QGLPainter *painter, bool flag)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- Q_UNUSED(painter);
- if (flag)
- glEnableClientState(GL_VERTEX_ARRAY);
- else
- glDisableClientState(GL_VERTEX_ARRAY);
-#else
- Q_UNUSED(painter);
- Q_D(QGLFlatColorEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (painter->isFixedFunction()) {
- d->isFixedFunction = true;
- if (flag)
- glEnableClientState(GL_VERTEX_ARRAY);
- else
- glDisableClientState(GL_VERTEX_ARRAY);
- return;
- }
-#endif
- static char const flatColorVertexShader[] =
- "attribute highp vec4 vertex;\n"
- "uniform highp mat4 matrix;\n"
- "void main(void)\n"
- "{\n"
- " gl_Position = matrix * vertex;\n"
- "}\n";
-
- static char const flatColorFragmentShader[] =
- "uniform mediump vec4 color;\n"
- "void main(void)\n"
- "{\n"
- " gl_FragColor = color;\n"
- "}\n";
-
- QGLShaderProgram *program =
- painter->cachedProgram(QLatin1String("qt.color.flat"));
- d->program = program;
- if (!program) {
- if (!flag)
- return;
- program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, flatColorVertexShader);
- program->addShaderFromSourceCode(QGLShader::Fragment, flatColorFragmentShader);
- program->bindAttributeLocation("vertex", QGL::Position);
- if (!program->link()) {
- qWarning("QGLFlatColorEffect::setActive(): could not link shader program");
- delete program;
- return;
- }
- painter->setCachedProgram(QLatin1String("qt.color.flat"), program);
- d->program = program;
- d->colorUniform = program->uniformLocation("color");
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->enableAttributeArray(QGL::Position);
- } else if (flag) {
- d->colorUniform = program->uniformLocation("color");
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->enableAttributeArray(QGL::Position);
- } else {
- program->disableAttributeArray(QGL::Position);
- program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLFlatColorEffect::update
- (QGLPainter *painter, QGLPainter::Updates updates)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateColor |
- QGLPainter::UpdateMatrices));
-#else
- Q_D(QGLFlatColorEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->isFixedFunction) {
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateColor |
- QGLPainter::UpdateMatrices));
- return;
- }
-#endif
- if ((updates & QGLPainter::UpdateColor) != 0) {
- if (painter->isPicking())
- d->program->setUniformValue(d->colorUniform, painter->pickColor());
- else
- d->program->setUniformValue(d->colorUniform, painter->color());
- }
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- QMatrix4x4 proj = painter->projectionMatrix();
- QMatrix4x4 mv = painter->modelViewMatrix();
- d->program->setUniformValue(d->matrixUniform, proj * mv);
- }
-#endif
-}
-
-class QGLPerVertexColorEffectPrivate
-{
-public:
- QGLPerVertexColorEffectPrivate()
- : program(0)
- , matrixUniform(-1)
- , isFixedFunction(false)
- {
- }
-
- QGLShaderProgram *program;
- int matrixUniform;
- bool isFixedFunction;
-};
-
-/*!
- Constructs a new per-vertex color effect.
-*/
-QGLPerVertexColorEffect::QGLPerVertexColorEffect()
- : d_ptr(new QGLPerVertexColorEffectPrivate)
-{
-}
-
-/*!
- Destroys this per-vertex color effect.
-*/
-QGLPerVertexColorEffect::~QGLPerVertexColorEffect()
-{
-}
-
-/*!
- \reimp
-*/
-void QGLPerVertexColorEffect::setActive(QGLPainter *painter, bool flag)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- Q_UNUSED(painter);
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_COLOR_ARRAY);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_COLOR_ARRAY);
- }
-#else
- Q_UNUSED(painter);
- Q_D(QGLPerVertexColorEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (painter->isFixedFunction()) {
- d->isFixedFunction = true;
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_COLOR_ARRAY);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_COLOR_ARRAY);
- }
- return;
- }
-#endif
- static char const pvColorVertexShader[] =
- "attribute highp vec4 vertex;\n"
- "attribute mediump vec4 color;\n"
- "uniform highp mat4 matrix;\n"
- "varying mediump vec4 qColor;\n"
- "void main(void)\n"
- "{\n"
- " gl_Position = matrix * vertex;\n"
- " qColor = color;\n"
- "}\n";
-
- static char const pvColorFragmentShader[] =
- "varying mediump vec4 qColor;\n"
- "void main(void)\n"
- "{\n"
- " gl_FragColor = qColor;\n"
- "}\n";
-
- QGLShaderProgram *program =
- painter->cachedProgram(QLatin1String("qt.color.pervertex"));
- d->program = program;
- if (!program) {
- if (!flag)
- return;
- program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, pvColorVertexShader);
- program->addShaderFromSourceCode(QGLShader::Fragment, pvColorFragmentShader);
- program->bindAttributeLocation("vertex", QGL::Position);
- program->bindAttributeLocation("color", QGL::Color);
- if (!program->link()) {
- qWarning("QGLPerVertexColorEffect::setActive(): could not link shader program");
- delete program;
- program = 0;
- return;
- }
- painter->setCachedProgram(QLatin1String("qt.color.pervertex"), program);
- d->program = program;
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::Color);
- } else if (flag) {
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::Color);
- } else {
- program->disableAttributeArray(QGL::Position);
- program->disableAttributeArray(QGL::Color);
- program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLPerVertexColorEffect::update
- (QGLPainter *painter, QGLPainter::Updates updates)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- painter->updateFixedFunction(updates & QGLPainter::UpdateMatrices);
-#else
- Q_UNUSED(painter);
- Q_D(QGLPerVertexColorEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->isFixedFunction) {
- painter->updateFixedFunction(updates & QGLPainter::UpdateMatrices);
- return;
- }
-#endif
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- d->program->setUniformValue
- (d->matrixUniform, painter->combinedMatrix());
- }
-#endif
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglflatcoloreffect_p.h b/src/gui/extern/Qt3D/effects/qglflatcoloreffect_p.h
deleted file mode 100644
index 55955b024aed01f4832d0777d8e71d1f79ab5b89..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglflatcoloreffect_p.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLFLATCOLOREFFECT_P_H
-#define QGLFLATCOLOREFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstracteffect.h"
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLFlatColorEffectPrivate;
-class QGLPerVertexColorEffectPrivate;
-
-class QGLFlatColorEffect : public QGLAbstractEffect
-{
-public:
- QGLFlatColorEffect();
- virtual ~QGLFlatColorEffect();
-
- bool supportsPicking() const;
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
-private:
- QScopedPointer<QGLFlatColorEffectPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLFlatColorEffect)
- Q_DISABLE_COPY(QGLFlatColorEffect)
-};
-
-class QGLPerVertexColorEffect : public QGLAbstractEffect
-{
-public:
- QGLPerVertexColorEffect();
- virtual ~QGLPerVertexColorEffect();
-
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
-private:
- QScopedPointer<QGLPerVertexColorEffectPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLPerVertexColorEffect)
- Q_DISABLE_COPY(QGLPerVertexColorEffect)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/effects/qglflattextureeffect.cpp b/src/gui/extern/Qt3D/effects/qglflattextureeffect.cpp
deleted file mode 100644
index 4c7c500baf0454261f956f9cba771581b70208c4..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglflattextureeffect.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglflattextureeffect_p.h"
-#include "qglabstracteffect_p.h"
-#include "qglext_p.h"
-#include <QtOpenGL/qglshaderprogram.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLFlatTextureEffect
- \since 4.8
- \brief The QGLFlatTextureEffect class provides a standard effect that draws fragments with a flat unlit texture.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-/*!
- \class QGLFlatDecalTextureEffect
- \since 4.8
- \brief The QGLFlatDecalTextureEffect class provides a standard effect that decals fragments with a flat unlit texture.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-class QGLFlatTextureEffectPrivate
-{
-public:
- QGLFlatTextureEffectPrivate()
- : program(0)
- , matrixUniform(-1)
- , isFixedFunction(false)
- {
- }
-
- QGLShaderProgram *program;
- int matrixUniform;
- bool isFixedFunction;
-};
-
-/*!
- Constructs a new flat texture effect.
-*/
-QGLFlatTextureEffect::QGLFlatTextureEffect()
- : d_ptr(new QGLFlatTextureEffectPrivate)
-{
-}
-
-/*!
- Destroys this flat texture effect.
-*/
-QGLFlatTextureEffect::~QGLFlatTextureEffect()
-{
-}
-
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
-
-static char const flatTexVertexShader[] =
- "attribute highp vec4 vertex;\n"
- "attribute highp vec4 texcoord;\n"
- "uniform highp mat4 matrix;\n"
- "varying highp vec4 qt_TexCoord0;\n"
- "void main(void)\n"
- "{\n"
- " gl_Position = matrix * vertex;\n"
- " qt_TexCoord0 = texcoord;\n"
- "}\n";
-
-static char const flatTexFragmentShader[] =
- "uniform sampler2D tex;\n"
- "varying highp vec4 qt_TexCoord0;\n"
- "void main(void)\n"
- "{\n"
- " gl_FragColor = texture2D(tex, qt_TexCoord0.st);\n"
- "}\n";
-
-static char const flatDecalFragmentShader[] =
- "uniform sampler2D tex;\n"
- "uniform mediump vec4 color;\n"
- "varying highp vec4 qt_TexCoord0;\n"
- "void main(void)\n"
- "{\n"
- " mediump vec4 col = texture2D(tex, qt_TexCoord0.st);\n"
- " gl_FragColor = vec4(clamp(color.rgb * (1.0 - col.a) + col.rgb, 0.0, 1.0), color.a);\n"
- "}\n";
-
-#endif
-
-/*!
- \reimp
-*/
-void QGLFlatTextureEffect::setActive(QGLPainter *painter, bool flag)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- Q_UNUSED(painter);
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glEnable(GL_TEXTURE_2D);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
-#else
- Q_UNUSED(painter);
- Q_D(QGLFlatTextureEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (painter->isFixedFunction()) {
- d->isFixedFunction = true;
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glEnable(GL_TEXTURE_2D);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
- return;
- }
-#endif
- QGLShaderProgram *program =
- painter->cachedProgram(QLatin1String("qt.texture.flat.replace"));
- d->program = program;
- if (!program) {
- if (!flag)
- return;
- program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, flatTexVertexShader);
- program->addShaderFromSourceCode(QGLShader::Fragment, flatTexFragmentShader);
- program->bindAttributeLocation("vertex", QGL::Position);
- program->bindAttributeLocation("texcoord", QGL::TextureCoord0);
- if (!program->link()) {
- qWarning("QGLFlatTextureEffect::setActive(): could not link shader program");
- delete program;
- program = 0;
- return;
- }
- painter->setCachedProgram
- (QLatin1String("qt.texture.flat.replace"), program);
- d->program = program;
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::TextureCoord0);
- } else if (flag) {
- d->matrixUniform = program->uniformLocation("matrix");
- program->bind();
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::TextureCoord0);
- } else {
- program->disableAttributeArray(QGL::Position);
- program->disableAttributeArray(QGL::TextureCoord0);
- program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLFlatTextureEffect::update
- (QGLPainter *painter, QGLPainter::Updates updates)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- painter->updateFixedFunction(updates & QGLPainter::UpdateMatrices);
-#else
- Q_D(QGLFlatTextureEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->isFixedFunction) {
- painter->updateFixedFunction(updates & QGLPainter::UpdateMatrices);
- return;
- }
-#endif
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- d->program->setUniformValue
- (d->matrixUniform, painter->combinedMatrix());
- }
-#endif
-}
-
-class QGLFlatDecalTextureEffectPrivate
-{
-public:
- QGLFlatDecalTextureEffectPrivate()
- : program(0)
- , matrixUniform(-1)
- , colorUniform(-1)
- , isFixedFunction(false)
- {
- }
-
- QGLShaderProgram *program;
- int matrixUniform;
- int colorUniform;
- bool isFixedFunction;
-};
-
-/*!
- Constructs a new flat decal texture effect.
-*/
-QGLFlatDecalTextureEffect::QGLFlatDecalTextureEffect()
- : d_ptr(new QGLFlatDecalTextureEffectPrivate)
-{
-}
-
-/*!
- Destroys this flat decal texture effect.
-*/
-QGLFlatDecalTextureEffect::~QGLFlatDecalTextureEffect()
-{
-}
-
-/*!
- \reimp
-*/
-void QGLFlatDecalTextureEffect::setActive(QGLPainter *painter, bool flag)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- Q_UNUSED(painter);
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
- glEnable(GL_TEXTURE_2D);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
-#else
- Q_UNUSED(painter);
- Q_D(QGLFlatDecalTextureEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (painter->isFixedFunction()) {
- d->isFixedFunction = true;
- if (flag) {
- glEnableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
- glEnable(GL_TEXTURE_2D);
- } else {
- glDisableClientState(GL_VERTEX_ARRAY);
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
- }
-#endif
- QGLShaderProgram *program =
- painter->cachedProgram(QLatin1String("qt.texture.flat.decal"));
- d->program = program;
- if (!program) {
- if (!flag)
- return;
- program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, flatTexVertexShader);
- program->addShaderFromSourceCode(QGLShader::Fragment, flatDecalFragmentShader);
- program->bindAttributeLocation("vertex", QGL::Position);
- program->bindAttributeLocation("texcoord", QGL::TextureCoord0);
- if (!program->link()) {
- qWarning("QGLFlatDecalTextureEffect::setActive(): could not link shader program");
- delete program;
- program = 0;
- return;
- }
- painter->setCachedProgram
- (QLatin1String("qt.texture.flat.decal"), program);
- d->program = program;
- d->matrixUniform = program->uniformLocation("matrix");
- d->colorUniform = program->uniformLocation("color");
- program->bind();
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::TextureCoord0);
- } else if (flag) {
- d->matrixUniform = program->uniformLocation("matrix");
- d->colorUniform = program->uniformLocation("color");
- program->bind();
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::TextureCoord0);
- } else {
- program->disableAttributeArray(QGL::Position);
- program->disableAttributeArray(QGL::TextureCoord0);
- program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLFlatDecalTextureEffect::update
- (QGLPainter *painter, QGLPainter::Updates updates)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateColor |
- QGLPainter::UpdateMatrices));
-#else
- Q_D(QGLFlatDecalTextureEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->isFixedFunction) {
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateColor |
- QGLPainter::UpdateMatrices));
- return;
- }
-#endif
- if ((updates & QGLPainter::UpdateColor) != 0)
- d->program->setUniformValue(d->colorUniform, painter->color());
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- d->program->setUniformValue
- (d->matrixUniform, painter->combinedMatrix());
- }
-#endif
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglflattextureeffect_p.h b/src/gui/extern/Qt3D/effects/qglflattextureeffect_p.h
deleted file mode 100644
index 1c9d02c52bfbe0bb97983a14eab7bff36bfd41fe..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglflattextureeffect_p.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLFLATTEXTUREEFFECT_P_H
-#define QGLFLATTEXTUREEFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstracteffect.h"
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLFlatTextureEffectPrivate;
-class QGLFlatDecalTextureEffectPrivate;
-
-class QGLFlatTextureEffect : public QGLAbstractEffect
-{
-public:
- QGLFlatTextureEffect();
- virtual ~QGLFlatTextureEffect();
-
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
-private:
- QScopedPointer<QGLFlatTextureEffectPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLFlatTextureEffect)
- Q_DISABLE_COPY(QGLFlatTextureEffect)
-};
-
-class QGLFlatDecalTextureEffect : public QGLAbstractEffect
-{
-public:
- QGLFlatDecalTextureEffect();
- virtual ~QGLFlatDecalTextureEffect();
-
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
-private:
- QScopedPointer<QGLFlatDecalTextureEffectPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLFlatDecalTextureEffect)
- Q_DISABLE_COPY(QGLFlatDecalTextureEffect)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/effects/qgllitmaterialeffect.cpp b/src/gui/extern/Qt3D/effects/qgllitmaterialeffect.cpp
deleted file mode 100644
index 8450162ca40f8fa002ed2367791c07afb36b417a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qgllitmaterialeffect.cpp
+++ /dev/null
@@ -1,571 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgllitmaterialeffect_p.h"
-#include "qglabstracteffect_p.h"
-#include "qglext_p.h"
-#include <QtOpenGL/qglshaderprogram.h>
-#include <QtCore/qfile.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLLitMaterialEffect
- \since 4.8
- \brief The QGLLitMaterialEffect class provides a standard effect that draws fragments with a lit material.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
-
-static char const litMaterialVertexShader[] =
- "attribute highp vec4 vertex;\n"
- "attribute highp vec3 normal;\n"
- "uniform highp mat4 matrix;\n"
- "uniform highp mat4 modelView;\n"
- "uniform highp mat3 normalMatrix;\n"
- "void main(void)\n"
- "{\n"
- " gl_Position = matrix * vertex;\n"
- " highp vec4 tvertex = modelView * vertex;\n"
- " highp vec3 norm = normalize(normalMatrix * normal);\n"
- " qLightVertex(tvertex, norm);\n"
- "}\n";
-
-static char const litMaterialFragmentShader[] =
-#if !defined(QT_OPENGL_ES)
- "varying mediump vec4 qColor;\n"
- "varying mediump vec4 qSecondaryColor;\n"
- "\n"
- "void main(void)\n"
- "{\n"
- " gl_FragColor = clamp(qColor + vec4(qSecondaryColor.xyz, 0.0), 0.0, 1.0);\n"
- "}\n";
-#else
- "varying mediump vec4 qCombinedColor;\n"
- "\n"
- "void main(void)\n"
- "{\n"
- " gl_FragColor = qCombinedColor;\n"
- "}\n";
-#endif
-
-// Algorithm from section 2.14.1 of OpenGL 2.1 specification.
-static char const litMaterialLightingShader[] =
-#if !defined(QT_OPENGL_ES)
-"uniform mediump vec3 sdli;\n" // Direction of the light (must be normalized).
-"uniform mediump vec3 pli;\n" // Position of the light
-"uniform mediump float pliw;\n" // 0 for directional, 1 for positional.
-"uniform mediump float srli;\n" // Spotlight exponent for the light
-"uniform mediump float crli;\n" // Spotlight cutoff for the light
-"uniform mediump float ccrli;\n" // Cosine of spotlight cutoff for the light
-"uniform mediump float k0;\n" // Constant attentuation factor for the light
-"uniform mediump float k1;\n" // Linear attentuation factor for the light
-"uniform mediump float k2;\n" // Quadratic attentuation factor for the light
-"uniform mediump vec4 acm[2];\n" // Ambient color of the material and light
-"uniform mediump vec4 dcm[2];\n" // Diffuse color of the material and light
-"uniform mediump vec4 scm[2];\n" // Specular color of the material and light
-"uniform mediump vec4 ecm[2];\n" // Emissive color and ambient scene color
-"uniform mediump float srm[2];\n"// Specular exponent of the material
-"uniform bool viewerAtInfinity;\n" // Light model indicates viewer at infinity
-"uniform bool twoSided;\n" // Light model indicates two-sided lighting
-
-"varying mediump vec4 qColor;\n"
-"varying mediump vec4 qSecondaryColor;\n"
-
-"void qLightVertex(vec4 vertex, vec3 normal)\n"
-"{\n"
-" int i, material;\n"
-" vec3 toEye, toLight, h;\n"
-" float angle, spot, attenuation;\n"
-" vec4 color, scolor;\n"
-" vec4 adcomponent, scomponent;\n"
-
- // Determine which material to use.
-" if (!twoSided || normal.z >= 0.0) {\n"
-" material = 0;\n"
-" } else {\n"
-" material = 1;\n"
-" normal = -normal;\n"
-" }\n"
-
- // Start with the material's emissive color and the ambient scene color,
- // which have been combined into the ecm parameter by the C++ code.
-" color = ecm[material];\n"
-" scolor = vec4(0, 0, 0, 0);\n"
-
- // Vector from the vertex to the eye position (i.e. the origin).
-" if (viewerAtInfinity)\n"
-" toEye = vec3(0, 0, 1);\n"
-" else\n"
-" toEye = normalize(-vertex.xyz);\n"
-
- // Determine the cosine of the angle between the normal and the
- // vector from the vertex to the light.
-" if (pliw == 0.0)\n"
-" toLight = normalize(pli);\n"
-" else\n"
-" toLight = normalize(pli - vertex.xyz);\n"
-" angle = max(dot(normal, toLight), 0.0);\n"
-
- // Calculate the ambient and diffuse light components.
-" adcomponent = acm[material] + angle * dcm[material];\n"
-
- // Calculate the specular light components.
-" if (angle != 0.0) {\n"
-" h = normalize(toLight + toEye);\n"
-" angle = max(dot(normal, h), 0.0);\n"
-" if (srm[material] != 0.0)\n"
-" scomponent = pow(angle, srm[material]) * scm[material];\n"
-" else\n"
-" scomponent = scm[material];\n"
-" } else {\n"
-" scomponent = vec4(0, 0, 0, 0);\n"
-" }\n"
-
- // Apply the spotlight angle and exponent.
-" if (crli != 180.0) {\n"
-" spot = max(dot(normalize(vertex.xyz - pli), sdli), 0.0);\n"
-" if (spot < ccrli) {\n"
-" adcomponent = vec4(0, 0, 0, 0);\n"
-" scomponent = vec4(0, 0, 0, 0);\n"
-" } else {\n"
-" spot = pow(spot, srli);\n"
-" adcomponent *= spot;\n"
-" scomponent *= spot;\n"
-" }\n"
-" }\n"
-
- // Apply attenuation to the colors.
-" if (pliw != 0.0) {\n"
-" attenuation = k0;\n"
-" if (k1 != 0.0 || k2 != 0.0) {\n"
-" float len = length(pli - vertex.xyz);\n"
-" attenuation += k1 * len + k2 * len * len;\n"
-" }\n"
-" color += adcomponent / attenuation;\n"
-" scolor += scomponent / attenuation;\n"
-" } else {\n"
-" color += adcomponent;\n"
-" scolor += scomponent;\n"
-" }\n"
-
- // Generate the final output colors.
-" float alpha = dcm[material].a;\n"
-" qColor = vec4(clamp(color.rgb, 0.0, 1.0), alpha);\n"
-" qSecondaryColor = clamp(scolor, 0.0, 1.0);\n"
-"}\n";
-#else
-"uniform mediump vec3 sdli;\n" // Direction of the light (must be normalized).
-"uniform mediump vec3 pli;\n" // Position of the light
-"uniform mediump float pliw;\n" // 0 for directional, 1 for positional.
-"uniform mediump float srli;\n" // Spotlight exponent for the light
-"uniform mediump float crli;\n" // Spotlight cutoff for the light
-"uniform mediump float ccrli;\n" // Cosine of spotlight cutoff for the light
-"uniform mediump vec4 acm;\n" // Ambient color of the material and light
-"uniform mediump vec4 dcm;\n" // Diffuse color of the material and light
-"uniform mediump vec4 scm;\n" // Specular color of the material and light
-"uniform mediump vec4 ecm;\n" // Emissive color and ambient scene color
-"uniform mediump float srm;\n" // Specular exponent of the material
-"uniform bool viewerAtInfinity;\n" // Light model indicates viewer at infinity
-
-"varying mediump vec4 qColor;\n"
-"varying mediump vec4 qSecondaryColor;\n"
-"varying mediump vec4 qCombinedColor;\n"
-
-"void qLightVertex(vec4 vertex, vec3 normal)\n"
-"{\n"
-" vec3 toEye, toLight, h;\n"
-" float angle, spot;\n"
-" vec4 color, scolor;\n"
-
- // Vector from the vertex to the eye position (i.e. the origin).
-" if (viewerAtInfinity)\n"
-" toEye = vec3(0, 0, 1);\n"
-" else\n"
-" toEye = normalize(-vertex.xyz);\n"
-
- // Determine the cosine of the angle between the normal and the
- // vector from the vertex to the light.
-" if (pliw == 0.0)\n"
-" toLight = normalize(pli);\n"
-" else\n"
-" toLight = normalize(pli - vertex.xyz);\n"
-" angle = max(dot(normal, toLight), 0.0);\n"
-
- // Calculate the ambient and diffuse light components.
-" color = acm + angle * dcm;\n"
-
- // Calculate the specular light components.
-" if (angle != 0.0) {\n"
-" h = normalize(toLight + toEye);\n"
-" angle = max(dot(normal, h), 0.0);\n"
-" if (srm != 0.0)\n"
-" scolor = pow(angle, srm) * scm;\n"
-" else\n"
-" scolor = scm;\n"
-" } else {\n"
-" scolor = vec4(0, 0, 0, 0);\n"
-" }\n"
-
- // Apply the spotlight angle and exponent.
-" if (crli != 180.0) {\n"
-" spot = max(dot(normalize(vertex.xyz - pli), sdli), 0.0);\n"
-" if (spot < ccrli) {\n"
-" color = vec4(0, 0, 0, 0);\n"
-" scolor = vec4(0, 0, 0, 0);\n"
-" } else {\n"
-" spot = pow(spot, srli);\n"
-" color *= spot;\n"
-" scolor *= spot;\n"
-" }\n"
-" }\n"
-
- // Generate the final output colors.
-" color += ecm;\n"
-" float alpha = dcm.a;\n"
- // Note: Normally, the qCombinedColor is ignored, and per-pixel
- // value is calculated.
- // If OPENGL_ES is defined, qColor and qSecondaryColor are ignored,
- // and qCombinedColor is calculated here to speed up the fragment shader.
-" qColor = vec4(clamp(color.rgb, 0.0, 1.0), alpha);\n"
-" qSecondaryColor = clamp(scolor, 0.0, 1.0);\n"
-" qCombinedColor = clamp(qColor + vec4(qSecondaryColor.xyz, 0.0), 0.0, 1.0);\n"
-"}\n";
-#endif
-
-static QByteArray createVertexSource(const char *lighting, const char *extra)
-{
- QByteArray contents(lighting);
- return contents + extra;
-}
-
-static inline QVector4D colorToVector4(const QColor& color)
-{
- return QVector4D(color.redF(), color.greenF(),
- color.blueF(), color.alphaF());
-}
-
-// Combine a material and light color into a single color.
-static inline QVector4D colorToVector4
- (const QColor &color, const QColor &lightColor)
-{
- return QVector4D(color.redF() * lightColor.redF(),
- color.greenF() * lightColor.greenF(),
- color.blueF() * lightColor.blueF(),
- color.alphaF() * lightColor.alphaF());
-}
-
-#endif
-
-class QGLLitMaterialEffectPrivate
-{
-public:
- QGLLitMaterialEffectPrivate()
- : program(0)
- , matrixUniform(-1)
- , modelViewUniform(-1)
- , normalMatrixUniform(-1)
- , textureMode(0)
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- , vertexShader(litMaterialVertexShader)
- , fragmentShader(litMaterialFragmentShader)
-#else
- , vertexShader(0)
- , fragmentShader(0)
-#endif
- , programName(QLatin1String("qt.color.material"))
- , isFixedFunction(false)
- {
- }
-
- QGLShaderProgram *program;
- int matrixUniform;
- int modelViewUniform;
- int normalMatrixUniform;
- GLenum textureMode;
- const char *vertexShader;
- const char *fragmentShader;
- QString programName;
- bool isFixedFunction;
-};
-
-/*!
- Constructs a new lit material effect.
-*/
-QGLLitMaterialEffect::QGLLitMaterialEffect()
- : d_ptr(new QGLLitMaterialEffectPrivate)
-{
-}
-
-/*!
- \internal
-*/
-QGLLitMaterialEffect::QGLLitMaterialEffect
- (GLenum mode, const char *vshader, const char *fshader,
- const QString& programName)
- : d_ptr(new QGLLitMaterialEffectPrivate)
-{
- Q_D(QGLLitMaterialEffect);
- d->textureMode = mode;
- d->vertexShader = vshader;
- d->fragmentShader = fshader;
- d->programName = programName;
-}
-
-/*!
- Destroys this lit material effect.
-*/
-QGLLitMaterialEffect::~QGLLitMaterialEffect()
-{
-}
-
-/*!
- \reimp
-*/
-void QGLLitMaterialEffect::setActive(QGLPainter *painter, bool flag)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- Q_UNUSED(painter);
- Q_D(QGLLitMaterialEffect);
- if (flag) {
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_NORMAL_ARRAY);
- if (d->textureMode) {
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, d->textureMode);
- glEnable(GL_TEXTURE_2D);
- }
- } else {
- glDisable(GL_LIGHTING);
- glDisable(GL_LIGHT0);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_NORMAL_ARRAY);
- if (d->textureMode) {
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
- }
-#else
- Q_UNUSED(painter);
- Q_D(QGLLitMaterialEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (painter->isFixedFunction()) {
- d->isFixedFunction = true;
- if (flag) {
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_NORMAL_ARRAY);
- if (d->textureMode) {
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, d->textureMode);
- glEnable(GL_TEXTURE_2D);
- }
- } else {
- glDisable(GL_LIGHTING);
- glDisable(GL_LIGHT0);
- glDisableClientState(GL_VERTEX_ARRAY);
- glDisableClientState(GL_NORMAL_ARRAY);
- if (d->textureMode) {
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- glDisable(GL_TEXTURE_2D);
- }
- }
- return;
- }
-#endif
- QGLShaderProgram *program = painter->cachedProgram(d->programName);
- d->program = program;
- if (!program) {
- if (!flag)
- return;
- program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, createVertexSource(litMaterialLightingShader, d->vertexShader));
- program->addShaderFromSourceCode(QGLShader::Fragment, d->fragmentShader);
- program->bindAttributeLocation("vertex", QGL::Position);
- program->bindAttributeLocation("normal", QGL::Normal);
- if (d->textureMode != 0)
- program->bindAttributeLocation("texcoord", QGL::TextureCoord0);
- if (!program->link()) {
- qWarning("QGLLitMaterialEffect::setActive(): could not link shader program");
- delete program;
- program = 0;
- return;
- }
- painter->setCachedProgram(d->programName, program);
- d->program = program;
- d->matrixUniform = program->uniformLocation("matrix");
- d->modelViewUniform = program->uniformLocation("modelView");
- d->normalMatrixUniform = program->uniformLocation("normalMatrix");
- program->bind();
- if (d->textureMode != 0) {
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::TextureCoord0);
- }
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::Normal);
- } else if (flag) {
- d->matrixUniform = program->uniformLocation("matrix");
- d->modelViewUniform = program->uniformLocation("modelView");
- d->normalMatrixUniform = program->uniformLocation("normalMatrix");
- program->bind();
- if (d->textureMode != 0) {
- program->setUniformValue("tex", 0);
- program->enableAttributeArray(QGL::TextureCoord0);
- }
- program->enableAttributeArray(QGL::Position);
- program->enableAttributeArray(QGL::Normal);
- } else {
- program->disableAttributeArray(QGL::Position);
- program->disableAttributeArray(QGL::Normal);
- if (d->textureMode != 0)
- program->disableAttributeArray(QGL::TextureCoord0);
- program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLLitMaterialEffect::update
- (QGLPainter *painter, QGLPainter::Updates updates)
-{
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateMatrices |
- QGLPainter::UpdateLights |
- QGLPainter::UpdateMaterials));
-#else
- Q_D(QGLLitMaterialEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->isFixedFunction) {
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateMatrices |
- QGLPainter::UpdateLights |
- QGLPainter::UpdateMaterials));
- return;
- }
-#endif
- QGLShaderProgram *program = d->program;
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- program->setUniformValue(d->matrixUniform, painter->combinedMatrix());
- program->setUniformValue(d->modelViewUniform, painter->modelViewMatrix());
- program->setUniformValue(d->normalMatrixUniform, painter->normalMatrix());
- }
- const QGLLightParameters *lparams = painter->mainLight();
- QMatrix4x4 ltransform = painter->mainLightTransform();
- const QGLLightModel *model = painter->lightModel();
- if ((updates & (QGLPainter::UpdateLights | QGLPainter::UpdateMaterials)) != 0) {
- // Set the uniform variables for the light.
- program->setUniformValue
- ("sdli", lparams->eyeSpotDirection(ltransform).normalized());
- QVector4D pli = lparams->eyePosition(ltransform);
- program->setUniformValue("pli", QVector3D(pli.x(), pli.y(), pli.z()));
- program->setUniformValue("pliw", GLfloat(pli.w()));
- program->setUniformValue("srli", GLfloat(lparams->spotExponent()));
- program->setUniformValue("crli", GLfloat(lparams->spotAngle()));
- program->setUniformValue("ccrli", GLfloat(lparams->spotCosAngle()));
-#if !defined(QT_OPENGL_ES)
- // Attenuation is not supported under ES, for performance.
- program->setUniformValue("k0", GLfloat(lparams->constantAttenuation()));
- program->setUniformValue("k1", GLfloat(lparams->linearAttenuation()));
- program->setUniformValue("k2", GLfloat(lparams->quadraticAttenuation()));
-#endif
-
- // Set the uniform variables for the light model.
-#if !defined(QT_OPENGL_ES)
- program->setUniformValue("twoSided", (int)(model->model() == QGLLightModel::TwoSided));
-#endif
- program->setUniformValue("viewerAtInfinity", (int)(model->viewerPosition() == QGLLightModel::ViewerAtInfinity));
-#if !defined(QT_OPENGL_ES)
- if (d->textureMode != 0)
- program->setUniformValue("separateSpecular", (int)(model->colorControl() == QGLLightModel::SeparateSpecularColor));
-#endif
-
- // Set the uniform variables for the front and back materials.
-#if defined(QT_OPENGL_ES)
- static const int MaxMaterials = 1;
-#else
- static const int MaxMaterials = 2;
-#endif
- QVector4D acm[MaxMaterials];
- QVector4D dcm[MaxMaterials];
- QVector4D scm[MaxMaterials];
- QVector4D ecm[MaxMaterials];
- float srm[MaxMaterials];
- const QGLMaterial *mparams = painter->faceMaterial(QGL::FrontFaces);
- acm[0] = colorToVector4(mparams->ambientColor(), lparams->ambientColor());
- dcm[0] = colorToVector4(mparams->diffuseColor(), lparams->diffuseColor());
- scm[0] = colorToVector4(mparams->specularColor(), lparams->specularColor());
- ecm[0] = colorToVector4(mparams->emittedLight()) +
- colorToVector4(mparams->ambientColor(),
- model->ambientSceneColor());
- srm[0] = (float)(mparams->shininess());
-#if !defined(QT_OPENGL_ES)
- mparams = painter->faceMaterial(QGL::BackFaces);
- acm[1] = colorToVector4(mparams->ambientColor(), lparams->ambientColor());
- dcm[1] = colorToVector4(mparams->diffuseColor(), lparams->diffuseColor());
- scm[1] = colorToVector4(mparams->specularColor(), lparams->specularColor());
- ecm[1] = colorToVector4(mparams->emittedLight()) +
- colorToVector4(mparams->ambientColor(),
- model->ambientSceneColor());
- srm[1] = (float)(mparams->shininess());
-#endif
- program->setUniformValueArray("acm", (const GLfloat *)acm, MaxMaterials, 4);
- program->setUniformValueArray("dcm", (const GLfloat *)dcm, MaxMaterials, 4);
- program->setUniformValueArray("scm", (const GLfloat *)scm, MaxMaterials, 4);
- program->setUniformValueArray("ecm", (const GLfloat *)ecm, MaxMaterials, 4);
- program->setUniformValueArray("srm", srm, MaxMaterials, 1);
- }
-#endif
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qgllitmaterialeffect_p.h b/src/gui/extern/Qt3D/effects/qgllitmaterialeffect_p.h
deleted file mode 100644
index abfa1ab5d04c59e9701f0f3993d7fcd1ed1d7519..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qgllitmaterialeffect_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLLITMATERIALEFFECT_P_H
-#define QGLLITMATERIALEFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstracteffect.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGLLitMaterialEffectPrivate;
-
-class QGLLitMaterialEffect : public QGLAbstractEffect
-{
-public:
- QGLLitMaterialEffect();
- virtual ~QGLLitMaterialEffect();
-
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
-protected:
- QGLLitMaterialEffect
- (GLenum mode, const char *vshader, const char *fshader,
- const QString& programName);
-
-private:
- QScopedPointer<QGLLitMaterialEffectPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLLitMaterialEffect)
- Q_DISABLE_COPY(QGLLitMaterialEffect)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/effects/qgllittextureeffect.cpp b/src/gui/extern/Qt3D/effects/qgllittextureeffect.cpp
deleted file mode 100644
index 9aaac7fb6eeb8d59335f761e66493e98085caea4..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qgllittextureeffect.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgllittextureeffect_p.h"
-#include "qglabstracteffect_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLLitTextureEffect
- \since 4.8
- \brief The QGLLitTextureEffect class provides a standard effect base class for drawing fragments with a lit texture.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-
- \sa QGLLitDecalTextureEffect, QGLLitModulateTextureEffect
-*/
-
-/*!
- \class QGLLitDecalTextureEffect
- \since 4.8
- \brief The QGLLitDecalTextureEffect class provides a standard effect for drawing fragments with a texture decaled over a lit material.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-/*!
- \class QGLLitModulateTextureEffect
- \since 4.8
- \brief The QGLLitModulateTextureEffect class provides a standard effect for drawing fragments with a texture modulated with a lit material.
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-*/
-
-/*!
- \internal
-*/
-QGLLitTextureEffect::QGLLitTextureEffect
- (GLenum mode, const char *vshader, const char *fshader,
- const QString& programName)
- : QGLLitMaterialEffect(mode, vshader, fshader, programName)
-{
-}
-
-/*!
- Destroys this lit texture effect.
-*/
-QGLLitTextureEffect::~QGLLitTextureEffect()
-{
-}
-
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
-
-static char const litTextureVertexShader[] =
- "attribute highp vec4 vertex;\n"
- "attribute highp vec3 normal;\n"
- "attribute highp vec4 texcoord;\n"
- "uniform highp mat4 matrix;\n"
- "uniform highp mat4 modelView;\n"
- "uniform highp mat3 normalMatrix;\n"
- "varying highp vec4 qt_TexCoord0;\n"
- "void main(void)\n"
- "{\n"
- " gl_Position = matrix * vertex;\n"
- " highp vec4 tvertex = modelView * vertex;\n"
- " highp vec3 norm = normalize(normalMatrix * normal);\n"
- " qLightVertex(tvertex, norm);\n"
- " qt_TexCoord0 = texcoord;\n"
- "}\n";
-
-static char const litDecalFragmentShader[] =
- "uniform sampler2D tex;\n"
-#if defined(QT_OPENGL_ES)
- "varying mediump vec4 qCombinedColor;\n"
-#else
- "uniform bool separateSpecular;\n"
- "varying mediump vec4 qColor;\n"
- "varying mediump vec4 qSecondaryColor;\n"
-#endif
- "varying highp vec4 qt_TexCoord0;\n"
- "\n"
- "void main(void)\n"
- "{\n"
- " mediump vec4 col = texture2D(tex, qt_TexCoord0.st);\n"
-#if defined(QT_OPENGL_ES)
- " gl_FragColor = vec4(clamp(qCombinedColor.rgb * (1.0 - col.a) + col.rgb * col.a, 0.0, 1.0), qCombinedColor.a);\n"
-#else
- " if (separateSpecular) {\n"
- " gl_FragColor = vec4(clamp(qColor.rgb * (1.0 - col.a) + col.rgb * col.a + qSecondaryColor.xyz, 0.0, 1.0), qColor.a);\n"
- " } else {\n"
- " mediump vec4 lcolor = clamp(qColor + vec4(qSecondaryColor.xyz, 0.0), 0.0, 1.0);\n"
- " gl_FragColor = vec4(clamp(lcolor.rgb * (1.0 - col.a) + col.rgb * col.a, 0.0, 1.0), lcolor.a);\n"
- " }\n"
-#endif
- "}\n";
-
-static char const litModulateFragmentShader[] =
- "uniform sampler2D tex;\n"
-#if defined(QT_OPENGL_ES)
- "varying mediump vec4 qCombinedColor;\n"
-#else
- "uniform bool separateSpecular;\n"
- "varying mediump vec4 qColor;\n"
- "varying mediump vec4 qSecondaryColor;\n"
-#endif
- "varying highp vec4 qt_TexCoord0;\n"
- "\n"
- "void main(void)\n"
- "{\n"
- " mediump vec4 col = texture2D(tex, qt_TexCoord0.st);\n"
-#if defined(QT_OPENGL_ES)
- " gl_FragColor = col * qCombinedColor;\n"
-#else
- " if (separateSpecular) {\n"
- " gl_FragColor = clamp(col * qColor + vec4(qSecondaryColor.xyz, 0.0), 0.0, 1.0);\n"
- " } else {\n"
- " mediump vec4 lcolor = clamp(qColor + vec4(qSecondaryColor.xyz, 0.0), 0.0, 1.0);\n"
- " gl_FragColor = col * lcolor;\n"
- " }\n"
-#endif
- "}\n";
-
-#endif
-
-#ifndef GL_MODULATE
-#define GL_MODULATE 0x2100
-#endif
-#ifndef GL_DECAL
-#define GL_DECAL 0x2101
-#endif
-
-/*!
- Constructs a new lit decal texture effect.
-*/
-QGLLitDecalTextureEffect::QGLLitDecalTextureEffect()
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- : QGLLitTextureEffect(GL_DECAL, 0, 0, QString())
-#else
- : QGLLitTextureEffect(GL_DECAL,
- litTextureVertexShader, litDecalFragmentShader,
- QLatin1String("qt.texture.litdecal"))
-#endif
-{
-}
-
-/*!
- Destroys this lit decal texture effect.
-*/
-QGLLitDecalTextureEffect::~QGLLitDecalTextureEffect()
-{
-}
-
-/*!
- Constructs a new lit modulate texture effect.
-*/
-QGLLitModulateTextureEffect::QGLLitModulateTextureEffect()
-#if defined(QGL_FIXED_FUNCTION_ONLY)
- : QGLLitTextureEffect(GL_MODULATE, 0, 0, QString())
-#else
- : QGLLitTextureEffect(GL_MODULATE,
- litTextureVertexShader, litModulateFragmentShader,
- QLatin1String("qt.texture.litmodulate"))
-#endif
-{
-}
-
-/*!
- Destroys this lit modulate texture effect.
-*/
-QGLLitModulateTextureEffect::~QGLLitModulateTextureEffect()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qgllittextureeffect_p.h b/src/gui/extern/Qt3D/effects/qgllittextureeffect_p.h
deleted file mode 100644
index fcdf6796660576ef92ba091cf4a2bedb3325cfed..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qgllittextureeffect_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLLITTEXTUREEFFECT_P_H
-#define QGLLITTEXTUREEFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qgllitmaterialeffect_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGLLitTextureEffect : public QGLLitMaterialEffect
-{
-public:
- virtual ~QGLLitTextureEffect();
-
-protected:
- QGLLitTextureEffect(GLenum mode, const char *vshader, const char *fshader,
- const QString& programName);
-};
-
-class QGLLitDecalTextureEffect : public QGLLitTextureEffect
-{
-public:
- QGLLitDecalTextureEffect();
- virtual ~QGLLitDecalTextureEffect();
-};
-
-class QGLLitModulateTextureEffect : public QGLLitTextureEffect
-{
-public:
- QGLLitModulateTextureEffect();
- virtual ~QGLLitModulateTextureEffect();
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.cpp b/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.cpp
deleted file mode 100644
index 20f563a6a00d01aaabeefa705c92a34523b0e073..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.cpp
+++ /dev/null
@@ -1,1132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglshaderprogrameffect.h"
-#include "qglabstracteffect_p.h"
-#include <QtOpenGL/qglshaderprogram.h>
-#include <QtCore/qfile.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLShaderProgramEffect
- \since 4.8
- \brief The QGLShaderProgramEffect class provides applications with the ability to use shader programs written in GLSL as effects for 3D rendering.
- \ingroup qt3d
- \ingroup qt3d::painting
-
- \section1 Writing portable shaders
-
- Shader programs can be difficult to reuse across OpenGL implementations
- because of varying levels of support for standard vertex attributes and
- uniform variables. In particular, GLSL/ES lacks all of the
- standard variables that are present on desktop OpenGL systems:
- \c{gl_Vertex}, \c{gl_Normal}, \c{gl_Color}, and so on. Desktop OpenGL
- lacks the variable qualifiers \c{highp}, \c{mediump}, and \c{lowp}.
-
- QGLShaderProgramEffect is built on top of
- \l{http://doc.qt.nokia.com/4.7/qglshaderprogram.html}{QGLShaderProgram},
- which makes the process of writing portable shaders easier by
- prefixing all shader programs with the following lines on desktop OpenGL:
-
- \code
- #define highp
- #define mediump
- #define lowp
- \endcode
-
- This makes it possible to run most GLSL/ES shader programs
- on desktop systems. The programmer should also restrict themselves
- to just features that are present in GLSL/ES, and avoid
- standard variable names that only work on the desktop.
-
- QGLShaderProgramEffect also defines some standard attribute and uniform
- variable names that all shaders are expected to use. The following
- sections define these standard names.
-
- \section1 Attributes
-
- QGLShaderProgramEffect provides a standard set of 8 named vertex
- attributes that can be provided via QGLPainter::setVertexBundle():
-
- \table
- \header \o Shader Variable \o Mesh Attribute \o Purpose
- \row \o \c qt_Vertex \o QGL::Position
- \o The primary position of the vertex.
- \row \o \c qt_Normal \o QGL::Normal
- \o The normal at each vertex, for lit material effects.
- \row \o \c qt_Color \o QGL::Color
- \o The color at each vertex, for per-vertex color effects.
- \row \o \c qt_MultiTexCoord0 \o QGL::TextureCoord0
- \o The texture co-ordinate at each vertex for texture unit 0.
- \row \o \c qt_MultiTexCoord1 \o QGL::TextureCoord1
- \o Secondary texture co-ordinate at each vertex.
- \row \o \c qt_MultiTexCoord2 \o QGL::TextureCoord2
- \o Tertiary texture co-ordinate at each vertex.
- \row \o \c qt_Custom0 \o QGL::CustomVertex0
- \o First custom vertex attribute that can be used for any
- user-defined purpose.
- \row \o \c qt_Custom1 \o QGL::CustomVertex1
- \o Second custom vertex attribute that can be used for any
- user-defined purpose.
- \endtable
-
- These attributes may be used in the vertexShader(), as in the following
- example of a simple texture shader:
-
- \code
- attribute highp vec4 qt_Vertex;
- attribute highp vec4 qt_MultiTexCoord0;
- uniform mediump mat4 qt_ModelViewProjectionMatrix;
- varying highp vec4 qt_TexCoord0;
-
- void main(void)
- {
- gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
- qt_TexCoord0 = qt_MultiTexCoord0;
- }
- \endcode
-
- \section1 Uniform variables
-
- QGLShaderProgramEffect provides a standard set of uniform variables for
- common values from the QGLPainter environment:
-
- \table
- \header \o Shader Variable \o Purpose
- \row \o \c qt_ModelViewProjectionMatrix
- \o Combination of the modelview and projection matrices into a
- single 4x4 matrix.
- \row \o \c qt_ModelViewMatrix
- \o Modelview matrix without the projection. This is typically
- used for performing calculations in eye co-ordinates.
- \row \o \c qt_ProjectionMatrix
- \o Projection matrix without the modelview.
- \row \o \c qt_NormalMatrix
- \o Normal matrix, which is the transpose of the inverse of the
- top-left 3x3 part of the modelview matrix. This is typically
- used in lighting calcuations to transform \c qt_Normal.
- \row \o \c qt_WorldMatrix
- \o Modelview matrix without the eye position and orientation
- component. See QGLPainter::worldMatrix() for further
- information.
- \row \o \c qt_Texture0
- \o Sampler corresponding to the texture on unit 0.
- \row \o \c qt_Texture1
- \o Sampler corresponding to the texture on unit 1.
- \row \o \c qt_Texture2
- \o Sampler corresponding to the texture on unit 2.
- \row \o \c qt_Color
- \o Set to the value of the QGLPainter::color() property.
- This is typically used for flat-color shaders that do
- not involve lighting. Note that this is different from
- the \c qt_Color attribute, which provides per-vertex colors.
- \endtable
-
- The above variables are usually declared in the shaders as follows
- (where \c highp may be replaced with \c mediump or \c lowp depending
- upon the shader's precision requirements):
-
- \code
- uniform highp mat4 qt_ModelViewProjectionMatrix;
- uniform highp mat4 qt_ModelViewMatrix;
- uniform highp mat4 qt_ProjectionMatrix;
- uniform highp mat3 qt_NormalMatrix;
- uniform sampler2D qt_Texture0;
- uniform sampler2D qt_Texture1;
- uniform sampler2D qt_Texture2;
- uniform highp vec4 qt_Color;
- \endcode
-
- \section1 Material parameters
-
- QGLShaderProgramEffect will provide information about the front and
- back materials from QGLPainter::faceMaterial() if the
- \c qt_Materials array is present in the shader code.
- The array should be declared as follows:
-
- \code
- struct qt_MaterialParameters {
- mediump vec4 emission;
- mediump vec4 ambient;
- mediump vec4 diffuse;
- mediump vec4 specular;
- mediump float shininess;
- };
- uniform qt_MaterialParameters qt_Materials[2];
- \endcode
-
- The front material will be provided as index 0 and the back
- material will be provided as index 1. If the shader only
- needs a single material, then the \c qt_Material variable
- can be declared instead:
-
- \code
- uniform qt_MaterialParameters qt_Material;
- \endcode
-
- The front material will be provided as the value of \c qt_Material
- and the back material will be ignored.
-
- Note: the \c emission parameter is actually QGLMaterial::emittedLight()
- combined with the QGLLightModel::ambientSceneColor() and
- QGLMaterial::ambientColor(). This helps simplify lighting shaders.
-
- \section1 Lighting parameters
-
- QGLShaderProgramEffect will provide information about the current lights
- specified on the QGLPainter if the \c qt_Lights array is present
- in the shader code. The array should be declared as follows:
-
- \code
- struct qt_LightParameters {
- mediump vec4 ambient;
- mediump vec4 diffuse;
- mediump vec4 specular;
- mediump vec4 position;
- mediump vec3 spotDirection;
- mediump float spotExponent;
- mediump float spotCutoff;
- mediump float spotCosCutoff;
- mediump float constantAttenuation;
- mediump float linearAttenuation;
- mediump float quadraticAttenuation;
- };
- const int qt_MaxLights = 8;
- uniform qt_LightParameters qt_Lights[qt_MaxLights];
- uniform int qt_NumLights;
- \endcode
-
- As shown, up to 8 lights can be supported at once. Usually this is
- more lights than most shaders need, and so the user can change the
- \c qt_MaxLights constant to a smaller value if they wish. Be sure
- to also call setMaximumLights() to tell QGLShaderProgramEffect about
- the new light count limit.
-
- The \c qt_NumLights uniform variable will be set to the actual number
- of lights that are active on the QGLPainter when update() is called.
-
- Because most shaders will only need a single light, the shader can
- declare the \c qt_Light variable instead of the \c qt_Lights array:
-
- \code
- struct qt_SingleLightParameters {
- mediump vec4 position;
- mediump vec3 spotDirection;
- mediump float spotExponent;
- mediump float spotCutoff;
- mediump float spotCosCutoff;
- mediump float constantAttenuation;
- mediump float linearAttenuation;
- mediump float quadraticAttenuation;
- };
- uniform qt_SingleLightParameters qt_Light;
- \endcode
-
- Note that we have omitted the \c ambient, \c diffuse, and \c specular
- colors for the single light. QGLShaderProgramEffect will combine the material
- and light colors ahead of time into \c qt_Material or \c qt_Materials.
- This makes lighting shaders more efficient because they do not have
- to compute \c material_color * \c light_color; just \c material_color
- is sufficient.
-
- \section1 Varying variables
-
- The name and purpose of the varying variables is up to the
- author of the vertex and fragment shaders, but the following names
- are recommended for texture co-ordinates:
-
- \table
- \header \o Varying Variable \o Purpose
- \row \o \c qt_TexCoord0
- \o Texture coordinate for unit 0, copied from the \c qt_MultiTexCoord0
- attribute.
- \row \o \c qt_TexCoord1
- \o Texture coordinate for unit 1, copied from the \c qt_MultiTexCoord1
- attribute.
- \row \o \c qt_TexCoord2
- \o Texture coordinate for unit 2, copied from the \c qt_MultiTexCoord2
- attribute.
- \endtable
-
- \section1 Lighting shader example
-
- The following example demonstrates what a lighting shader that
- uses a single light, a single material, and a texture might look like.
- The shader is quite complex but demonstrates most of the features that
- can be found in the lighting implementation of a fixed-function
- OpenGL pipeline:
-
- \code
- attribute highp vec4 qt_Vertex;
- uniform highp mat4 qt_ModelViewProjectionMatrix;
- attribute highp vec3 qt_Normal;
- uniform highp mat4 qt_ModelViewMatrix;
- uniform highp mat3 qt_NormalMatrix;
- attribute highp vec4 qt_MultiTexCoord0;
- varying highp vec4 qt_TexCoord0;
-
- struct qt_MaterialParameters {
- mediump vec4 emission;
- mediump vec4 ambient;
- mediump vec4 diffuse;
- mediump vec4 specular;
- mediump float shininess;
- };
- uniform qt_MaterialParameters qt_Material;
-
- struct qt_SingleLightParameters {
- mediump vec4 position;
- mediump vec3 spotDirection;
- mediump float spotExponent;
- mediump float spotCutoff;
- mediump float spotCosCutoff;
- mediump float constantAttenuation;
- mediump float linearAttenuation;
- mediump float quadraticAttenuation;
- };
- uniform qt_SingleLightParameters qt_Light;
-
- varying mediump vec4 litColor;
- varying mediump vec4 litSecondaryColor;
-
- void main(void)
- {
- gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
- gTexCoord0 = qt_MultiTexCoord0;
-
- // Calculate the vertex and normal to use for lighting calculations.
- highp vec4 vertex = qt_ModelViewMatrix * qt_Vertex;
- highp vec3 normal = normalize(qt_NormalMatrix * qt_Normal);
-
- // Start with the material's emissive color and the ambient scene color,
- // which have been combined into the emission parameter.
- vec4 color = ggl_Material.emission;
-
- // Viewer is at infinity.
- vec3 toEye = vec3(0, 0, 1);
-
- // Determine the angle between the normal and the light direction.
- vec4 pli = qt_Light.position;
- vec3 toLight;
- if (pli.w == 0.0)
- toLight = normalize(pli.xyz);
- else
- toLight = normalize(pli.xyz - vertex.xyz);
- float angle = max(dot(normal, toLight), 0.0);
-
- // Calculate the ambient and diffuse light components.
- vec4 adcomponent = qt_Material.ambient + angle * qt_Material.diffuse;
-
- // Calculate the specular light components.
- vec4 scomponent;
- if (angle != 0.0) {
- vec3 h = normalize(toLight + toEye);
- angle = max(dot(normal, h), 0.0);
- float srm = qt_Material.shininess;
- vec4 scm = qt_Material.specular;
- if (srm != 0.0)
- scomponent = pow(angle, srm) * scm;
- else
- scomponent = scm;
- } else {
- scomponent = vec4(0, 0, 0, 0);
- }
-
- // Apply the spotlight angle and exponent.
- if (qt_Light.spotCutoff != 180.0) {
- float spot = max(dot(normalize(vertex.xyz - pli.xyz),
- qt_Light.spotDirection), 0.0);
- if (spot < qt_Light.spotCosCutoff) {
- adcomponent = vec4(0, 0, 0, 0);
- scomponent = vec4(0, 0, 0, 0);
- } else {
- spot = pow(spot, qt_Light.spotExponent);
- adcomponent *= spot;
- scomponent *= spot;
- }
- }
-
- // Apply attenuation to the colors.
- if (pli.w != 0.0) {
- float attenuation = qt_Light.constantAttenuation;
- float k1 = qt_Light.linearAttenuation;
- float k2 = qt_Light.quadraticAttenuation;
- if (k1 != 0.0 || k2 != 0.0) {
- float len = length(pli.xyz - vertex.xyz);
- attenuation += k1 * len + k2 * len * len;
- }
- color += adcomponent / attenuation;
- scolor += scomponent / attenuation;
- } else {
- color += adcomponent;
- scolor += scomponent;
- }
-
- // Generate the final output colors to pass to the fragment shader.
- float alpha = qt_Material.diffuse.a;
- litColor = vec4(clamp(color.rgb, 0.0, 1.0), alpha);
- litSecondaryColor = vec4(clamp(scolor.rgb, 0.0, 1.0), 0.0);
- }
- \endcode
-
- The corresponding fragment shader is as follows:
-
- \code
- varying mediump vec4 litColor;
- varying mediump vec4 litSecondaryColor;
- varying highp vec4 qt_TexCoord0;
-
- void main(void)
- {
- vec4 color = litColor * texture2D(qt_Texture0, qt_TexCoord0.st);
- gl_FragColor = clamp(color + litSecondaryColor, 0.0, 1.0);
- }
- \endcode
-
- \section1 Fixed function operation
-
- If the OpenGL implementation does not support shaders, then
- QGLShaderProgramEffect will fall back to a flat color effect based
- on QGLPainter::color(). It is recommended that the application
- consult QGLPainter::isFixedFunction() to determine if some
- other effect should be used instead.
-*/
-
-class QGLShaderProgramEffectPrivate
-{
-public:
- QGLShaderProgramEffectPrivate()
- : geometryInputType(GL_TRIANGLE_STRIP)
- , geometryOutputType(GL_TRIANGLE_STRIP)
- , maximumLights(8)
- , attributes(0)
- , regenerate(true)
- , fixedFunction(false)
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- , program(0)
- , matrix(-1)
- , mvMatrix(-1)
- , projMatrix(-1)
- , normalMatrix(-1)
- , worldMatrix(-1)
- , texture0(-1)
- , texture1(-1)
- , texture2(-1)
- , color(-1)
- , numLights(-1)
- , haveLight(0)
- , haveLights(0)
- , haveMaterial(0)
- , haveMaterials(0)
-#endif
- {
- }
- ~QGLShaderProgramEffectPrivate()
- {
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- delete program;
-#endif
- }
-
- QByteArray vertexShader;
- QByteArray fragmentShader;
- QByteArray geometryShader;
- GLenum geometryInputType;
- GLenum geometryOutputType;
- int maximumLights;
- int attributes;
- bool regenerate;
- bool fixedFunction;
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- QGLShaderProgram *program;
- int matrix;
- int mvMatrix;
- int projMatrix;
- int normalMatrix;
- int worldMatrix;
- int texture0;
- int texture1;
- int texture2;
- int color;
- int numLights;
- int haveLight : 1;
- int haveLights : 1;
- int haveMaterial : 1;
- int haveMaterials : 1;
-
- void setUniformValue
- (const char *array, int index, const char *field, GLfloat v);
- void setUniformValue
- (const char *array, int index, const char *field, const QVector3D &v);
- void setUniformValue
- (const char *array, int index, const char *field, const QVector4D &v);
- void setUniformValue
- (const char *array, int index, const char *field, const QColor &v);
-
- void setLight
- (const QGLLightParameters *lparams, const QMatrix4x4 <ransform,
- const char *array, int index);
- void setMaterial
- (const QGLMaterial *mparams, const QGLLightModel *model,
- const QGLLightParameters *lparams, const char *array, int index);
-#endif
-};
-
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
-
-void QGLShaderProgramEffectPrivate::setUniformValue
- (const char *array, int index, const char *field, GLfloat v)
-{
- char name[128];
- if (index >= 0)
- qsnprintf(name, sizeof(name), "%s[%d].%s", array, index, field);
- else
- qsnprintf(name, sizeof(name), "%s.%s", array, field);
- program->setUniformValue(name, v);
-}
-
-void QGLShaderProgramEffectPrivate::setUniformValue
- (const char *array, int index, const char *field, const QVector3D &v)
-{
- char name[128];
- if (index >= 0)
- qsnprintf(name, sizeof(name), "%s[%d].%s", array, index, field);
- else
- qsnprintf(name, sizeof(name), "%s.%s", array, field);
- program->setUniformValue(name, v);
-}
-
-void QGLShaderProgramEffectPrivate::setUniformValue
- (const char *array, int index, const char *field, const QVector4D &v)
-{
- char name[128];
- if (index >= 0)
- qsnprintf(name, sizeof(name), "%s[%d].%s", array, index, field);
- else
- qsnprintf(name, sizeof(name), "%s.%s", array, field);
- program->setUniformValue(name, v);
-}
-
-void QGLShaderProgramEffectPrivate::setUniformValue
- (const char *array, int index, const char *field, const QColor &v)
-{
- char name[128];
- if (index >= 0)
- qsnprintf(name, sizeof(name), "%s[%d].%s", array, index, field);
- else
- qsnprintf(name, sizeof(name), "%s.%s", array, field);
- program->setUniformValue(name, v);
-}
-
-void QGLShaderProgramEffectPrivate::setLight
- (const QGLLightParameters *lparams, const QMatrix4x4 <ransform,
- const char *array, int index)
-{
- if (index >= 0) {
- // Single lights embed the color values into the material.
- setUniformValue(array, index, "ambient", lparams->ambientColor());
- setUniformValue(array, index, "diffuse", lparams->diffuseColor());
- setUniformValue(array, index, "specular", lparams->specularColor());
- }
- setUniformValue
- (array, index, "position", lparams->eyePosition(ltransform));
- setUniformValue
- (array, index, "spotDirection",
- lparams->eyeSpotDirection(ltransform).normalized());
- setUniformValue
- (array, index, "spotExponent", GLfloat(lparams->spotExponent()));
- setUniformValue
- (array, index, "spotCutoff", GLfloat(lparams->spotAngle()));
- setUniformValue
- (array, index, "spotCosCutoff", GLfloat(lparams->spotCosAngle()));
- setUniformValue
- (array, index, "constantAttenuation",
- GLfloat(lparams->constantAttenuation()));
- setUniformValue
- (array, index, "linearAttenuation",
- GLfloat(lparams->linearAttenuation()));
- setUniformValue
- (array, index, "quadraticAttenuation",
- GLfloat(lparams->quadraticAttenuation()));
-}
-
-static inline QVector4D colorToVector4(const QColor& color)
-{
- return QVector4D(color.redF(), color.greenF(),
- color.blueF(), color.alphaF());
-}
-
-// Combine a material and light color into a single color.
-static inline QVector4D colorToVector4
- (const QColor &color, const QColor &lightColor)
-{
- return QVector4D(color.redF() * lightColor.redF(),
- color.greenF() * lightColor.greenF(),
- color.blueF() * lightColor.blueF(),
- color.alphaF() * lightColor.alphaF());
-}
-
-void QGLShaderProgramEffectPrivate::setMaterial
- (const QGLMaterial *mparams, const QGLLightModel *model,
- const QGLLightParameters *lparams, const char *array, int index)
-{
- if (lparams) {
- setUniformValue
- (array, index, "ambient",
- colorToVector4(mparams->ambientColor(), lparams->ambientColor()));
- setUniformValue
- (array, index, "diffuse",
- colorToVector4(mparams->diffuseColor(), lparams->diffuseColor()));
- setUniformValue
- (array, index, "specular",
- colorToVector4(mparams->specularColor(), lparams->specularColor()));
- } else {
- setUniformValue
- (array, index, "ambient", mparams->ambientColor());
- setUniformValue
- (array, index, "diffuse", mparams->diffuseColor());
- setUniformValue
- (array, index, "specular", mparams->specularColor());
- }
- setUniformValue
- (array, index, "emission",
- colorToVector4(mparams->emittedLight()) +
- colorToVector4(mparams->ambientColor(), model->ambientSceneColor()));
- setUniformValue
- (array, index, "shininess", GLfloat(mparams->shininess()));
-}
-
-#endif // !QGL_FIXED_FUNCTION_ONLY
-
-/*!
- Constructs a new shader program effect. This constructor is typically
- followed by calls to setVertexShader() and setFragmentShader().
-
- Note that a shader program effect will be bound to the QGLContext that
- is current when setActive() is called for the first time. After that,
- the effect can only be used with that context or any other QGLContext
- that shares with it.
-*/
-QGLShaderProgramEffect::QGLShaderProgramEffect()
- : d_ptr(new QGLShaderProgramEffectPrivate)
-{
-}
-
-/*!
- Destroys this shader program effect.
-*/
-QGLShaderProgramEffect::~QGLShaderProgramEffect()
-{
-}
-
-/*!
- \reimp
-*/
-void QGLShaderProgramEffect::setActive(QGLPainter *painter, bool flag)
-{
- Q_D(QGLShaderProgramEffect);
-
-#if !defined(QGL_SHADERS_ONLY)
- d->fixedFunction = painter->isFixedFunction();
- if (d->fixedFunction) {
- // Fixed function emulation is flat color only.
- if (flag)
- glEnableClientState(GL_VERTEX_ARRAY);
- else
- glDisableClientState(GL_VERTEX_ARRAY);
- return;
- }
-#endif
-
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- static const char *const attributes[] = {
- "qt_Vertex",
- "qt_Normal",
- "qt_Color",
- "qt_MultiTexCoord0",
- "qt_MultiTexCoord1",
- "qt_MultiTexCoord2",
- "qt_Custom0",
- "qt_Custom1"
- };
- const int numAttributes = 8;
- Q_UNUSED(painter);
- int attr;
- if (d->regenerate) {
- // The shader source has changed since the last call to setActive().
- delete d->program;
- d->program = 0;
- d->regenerate = false;
- }
- if (!d->program) {
- if (!flag)
- return;
- if (d->vertexShader.isEmpty() || d->fragmentShader.isEmpty())
- return;
-
- d->program = new QGLShaderProgram();
- d->program->addShaderFromSourceCode
- (QGLShader::Vertex, d->vertexShader);
- d->program->addShaderFromSourceCode
- (QGLShader::Fragment, d->fragmentShader);
- if (!d->geometryShader.isEmpty())
- {
- d->program->addShaderFromSourceCode
- (QGLShader::Geometry, d->geometryShader);
- d->program->setGeometryInputType(d->geometryInputType);
- d->program->setGeometryOutputType(d->geometryOutputType);
-
- }
-
- if (beforeLink()) {
- for (attr = 0; attr < numAttributes; ++attr)
- d->program->bindAttributeLocation(attributes[attr], attr);
- }
- if (!d->program->link()) {
- qWarning("QGLShaderProgramEffect::setActive(): could not link shader program");
- delete d->program;
- d->program = 0;
- return;
- }
- afterLink();
- d->attributes = 0;
- for (attr = 0; attr < numAttributes; ++attr) {
- // Determine which attributes were actually present in the program.
- if (d->program->attributeLocation(attributes[attr]) != -1)
- d->attributes |= (1 << attr);
- }
- if (d->program->attributeLocation("qgl_Vertex") != -1)
- qWarning("QGLShaderProgramEffect: qgl_Vertex no longer supported; use qt_Vertex instead");
- d->matrix = d->program->uniformLocation("qt_ModelViewProjectionMatrix");
- d->mvMatrix = d->program->uniformLocation("qt_ModelViewMatrix");
- d->projMatrix = d->program->uniformLocation("qt_ProjectionMatrix");
- d->normalMatrix = d->program->uniformLocation("qt_NormalMatrix");
- d->worldMatrix = d->program->uniformLocation("qt_WorldMatrix");
- d->texture0 = d->program->uniformLocation("qt_Texture0");
- d->texture1 = d->program->uniformLocation("qt_Texture1");
- d->texture2 = d->program->uniformLocation("qt_Texture2");
- d->color = d->program->uniformLocation("qt_Color");
- d->numLights = d->program->uniformLocation("qt_NumLights");
- d->haveLight =
- (d->program->uniformLocation("qt_Light.position") != -1);
- d->haveLights =
- (d->program->uniformLocation("qt_Lights[0].position") != -1);
- d->haveMaterial =
- (d->program->uniformLocation("qt_Material.ambient") != -1) ||
- (d->program->uniformLocation("qt_Material.diffuse") != -1) ||
- (d->program->uniformLocation("qt_Material.specular") != -1) ||
- (d->program->uniformLocation("qt_Material.emission") != -1);
- d->haveMaterials =
- (d->program->uniformLocation("qt_Material[0].ambient") != -1) ||
- (d->program->uniformLocation("qt_Material[0].diffuse") != -1) ||
- (d->program->uniformLocation("qt_Material[0].specular") != -1) ||
- (d->program->uniformLocation("qt_Material[0].emission") != -1);
- }
- if (flag) {
- d->program->bind();
- for (attr = 0; attr < numAttributes; ++attr) {
- if ((d->attributes & (1 << attr)) == 0)
- continue;
- d->program->enableAttributeArray(attr);
- }
- if (d->texture0 != -1)
- d->program->setUniformValue(d->texture0, 0);
- if (d->texture1 != -1)
- d->program->setUniformValue(d->texture1, 1);
- if (d->texture2 != -1)
- d->program->setUniformValue(d->texture2, 2);
- } else {
- for (attr = 0; attr < int(QGL::UserVertex); ++attr) {
- if ((d->attributes & (1 << attr)) != 0)
- d->program->disableAttributeArray(attr);
- }
- d->program->release();
- }
-#endif
-}
-
-/*!
- \reimp
-*/
-void QGLShaderProgramEffect::update(QGLPainter *painter, QGLPainter::Updates updates)
-{
- Q_D(QGLShaderProgramEffect);
-#if !defined(QGL_SHADERS_ONLY)
- if (d->fixedFunction) {
- // Fixed function emulation is flat color only.
- painter->updateFixedFunction
- (updates & (QGLPainter::UpdateColor | QGLPainter::UpdateMatrices));
- return;
- }
-#endif
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- if ((updates & QGLPainter::UpdateColor) != 0 && d->color != -1)
- d->program->setUniformValue(d->color, painter->color());
- if ((updates & QGLPainter::UpdateMatrices) != 0) {
- if (d->matrix != -1)
- d->program->setUniformValue(d->matrix, painter->combinedMatrix());
- }
- if ((updates & QGLPainter::UpdateModelViewMatrix) != 0) {
- if (d->mvMatrix != -1)
- d->program->setUniformValue(d->mvMatrix, painter->modelViewMatrix());
- if (d->normalMatrix != -1)
- d->program->setUniformValue(d->normalMatrix, painter->normalMatrix());
- if (d->worldMatrix != -1)
- d->program->setUniformValue(d->worldMatrix, painter->worldMatrix());
- }
- if ((updates & QGLPainter::UpdateProjectionMatrix) != 0) {
- if (d->projMatrix != -1)
- d->program->setUniformValue(d->projMatrix, painter->projectionMatrix());
- }
- if ((updates & QGLPainter::UpdateLights) != 0) {
- if (d->haveLight) {
- // Only one light needed so make it the main light.
- d->setLight(painter->mainLight(), painter->mainLightTransform(),
- "qt_Light", -1);
- } else if (d->haveLights) {
- // Shader supports multiple light sources.
- int numLights = 0;
- int maxLightId = painter->maximumLightId();
- if (maxLightId < 0) {
- // No lights - re-enable the main light so we have something.
- painter->mainLight();
- maxLightId = 0;
- }
- for (int lightId = 0; lightId <= maxLightId; ++lightId) {
- // Is this light currently enabled?
- const QGLLightParameters *lparams = painter->light(lightId);
- if (!lparams)
- continue;
-
- // Set the parameters for the next shader light number.
- d->setLight(lparams, painter->lightTransform(lightId),
- "qt_Lights", numLights);
-
- // Bail out if we've hit the maximum shader light limit.
- ++numLights;
- if (numLights >= d->maximumLights)
- break;
- }
- if (d->numLights != -1)
- d->program->setUniformValue(d->numLights, numLights);
- }
- }
- if ((updates & QGLPainter::UpdateMaterials) != 0 ||
- ((updates & QGLPainter::UpdateLights) != 0 && d->haveLight)) {
- if (d->haveLight) {
- // For a single light source, combine the light colors
- // into the material colors.
- if (d->haveMaterial) {
- d->setMaterial(painter->faceMaterial(QGL::FrontFaces),
- painter->lightModel(), painter->mainLight(),
- "qt_Material", -1);
- } else if (d->haveMaterials) {
- d->setMaterial(painter->faceMaterial(QGL::FrontFaces),
- painter->lightModel(), painter->mainLight(),
- "qt_Materials", 0);
- d->setMaterial(painter->faceMaterial(QGL::BackFaces),
- painter->lightModel(), painter->mainLight(),
- "qt_Materials", 1);
- }
- } else {
- // Multiple light sources, so light colors are separate.
- if (d->haveMaterial) {
- d->setMaterial(painter->faceMaterial(QGL::FrontFaces),
- painter->lightModel(), 0, "qt_Material", -1);
- } else if (d->haveMaterials) {
- d->setMaterial(painter->faceMaterial(QGL::FrontFaces),
- painter->lightModel(), 0, "qt_Materials", 0);
- d->setMaterial(painter->faceMaterial(QGL::BackFaces),
- painter->lightModel(), 0, "qt_Materials", 1);
- }
- }
- }
-#endif
-}
-
-/*!
- Returns the source code for the vertex shader.
-
- \sa setVertexShader(), geometryShader(), fragmentShader(), setVertexShaderFromFile()
-*/
-QByteArray QGLShaderProgramEffect::vertexShader() const
-{
- Q_D(const QGLShaderProgramEffect);
- return d->vertexShader;
-}
-
-/*!
- Sets the \a source code for the vertex shader.
-
- \sa vertexShader(), setGeometryShader(), setFragmentShader(), setVertexShaderFromFile()
-*/
-void QGLShaderProgramEffect::setVertexShader(const QByteArray &source)
-{
- Q_D(QGLShaderProgramEffect);
- d->vertexShader = source;
- d->regenerate = true;
-}
-
-/*!
- Sets the source code for the vertex shader to the contents
- of \a fileName.
-
- \sa setVertexShader(), setGeometryShaderFromFile(), setFragmentShaderFromFile()
-*/
-void QGLShaderProgramEffect::setVertexShaderFromFile(const QString &fileName)
-{
- Q_D(QGLShaderProgramEffect);
- QFile file(fileName);
- if (file.open(QIODevice::ReadOnly)) {
- d->vertexShader = file.readAll();
- d->regenerate = true;
- } else {
- qWarning() << "QGLShaderProgramEffect::setVertexShaderFromFile: could not open " << fileName;
- }
-}
-
-/*!
- Returns the source code for the geometry shader.
-
- \sa setGeometryShader(), fragmentShader(), setGeometryShaderFromFile()
-*/
-QByteArray QGLShaderProgramEffect::geometryShader() const
-{
- Q_D(const QGLShaderProgramEffect);
- return d->geometryShader;
-}
-
-/*!
- Sets the \a source code for the geometry shader.
-
- \sa geometryShader(), setFragmentShader(), setGeometryShaderFromFile()
-*/
-void QGLShaderProgramEffect::setGeometryShader(const QByteArray &source)
-{
- Q_D(QGLShaderProgramEffect);
- d->geometryShader = source;
- d->regenerate = true;
-}
-
-/*!
- Sets the source code for the geometry shader to the contents
- of \a fileName.
-
- \sa setGeometryShader(), setFragmentShaderFromFile()
-*/
-void QGLShaderProgramEffect::setGeometryShaderFromFile(const QString &fileName)
-{
- Q_D(QGLShaderProgramEffect);
- QFile file(fileName);
- if (file.open(QIODevice::ReadOnly)) {
- d->geometryShader = file.readAll();
- d->regenerate = true;
- } else {
- qWarning() << "QGLShaderProgramEffect::setGeometryShaderFromFile: could not open " << fileName;
- }
-}
-
-/*!
- Returns the source code for the fragment shader.
-
- \sa setFragmentShader(), vertexShader(), geometryShader()
-*/
-QByteArray QGLShaderProgramEffect::fragmentShader() const
-{
- Q_D(const QGLShaderProgramEffect);
- return d->fragmentShader;
-}
-
-/*!
- Sets the source code for the fragment shader to the contents
- of \a fileName.
-
- \sa setFragmentShader(), setVertexShaderFromFile(), setGeometryShaderFromFile()
-*/
-void QGLShaderProgramEffect::setFragmentShaderFromFile(const QString &fileName)
-{
- Q_D(QGLShaderProgramEffect);
- QFile file(fileName);
- if (file.open(QIODevice::ReadOnly)) {
- d->fragmentShader = file.readAll();
- d->regenerate = true;
- } else {
- qWarning() << "QGLShaderProgramEffect::setFragmentShaderFromFile: could not open " << fileName;
- }
-}
-
-/*!
- Sets the \a source code for the fragment shader.
-
- \sa fragmentShader(), setVertexShader(), setGeometryShader()
-*/
-void QGLShaderProgramEffect::setFragmentShader(const QByteArray &source)
-{
- Q_D(QGLShaderProgramEffect);
- d->fragmentShader = source;
- d->regenerate = true;
-}
-
-/*!
- Sets the type of primitive the program's geometry shader is expecting to
- recieve from the vertex shader to \a drawingMode. The default value is
- GL_TRIANGLE_STRIP.
-
- If the program has no geometry shader, this has no effect.
-*/
-void QGLShaderProgramEffect::setGeometryInputType(GLenum drawingMode)
-{
- Q_D(QGLShaderProgramEffect);
- d->geometryInputType = drawingMode;
-}
-
-/*!
- Sets what sort of primitives the program's geometry shader will produce
- to \a drawingMode. The default value is GL_TRIANGLE_STRIP.
-
- If the program has no geometry shader, this has no effect.
-*/
-void QGLShaderProgramEffect::setGeometryOutputType(GLenum drawingMode)
-{
- Q_D(QGLShaderProgramEffect);
- d->geometryOutputType = drawingMode;
-}
-
-/*!
- Returns the type of primitives this program's geometry shader is expecting.
-*/
-GLenum QGLShaderProgramEffect::geometryInputType()
-{
- Q_D(QGLShaderProgramEffect);
- return d->geometryInputType;
-}
-
-/*!
- Returns the type of primitive this program's geometry shader will produce.
-*/
-GLenum QGLShaderProgramEffect::geometryOutputType()
-{
- Q_D(QGLShaderProgramEffect);
- return d->geometryOutputType;
-}
-
-/*!
- Returns the maximum number of lights that are supported by this
- shader program effect. The default value is 8.
-
- The actual number of lights will be provided to the vertexShader()
- as the \c{qt_NumLights} uniform variable, which will always be
- less than or equal to maximumLights().
-
- \sa setMaximumLights()
-*/
-int QGLShaderProgramEffect::maximumLights() const
-{
- Q_D(const QGLShaderProgramEffect);
- return d->maximumLights;
-}
-
-/*!
- Sets the maximum number of lights that are supported by this
- shader program effect to \a value.
-
- \sa maximumLights()
-*/
-void QGLShaderProgramEffect::setMaximumLights(int value)
-{
- Q_D(QGLShaderProgramEffect);
- d->maximumLights = value;
-}
-
-/*!
- Returns the shader program object that was created for this effect;
- null if setActive() has not been called yet.
-
- This function can be used by the application to adjust custom
- uniform variables after the effect is activated on a QGLPainter:
-
- \code
- painter.setUserEffect(effect);
- effect->program()->setUniformValue("springiness", GLfloat(0.5f));
- \endcode
-*/
-QGLShaderProgram *QGLShaderProgramEffect::program() const
-{
-#if !defined(QGL_FIXED_FUNCTION_ONLY)
- Q_D(const QGLShaderProgramEffect);
- return d->program;
-#else
- return 0;
-#endif
-}
-
-/*!
- Called by setActive() just before the program() is linked.
- Returns true if the standard vertex attributes should be bound
- by calls to QGLShaderProgram::bindAttributeLocation(). Returns
- false if the subclass has already bound the attributes.
-
- This function can be overridden by subclasses to alter the
- vertex attribute bindings, or to add additional shader stages
- to program().
-
- \sa afterLink()
-*/
-bool QGLShaderProgramEffect::beforeLink()
-{
- return true;
-}
-
-/*!
- Called by setActive() just after the program() is linked.
- The default implementation does nothing.
-
- This function can be overridden by subclasses to resolve uniform
- variable locations and cache them for later use in update().
-
- \sa beforeLink()
-*/
-void QGLShaderProgramEffect::afterLink()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.h b/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.h
deleted file mode 100644
index 83740a14cc6ef58c77900bab34afff3ec6d6ec9d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/effects/qglshaderprogrameffect.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSHADERPROGRAMEFFECT_H
-#define QGLSHADERPROGRAMEFFECT_H
-
-#include "qglabstracteffect.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLShaderProgramEffectPrivate;
-class QGLShaderProgram;
-
-class Q_QT3D_EXPORT QGLShaderProgramEffect : public QGLAbstractEffect
-{
-public:
- QGLShaderProgramEffect();
- virtual ~QGLShaderProgramEffect();
-
- void setActive(QGLPainter *painter, bool flag);
- void update(QGLPainter *painter, QGLPainter::Updates updates);
-
- QByteArray vertexShader() const;
- void setVertexShader(const QByteArray &source);
- void setVertexShaderFromFile(const QString &fileName);
-
- QByteArray geometryShader() const;
- void setGeometryShader(const QByteArray &source);
- void setGeometryShaderFromFile(const QString &fileName);
-
- QByteArray fragmentShader() const;
- void setFragmentShader(const QByteArray &source);
- void setFragmentShaderFromFile(const QString &fileName);
-
- void setGeometryInputType(GLenum drawingMode);
- void setGeometryOutputType(GLenum drawingMode);
- GLenum geometryInputType();
- GLenum geometryOutputType();
-
- int maximumLights() const;
- void setMaximumLights(int value);
-
- QGLShaderProgram *program() const;
-
-protected:
- virtual bool beforeLink();
- virtual void afterLink();
-
-private:
- QScopedPointer<QGLShaderProgramEffectPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGLShaderProgramEffect)
- Q_DECLARE_PRIVATE(QGLShaderProgramEffect)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/CMakeLists.txt b/src/gui/extern/Qt3D/geometry/CMakeLists.txt
deleted file mode 100644
index e136f7f213482d4dff30973400c81647cdde5b3b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-target_sources( gui
- PRIVATE
- qlogicalvertex.h
- qglcube.h
- qglsphere.cpp
- qglmaterialcollection.cpp
- qglteapot_data_p.h
- qglsection.cpp
- qglbuilder_p.h
- qgeometrydata.h
- qglcylinder.cpp
- qglmaterialcollection.h
- qglteapot.h
- qlogicalvertex.cpp
- qgldome.cpp
- qvector_utils_p.h
- qgeometrydata.cpp
- qglcube.cpp
- qglbezierpatches.h
- qglbezierpatches.cpp
- qglsection_p.h
- qglteapot.cpp
- qglbuilder.cpp
- qglcylinder.h
- qglbuilder.h
- qglsphere.h
- qgldome.h
- )
diff --git a/src/gui/extern/Qt3D/geometry/qgeometrydata.cpp b/src/gui/extern/Qt3D/geometry/qgeometrydata.cpp
deleted file mode 100644
index 60672a3ed3011f96fdf6bf429c579d1c6d1c5fca..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qgeometrydata.cpp
+++ /dev/null
@@ -1,2030 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgeometrydata.h"
-#include "qlogicalvertex.h"
-#include "qglpainter.h"
-
-#include <QtOpenGL/qgl.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGeometryData
- \brief The QGeometryData class encapsulates sets of geometry data.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The QGeometryData class encloses a number of data arrays
- that model most typical vertex data needs. The class provides a
- store for all of the data types in the QGL::VertexAttribute enumeration.
-
- \table
- \header
- \o QGL::VertexAttribute
- \o QGeometryData functions
- \row
- \o QGL::Position
- \o appendVertex(), vertex(), vertices()
- \row
- \o QGL::Normal
- \o appendNormal(), normal(), normals()
- \row
- \o QGL::Color
- \o appendColor(), colorRef(), colors()
- \row
- \o QGL::TextureCoord0 - QGL::TextureCoord3
- \o appendTexCoord(), texCoordRef(), texCoords()
- \row
- \o QGL::CustomVertex0 - QGL::CustomVertex1, QGL::UserVertex
- \o appendAttribute(), vector3DAttribute(), attributes()
- \endtable
-
- Additionally the class provides the following features:
- \list
- \o appendVertex() for adding a QLogicalVertex()
- \o logicalVertexAt() for return the data at an index as a QLogicalVertex()
- \o hasField() to find if a particular data type is present
- \o normalizeNormals() to reduce all normal vectors to unit length
- \o boundingBox() to find the bounds of the geometry
- \endlist
-
- It is up to the user of a QGeometryData instance to ensure that the
- data has an equal number of items in each field. For example, if five
- vertices are added and only two normals are added, the logical vertex at
- position 3 will be corrupt, since it does not have a normal.
-
- While data is being accumulated the counts of different fields will vary,
- since it may be convenient to add several vertices, then several normals,
- colors or attributes at a time. However when a logical vertex is
- constructed or when the data is sent to the GPU, counts of all fields
- must be equal.
-
- QGeometryData uses explicit sharing with lazy creation of internal
- data so that code like:
- \code
- QGeometryData myData;
- if (processed)
- myData = processedData();
- \endcode
- is very inexpensive, since the first declaration and initialization
- does not cause internal data to be created (only to be overwritten by the
- assignment operation).
-
- Since QGeometryData is explicitly shared, variables of type
- QGeometryData behave like references, and the underlying data is modified
- by calling a non-const function on any variable which shares that data.
-
- To force an explicit copy call the detach() function.
-*/
-
-/*!
- \typedef QGL::IndexArray
-
- This is a convenience for either QArray<ushort> (OpenGL/ES) or
- QArray<int> (desktop OpenGL).
-*/
-
-class QGeometryDataPrivate
-{
-public:
- QGeometryDataPrivate();
- ~QGeometryDataPrivate();
- QGeometryDataPrivate *clone() const;
-
- QBasicAtomicInt ref;
-
- QVector3DArray vertices;
- QVector3DArray normals;
- QArray<QColor4ub> colors;
- QList<QCustomDataArray> attributes;
- QList<QVector2DArray> textures;
- QGL::IndexArray indices;
- QGLVertexBundle vertexBundle;
- QGLIndexBuffer indexBuffer;
- bool uploadsViable;
- bool modified;
- QBox3D bb;
- static const int ATTR_CNT = 32;
- quint32 fields;
- qint8 key[ATTR_CNT];
- quint8 size[ATTR_CNT];
- int count;
- int reserved;
- bool boxValid;
- QGeometryData::BufferStrategy bufferStrategy;
-};
-
-QGeometryDataPrivate::QGeometryDataPrivate()
- : uploadsViable(true)
- , modified(false)
- , fields(0)
- , count(0)
- , reserved(-1)
- , boxValid(true)
- , bufferStrategy(QGeometryData::BufferIfPossible | QGeometryData::KeepClientData)
-{
- ref = 0;
- qMemSet(key, -1, ATTR_CNT);
- qMemSet(size, 0, ATTR_CNT);
-}
-
-QGeometryDataPrivate::~QGeometryDataPrivate()
-{
-}
-
-QGeometryDataPrivate *QGeometryDataPrivate::clone() const
-{
- QGeometryDataPrivate *temp = new QGeometryDataPrivate;
- temp->vertices = vertices;
- temp->normals = normals;
- temp->colors = colors;
- temp->attributes = attributes;
- temp->textures = textures;
- temp->indices = indices;
- temp->vertexBundle = vertexBundle;
- temp->indexBuffer = indexBuffer;
- temp->uploadsViable = uploadsViable;
- temp->modified = modified;
- temp->bb = bb;
- temp->fields = fields;
- qMemCopy(temp->key, key, ATTR_CNT);
- qMemCopy(temp->size, size, ATTR_CNT);
- temp->count = count;
- temp->reserved = reserved;
- temp->boxValid = boxValid;
- temp->bufferStrategy = bufferStrategy;
- return temp;
-}
-
-/*!
- \fn quint32 QGL::fieldMask(QGL::VertexAttribute attribute)
- \relates QGeometryData
- Returns an unsigned integer mask from the \a attribute.
-
- \sa QGeometryData::fields()
-*/
-
-/*!
- \enum QGeometryData::BufferStrategyFlags
-
- This enum serves to describe how management of the data is handled
- with respect to vertex buffer objects. The strategies are essentially a
- combination of whether the client data is kept around after it has been
- successfully uploaded to the GPU; and whether an upload is attempted at
- all.
-
- If the data set is very small it may be pointless to use up a VBO, hence
- in this case KeepClientData may be used resulting in no attempt to upload
- the data and client side arrays used instead.
-
- \value InvalidStrategy No valid strategy has been specified.
- \value KeepClientData Keep the client data, even after successful upload to the GPU.
- \value BufferIfPossible Try to upload the data to the GPU.
-*/
-
-/*!
- Construct an empty QGeometryData
-*/
-QGeometryData::QGeometryData()
- : d(0)
-{
-}
-
-/*!
- Construct QGeometryData as a copy of \a other
-*/
-QGeometryData::QGeometryData(const QGeometryData &other)
- : d(other.d)
-{
- if (d)
- d->ref.ref();
-}
-
-/*!
- Construct an empty QGeometryData with the \a fields enabled.
-*/
-QGeometryData::QGeometryData(quint32 fields)
- : d(new QGeometryDataPrivate)
-{
- d->ref.ref();
- const quint32 mask = 0x01;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (!(mask & fields)) continue;
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- enableField(attr);
- }
-}
-
-/*!
- Destroys this QGeometryData recovering any resources.
-*/
-QGeometryData::~QGeometryData()
-{
- if (d && !d->ref.deref())
- delete d;
-}
-
-/*!
- Assigns this QGeometryData to be a copy of \a other.
-*/
-QGeometryData &QGeometryData::operator=(const QGeometryData &other)
-{
- if (d != other.d)
- {
- if (d && !d->ref.deref())
- delete d;
- d = other.d;
- if (d)
- d->ref.ref();
- }
- return *this;
-}
-
-/*!
- Appends the geometry in \a data to this. If this is empty, then all
- fields of \a data are appended; otherwise (when this has existing fields)
- only those fields that exist in both are appended.
-
- This does not change the indices - to reference the new geometry add
- indices via the appendIndices() functions.
-*/
-void QGeometryData::appendGeometry(const QGeometryData &data)
-{
- if (data.d && data.count())
- {
- detach();
- d->modified = true;
- d->boxValid = false;
- int cnt = data.d->count;
- const quint32 mask = 0x01;
- quint32 fields = d->fields | data.fields();
- d->fields = fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- enableField(attr); // might not be enabled if we had NO fields
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- d->vertices.append(data.d->vertices);
- else if (attr == QGL::Normal)
- d->normals.append(data.d->normals);
- else // colors
- d->colors.append(data.d->colors);
- }
- else if (attr < QGL::CustomVertex0)
- {
- d->textures[d->key[attr]].append(data.texCoords(attr));
- }
- else
- {
- d->attributes[d->key[attr]].append(data.attributes(attr));
- }
- }
- }
- d->count += cnt;
- }
-}
-
-/*!
- Appends all the data fields in QLogicalVertex \a v to this
- QGeometryData object.
-*/
-int QGeometryData::appendVertex(const QLogicalVertex &v)
-{
- create();
- d->modified = true;
- if (d->boxValid)
- d->bb.unite(v.vertex());
- quint32 fields = v.fields();
- const quint32 mask = 0x01;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- appendVertex(v.vertex());
- else if (attr == QGL::Normal)
- appendNormal(v.normal());
- else
- appendColor(v.color());
- }
- else if (attr < QGL::CustomVertex0)
- {
- appendTexCoord(v.texCoord(attr), attr);
- }
- else
- {
- appendAttribute(v.attribute(attr), attr);
- }
- }
- }
- return d->count - 1;
-}
-
-/*!
- Returns a QLogicalVertex that references the \a{i}'th logical vertex
- of this geometry.
-*/
-QLogicalVertex QGeometryData::logicalVertexAt(int i) const
-{
- return QLogicalVertex(*this, i);
-}
-
-/*!
- Normalize all the normal vectors in this geometry to unit length.
-*/
-void QGeometryData::normalizeNormals()
-{
- check();
- if (d) // nothng to do if its null
- {
- create();
- d->modified = true;
- if (hasField(QGL::Normal))
- {
- for (int i = 0; i < d->normals.count(); ++i)
- d->normals[i].normalize();
- }
- }
-}
-
-/*!
- Calculate and return a bounding box for the vertex data in this geometry.
-*/
-QBox3D QGeometryData::boundingBox() const
-{
- QBox3D box;
- if (d)
- {
- if (d->boxValid)
- {
- box = d->bb;
- }
- else
- {
- for (int i = 0; i < d->count; ++i)
- box.unite(d->vertices.at(i));
- d->bb = box;
- }
- }
- return box;
-}
-
-/*!
- Returns the coordinates of the center of the geometry.
-
- The center is calculated as the centroid or geometric barycenter
- of the vertices (the average of the vertices). For a convex hull this
- is guaranteed to be inside the figure.
-*/
-QVector3D QGeometryData::center() const
-{
- QVector3D center;
- for (int i = 0; i < d->vertices.count(); ++i)
- center += d->vertices.at(i);
- return center / (float)d->vertices.count();
-}
-
-/*!
- Returns a copy of this geometry data with elements in reverse order.
-*/
-QGeometryData QGeometryData::reversed() const
-{
- QGeometryData r;
- for (int i = count() - 1; i >= 0; --i)
- r.appendVertex(logicalVertexAt(i));
- return r;
-}
-
-/*!
- Returns a copy of this geometry data with QGL::Position data translated by
- the vector \a t. The other fields are unchanged.
-*/
-QGeometryData QGeometryData::translated(const QVector3D &t) const
-{
- QGeometryData r(*this);
- r.detach();
- for (int i = 0; i < count(); ++i)
- {
- r.vertex(i) = r.vertexAt(i) + t;
- }
- return r;
-}
-
-/*!
- Modifies this geometry data by generating texture data based on QGL::Position
- values. If \a orientation is Qt::Horizontal (the default) then x-coordinate
- values are generated, and y-coordinate values are set to 0.0; otherwise
- y-coordinate values are generated and x-coordinate values are set to 0.0.
- The values are appended to the texture coordinate \a field.
-
- The method of calculation is based on the assumption that the vertex data
- is a list of extents which span across the texture space horizontally, from
- x = 0.0 to x = 1.0, in the case of Qt::Horizontal; or vertically in the
- case of Qt::Vertical. The texture space of 1.0 is divided up proportionately
- by the length of each extent.
-
- \image texture-coords-gen.png
-
- In this diagram the large blue numbers are the lengths of each extent, and
- the texture coordinates generated are shown as \c{t(7/16, 1)} and so on.
-
- Thus the texture coordinate t0 for vertex v0, is 0.0; t1 for vertex v1 is
- \c{(v1 - v0).length() / totalLength} and so on.
-
- The code to produce the texture coordinates for the quads in the image is:
- \code
- QGeometryData top;
-
- // add data to the primitive
- top.appendVertex(QVector3D(0.0, 0.0, 0.0));
- top.appendVertex(QVector3D(6.0, 3.6, 0.0)); // (v1 - v0).length() = 7.0
- top.appendVertex(QVector3D(10.0, 0.6, 0.0)); // (v2 - v1).length() = 5.0
- top.appendVertex(QVector3D(13.0, 3.24, 0.0)); // (v3 - v2).length() = 4.0
-
- // generate x (Qt::Horizontal) texture coordinates over the primitive
- top.generateTextureCoordinates(); // spread over 7 + 5 + 4 = 16
-
- // make a copy translated down, the copy has y texture coordinates all 0
- QGeometryData bottom = top.translated(QVector3D(0, 0, -1));
-
- // now modify the top so its y texture coordinates are all 1
- for (int i = 0; i < top.count(); ++i)
- top.texCoordRef(QGL::TextureCoord0).setY(1.0);
-
- displayList->addQuadsZipped(top, bottom);
- \endcode
-*/
-void QGeometryData::generateTextureCoordinates(Qt::Orientation orientation, QGL::VertexAttribute field)
-{
- QArray<qreal> extents;
- extents.append(0.0);
- qreal totalExtents = 0.0;
- QArray<QVector3D> v = vertices();
- for (int i = 0; i < v.count() - 1; ++i)
- {
- int n = (i + 1) % v.count();
- QVector3D e = v[n] - v[i];
- qreal extent = e.length();
- totalExtents += extent;
- extents.append(totalExtents);
- }
- if (hasField(field))
- clear(field);
- if (orientation == Qt::Horizontal)
- {
- for (int i = 0; i < v.count(); ++i)
- appendTexCoord(QVector2D(extents[i] / totalExtents, 0.0), field);
- }
- else
- {
- for (int i = 0; i < v.count(); ++i)
- appendTexCoord(QVector2D(0.0, extents[i] / totalExtents), field);
- }
-}
-
-/*!
- Returns a QGeometryData instance containing alternating vertices from
- this geometry and \a other. The resulting geometry contains N vertices
- where \c{N == qMin(count(), other.count())}, and has only the fields
- that are in both geometries.
-*/
-QGeometryData QGeometryData::interleavedWith(const QGeometryData &other) const
-{
- QGeometryData res;
- check();
- other.check();
- if (d && other.d)
- {
- int cnt = qMax(d->count, other.d->count);
- const quint32 mask = 0x01;
- quint32 fields = d->fields & other.d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- res.enableField(attr);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- {
- QArray<QVector3D> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->vertices.at(i));
- tmp.append(other.d->vertices.at(i));
- }
- res.d->vertices = tmp;
- }
- else if (attr == QGL::Normal)
- {
- QArray<QVector3D> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->normals.at(i));
- tmp.append(other.d->normals.at(i));
- }
- res.d->normals = tmp;
- }
- else // colors
- {
- QArray<QColor4ub> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->colors.at(i));
- tmp.append(other.d->colors.at(i));
- }
- res.d->colors = tmp;
- }
- }
- else if (attr < QGL::CustomVertex0)
- {
- QArray<QVector2D> tmp;
- const QArray<QVector2D> txa = d->textures.at(d->key[attr]);
- const QArray<QVector2D> txb = other.d->textures.at(other.d->key[attr]);
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(txa.at(i));
- tmp.append(txb.at(i));
- }
- res.d->textures[d->key[attr]] = tmp;
- }
- else
- {
- QCustomDataArray tmp;
- const QCustomDataArray ata = d->attributes.at(d->key[attr]);
- const QCustomDataArray atb = other.d->attributes.at(other.d->key[attr]);
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(ata.at(i));
- tmp.append(atb.at(i));
- }
- res.d->attributes[d->key[attr]] = tmp;
- }
- }
- }
- res.d->count = cnt * 2;
- }
- return res;
-}
-
-/*!
- Sets this QGeometryData to contain alternating vertices from
- this geometry and \a other. The resulting geometry contains \c{N * 2} vertices
- where \c{N == qMin(count(), other.count())}, and has only the fields
- that are in both geometries.
-*/
-void QGeometryData::interleaveWith(const QGeometryData &other)
-{
- check();
- other.check();
- if (d && other.d)
- {
- create();
- d->modified = true;
- d->boxValid = false;
- int cnt = qMin(d->count, other.d->count);
- const quint32 mask = 0x01;
- quint32 fields = d->fields & other.d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- {
- QArray<QVector3D> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->vertices.at(i));
- tmp.append(other.d->vertices.at(i));
- }
- d->vertices = tmp;
- }
- else if (attr == QGL::Normal)
- {
- QArray<QVector3D> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->normals.at(i));
- tmp.append(other.d->normals.at(i));
- }
- d->normals = tmp;
- }
- else // colors
- {
- QArray<QColor4ub> tmp;
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(d->colors.at(i));
- tmp.append(other.d->colors.at(i));
- }
- d->colors = tmp;
- }
- }
- else if (attr < QGL::CustomVertex0)
- {
- QArray<QVector2D> tmp;
- const QArray<QVector2D> txa = d->textures.at(d->key[attr]);
- const QArray<QVector2D> txb = other.d->textures.at(other.d->key[attr]);
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(txa.at(i));
- tmp.append(txb.at(i));
- }
- d->textures[d->key[attr]] = tmp;
- }
- else
- {
- QCustomDataArray tmp;
- const QCustomDataArray ata = d->attributes.at(d->key[attr]);
- const QCustomDataArray atb = other.d->attributes.at(other.d->key[attr]);
- for (int i = 0; i < cnt; ++i)
- {
- tmp.append(ata.at(i));
- tmp.append(atb.at(i));
- }
- d->attributes[d->key[attr]] = tmp;
- }
- }
- }
- d->count = cnt * 2;
- }
-}
-
-/*!
- Clear all data structures. The actual fields are retained, but they
- have no contents.
- \code
- QGeometryData data;
- data.appendVertex(a);
- data.appendTexCoord(t);
-
- // prints "1"
- qDebug() << data.count();
-
- // x == a
- QVector3D x = data.vertexAt(0);
-
- quint32 flds = QGL::fieldMask(QGL::Position) | QGL::fieldMask(QGL::TextureCoord0);
- qDebug() << (flds == data.fields()); // prints "true"
-
- data.clear();
- qDebug() << data.count(); // prints "0"
- QVector3D x = data.vertexAt(0); // asserts - no data in vertices
- qDebug() << (flds == data.fields()); // still prints "true"
- \endcode
-
- To clear a specific field and its data use \c{data.clear(field)} below.
-
- To clear all fields and data, simply set this to an empty geometry:
- \code
- data = QGeometryData();
- \endcode
- */
-void QGeometryData::clear()
-{
- if (d)
- {
- create();
- d->modified = true;
- d->bb = QBox3D();
- d->boxValid = true;
- const quint32 mask = 0x01;
- quint32 fields = d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- d->vertices.clear();
- else if (attr == QGL::Normal)
- d->normals.clear();
- else
- d->colors.clear();
- }
- else if (attr < QGL::CustomVertex0)
- {
- d->textures[d->key[field]].clear();
- }
- else
- {
- d->attributes[d->key[field]].clear();
- }
- }
- }
- d->count = 0;
- }
-}
-
-/*!
- Clears the data from \a field, and removes the field. After this call
- hasField() will return false for this field.
-*/
-void QGeometryData::clear(QGL::VertexAttribute field)
-{
- if (d && (QGL::fieldMask(field) & d->fields))
- {
- create();
- d->modified = true;
- if (field == QGL::Position)
- {
- d->bb = QBox3D();
- d->boxValid = true;
- }
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- d->vertices.clear();
- else if (attr == QGL::Normal)
- d->normals.clear();
- else
- d->colors.clear();
- }
- else if (attr < QGL::CustomVertex0)
- {
- d->textures[d->key[field]].clear();
- }
- else
- {
- d->attributes[d->key[field]].clear();
- }
- d->key[field] = -1;
- d->fields = d->fields & ~QGL::fieldMask(field);
- }
-}
-
-/*!
- Sets the geometry data to handle an \a amount of data. This is generally
- not required unless its anticipated that a large amount of data will be
- appended and realloc overhead is desired to be avoided. If \a amount is
- less than the amount already reserved, or if this object has
- more than the \a amount of data items, then this function exits without
- doing anything. This function will never delete data.
-*/
-void QGeometryData::reserve(int amount)
-{
- if (d && (d->reserved > amount || d->reserved < d->count))
- return;
- create();
- d->reserved = amount;
- const quint32 mask = 0x01;
- quint32 fields = d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- d->vertices.reserve(amount);
- else if (attr == QGL::Normal)
- d->normals.reserve(amount);
- else
- d->colors.reserve(amount);
- }
- else if (attr < QGL::CustomVertex0)
- {
- d->textures[d->key[field]].reserve(amount);
- }
- else
- {
- d->attributes[d->key[field]].reserve(amount);
- }
- }
- }
-}
-
-/*!
- Draws this geometry on the \a painter, from \a start for \a count elements
- in \a mode. The drawing \a mode is by default QGL::Triangles. This function
- Also calls the upload() method to ensure that the geometry is resident on
- the graphics hardware if appropriate.
-
- If the geometry is a point or line, then the \a drawWidth value specified the
- width/size of the line/point.
-*/
-void QGeometryData::draw(QGLPainter *painter, int start, int count, GLenum mode, qreal drawWidth)
-{
- if (d && d->indices.size() && d->count)
- {
- upload();
- painter->clearAttributes();
- if (mode==QGL::Points) {
-#if !defined(QT_OPENGL_ES_2)
- ::glPointSize(drawWidth);
-#endif
- } else if (mode==QGL::LineStrip || mode == QGL::Lines) {
- ::glLineWidth(drawWidth);
- }
- painter->setVertexBundle(d->vertexBundle);
- if (count == 0)
- count = d->indexBuffer.indexCount();
- painter->draw(QGL::DrawingMode(mode), d->indexBuffer, start, count);
- }
-}
-
-/*!
- Uploads this geometry data to the graphics hardware if appropriate. If the
- data is already uploaded and has not been modified since it was last
- uploaded, then this function does nothing.
-
- If the bufferStrategy() does not specify QGL::BufferIfPossible then this
- function does nothing.
-
- If the data was successfully uploaded, and the bufferStrategy() does not
- specify QGL::KeepClientData then the data will be removed with a call to
- the clear() function.
-
- If the data was successfully uploaded, on this call or previously, then this
- function will return true. Otherwise it returns false.
-*/
-bool QGeometryData::upload()
-{
- bool vboUploaded = false;
- bool iboUploaded = false;
-
- if (!d)
- return false;
- if (!d->modified)
- return d->vertexBundle.isUploaded() && d->indexBuffer.isUploaded();
-
- check();
-
- // Need to recreate the buffers from the modified data.
- d->vertexBundle = QGLVertexBundle();
- d->indexBuffer = QGLIndexBuffer();
-
- // Copy the geometry data to the vertex buffer.
- const quint32 mask = 0x01;
- quint32 fields = d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (!(mask & fields))
- continue;
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr == QGL::Position)
- d->vertexBundle.addAttribute(attr, d->vertices);
- else if (attr == QGL::Normal)
- d->vertexBundle.addAttribute(attr, d->normals);
- else if (attr == QGL::Color)
- d->vertexBundle.addAttribute(attr, d->colors);
- else if (attr < QGL::CustomVertex0)
- d->vertexBundle.addAttribute(attr, d->textures.at(d->key[field]));
- else
- d->vertexBundle.addAttribute(attr, d->attributes.at(d->key[field]));
- }
-
- // Upload the buffer if requested, otherwise keep it client-side.
- // Note: QGLVertexBundle will act as a client-side buffer if not uploaded.
- if ((d->bufferStrategy & BufferIfPossible) != 0)
- {
- if (d->vertexBundle.upload())
- vboUploaded = true;
- }
-
- // Copy the geometry data to the index buffer and upload if requested.
- d->indexBuffer.setIndexes(d->indices);
- if ((d->bufferStrategy & BufferIfPossible) != 0)
- {
- if (d->indexBuffer.upload())
- iboUploaded = true;
- }
-
- d->modified = false;
-
- if (!(d->bufferStrategy & KeepClientData) && vboUploaded && iboUploaded)
- clear();
-
- return vboUploaded && iboUploaded;
-}
-
-/*!
- Sets the buffer \a strategy for this geometry.
-
- \sa bufferStrategy()
-*/
-void QGeometryData::setBufferStrategy(QGeometryData::BufferStrategy strategy)
-{
- if (!d || d->bufferStrategy != strategy)
- {
- create();
- d->modified = true;
- d->bufferStrategy = strategy;
- }
-}
-
-/*!
- Returns the buffer strategy for this geometry. The default is
- \c{QGL::BufferIfPossible | QGL::KeepClientData}.
-
- \sa setBufferStrategy()
-*/
-QGeometryData::BufferStrategy QGeometryData::bufferStrategy() const
-{
- if (d)
- return d->bufferStrategy;
- return InvalidStrategy;
-}
-
-/*!
- Returns a reference to the vertex buffer for this geometry.
-
- \sa indexBuffer()
-*/
-QGLVertexBundle QGeometryData::vertexBundle() const
-{
- return d->vertexBundle;
-}
-
-/*!
- Returns a reference to the index buffer for this geometry.
-
- \sa vertexBundle()
-*/
-QGLIndexBuffer QGeometryData::indexBuffer() const
-{
- return d->indexBuffer;
-}
-
-/*!
- Appends \a index to the vertex index array.
-
- \sa appendIndices(), indices()
-*/
-void QGeometryData::appendIndex(int index)
-{
- create();
- d->modified = true;
- d->indices.append(index);
-}
-
-/*!
- Appends \a index1, \a index2, and \a index3 to the geometry's
- index array.
-
- \sa appendIndex(), indices()
-*/
-void QGeometryData::appendIndices(int index1, int index2, int index3)
-{
- create();
- d->modified = true;
- d->indices.append(index1, index2, index3);
-}
-
-/*!
- Returns the index array that was created by appendIndex().
-
- \sa appendIndex(), appendIndices()
-*/
-QGL::IndexArray QGeometryData::indices() const
-{
- if (d)
- return d->indices;
- else
- return QGL::IndexArray();
-}
-
-/*!
- Appends the \a indices to the geometry's index array.
-*/
-void QGeometryData::appendIndices(const QGL::IndexArray &indices)
-{
- create();
- d->modified = true;
- d->indices.append(indices);
-}
-
-/*!
- Append the point \a v0 to this geometry data as a position field.
-*/
-void QGeometryData::appendVertex(const QVector3D &v0)
-{
- create();
- d->modified = true;
- enableField(QGL::Position);
- d->vertices.append(v0);
- if (d->boxValid)
- d->bb.unite(v0);
- d->count = qMax(d->count, d->vertices.count());
-}
-
-/*!
- Append the points \a v0 and \a v1 to this geometry data as position fields.
-*/
-void QGeometryData::appendVertex(const QVector3D &v0, const QVector3D &v1)
-{
- create();
- d->modified = true;
- enableField(QGL::Position);
- d->vertices.append(v0, v1);
- if (d->boxValid)
- {
- d->bb.unite(v0);
- d->bb.unite(v1);
- }
- d->count = qMax(d->count, d->vertices.count());
-}
-
-/*!
- Append the points \a v0, \a v1 and \a v2 to this geometry data as position fields.
-*/
-void QGeometryData::appendVertex(const QVector3D &v0, const QVector3D &v1, const QVector3D &v2)
-{
- create();
- d->modified = true;
- enableField(QGL::Position);
- d->vertices.append(v0, v1, v2);
- if (d->boxValid)
- {
- d->bb.unite(v0);
- d->bb.unite(v1);
- d->bb.unite(v2);
- }
- d->count = qMax(d->count, d->vertices.count());
-}
-
-/*!
- Append the points \a v0, \a v1, \a v2 and \a v3 to this geometry data as position fields.
-*/
-void QGeometryData::appendVertex(const QVector3D &v0, const QVector3D &v1, const QVector3D &v2, const QVector3D &v3)
-{
- create();
- d->modified = true;
- enableField(QGL::Position);
- d->vertices.append(v0, v1, v2, v3);
- if (d->boxValid)
- {
- d->bb.unite(v0);
- d->bb.unite(v1);
- d->bb.unite(v2);
- d->bb.unite(v3);
- }
- d->count = qMax(d->count, d->vertices.count());
-}
-
-/*!
- Append the float \a a0 to this geometry data, as an attribute \a field.
-*/
-void QGeometryData::appendAttribute(float a0, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->attributes[d->key[field]].append(a0);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the float \a a0 and \a a1 to this geometry data, as an attribute \a field.
-*/
-void QGeometryData::appendAttribute(float a0, float a1, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->attributes[d->key[field]].append(a0, a1);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the floats \a a0, \a a1 and \a a2 to this geometry data, as attribute \a field.
-*/
-void QGeometryData::appendAttribute(float a0, float a1, float a2, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->attributes[d->key[field]].append(a0, a1, a2);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the floats \a a0, \a a1, \a a2 and \a a3 to this geometry data, as attribute \a field.
-*/
-void QGeometryData::appendAttribute(float a0, float a1, float a2, float a3, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->attributes[d->key[field]].append(a0, a1, a2, a3);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the 2D point \a a to this geometry data, as an attribute \a field.
-*/
-void QGeometryData::appendAttribute(const QVector2D &a, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- if (d->attributes.at(d->key[field]).isEmpty())
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Vector2D);
- d->attributes[d->key[field]].append(a);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the 3D point \a v to this geometry data, as an attribute \a field.
-*/
-void QGeometryData::appendAttribute(const QVector3D &v, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- if (d->attributes.at(d->key[field]).isEmpty())
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Vector3D);
- d->attributes[d->key[field]].append(v);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the variant value \a a to this geometry data, as an attribute \a field.
-*/
-void QGeometryData::appendAttribute(const QVariant &a, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- if (d->attributes.at(d->key[field]).isEmpty())
- {
- // floats and doubles get handled "automatically" - float is default
- if (a.type() == QVariant::Vector2D)
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Vector2D);
- else if (a.type() == QVariant::Vector3D)
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Vector3D);
- else if (a.type() == QVariant::Vector4D)
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Vector4D);
- else if (a.type() == QVariant::Color)
- d->attributes[d->key[field]].setElementType(QCustomDataArray::Color);
- else
- Q_ASSERT_X(false, "QGeometryData::appendAttribute", "bad type");
- }
- d->attributes[d->key[field]].append(a);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
-}
-
-/*!
- Append the vector \a n0 to this geometry data, as a lighting normal.
-*/
-void QGeometryData::appendNormal(const QVector3D &n0)
-{
- create();
- d->modified = true;
- enableField(QGL::Normal);
- d->normals.append(n0);
- d->count = qMax(d->count, d->normals.count());
-}
-
-/*!
- Append the vectors \a n0 and \a n1 to this geometry data, as lighting normals.
-*/
-void QGeometryData::appendNormal(const QVector3D &n0, const QVector3D &n1)
-{
- create();
- d->modified = true;
- enableField(QGL::Normal);
- d->normals.append(n0, n1);
- d->count = qMax(d->count, d->normals.count());
-}
-
-/*!
- Append the vectors \a n0, \a n1 and \a n2 to this geometry data, as lighting normals.
-*/
-void QGeometryData::appendNormal(const QVector3D &n0, const QVector3D &n1, const QVector3D &n2)
-{
- create();
- d->modified = true;
- enableField(QGL::Normal);
- d->normals.append(n0, n1, n2);
- d->count = qMax(d->count, d->normals.count());
-}
-
-/*!
- Append the vectors \a n0, \a n1, \a n2 and \a n3 to this geometry data, as lighting normals.
-*/
-void QGeometryData::appendNormal(const QVector3D &n0, const QVector3D &n1, const QVector3D &n2, const QVector3D &n3)
-{
- create();
- d->modified = true;
- enableField(QGL::Normal);
- d->normals.append(n0, n1, n2, n3);
- d->count = qMax(d->count, d->normals.count());
-}
-
-/*!
- Append the point \a t0 to this geometry data, as an texture \a field.
-*/
-void QGeometryData::appendTexCoord(const QVector2D &t0, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->textures[d->key[field]].append(t0);
- d->count = qMax(d->count, d->textures[d->key[field]].count());
-}
-
-/*!
- Append the points \a t0 and \a t1 to this geometry data, as texture \a{field}s.
-*/
-void QGeometryData::appendTexCoord(const QVector2D &t0, const QVector2D &t1, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->textures[d->key[field]].append(t0, t1);
- d->count = qMax(d->count, d->textures[d->key[field]].count());
-}
-
-/*!
- Append the points \a t0, \a t1 and \a t2 to this geometry data, as texture \a{field}s.
-*/
-void QGeometryData::appendTexCoord(const QVector2D &t0, const QVector2D &t1, const QVector2D &t2, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->textures[d->key[field]].append(t0, t1, t2);
- d->count = qMax(d->count, d->textures[d->key[field]].count());
-}
-
-/*!
- Append the points \a t0, \a t1, \a t2 and \a t3 to this geometry data, as texture \a{field}s.
-*/
-void QGeometryData::appendTexCoord(const QVector2D &t0, const QVector2D &t1, const QVector2D &t2, const QVector2D &t3, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- enableField(field);
- d->textures[d->key[field]].append(t0, t1, t2, t3);
- d->count = qMax(d->count, d->textures[d->key[field]].count());
-}
-
-/*!
- Append the color \a c0 to this geometry data, as an color field.
-*/
-void QGeometryData::appendColor(const QColor4ub &c0)
-{
- create();
- d->modified = true;
- enableField(QGL::Color);
- d->colors.append(c0);
- d->count = qMax(d->count, d->colors.count());
-}
-
-/*!
- Append the color \a c0 and \a c1 to this geometry data, as color fields.
-*/
-void QGeometryData::appendColor(const QColor4ub &c0, const QColor4ub &c1)
-{
- create();
- d->modified = true;
- enableField(QGL::Color);
- d->colors.append(c0, c1);
- d->count = qMax(d->count, d->colors.count());
-}
-
-/*!
- Append the color \a c0, \a c1 and \a c2 to this geometry data, as color fields.
-*/
-void QGeometryData::appendColor(const QColor4ub &c0, const QColor4ub &c1, const QColor4ub &c2)
-{
- create();
- d->modified = true;
- enableField(QGL::Color);
- d->colors.append(c0, c1, c2);
- d->count = qMax(d->count, d->colors.count());
-}
-
-/*!
- Append the color \a c0, \a c1, \a c2 and \a c3 to this geometry data, as color fields.
-*/
-void QGeometryData::appendColor(const QColor4ub &c0, const QColor4ub &c1, const QColor4ub &c2, const QColor4ub &c3)
-{
- create();
- d->modified = true;
- enableField(QGL::Color);
- d->colors.append(c0, c1, c2, c3);
- d->count = qMax(d->count, d->colors.count());
-}
-
-/*!
- Append the points in \a ary to this geometry data as position fields.
-*/
-void QGeometryData::appendVertexArray(const QVector3DArray &ary)
-{
- if (ary.count())
- {
- create();
- d->modified = true;
- d->boxValid = false;
- enableField(QGL::Position);
- d->vertices.append(ary);
- d->count = qMax(d->count, d->vertices.count());
- }
-}
-
-/*!
- Append the points in \a ary to this geometry data, as an attribute \a field entries.
-*/
-void QGeometryData::appendAttributeArray(const QCustomDataArray &ary, QGL::VertexAttribute field)
-{
- if (ary.count())
- {
- create();
- d->modified = true;
- enableField(field);
- d->attributes[d->key[field]].append(ary);
- d->count = qMax(d->count, d->attributes[d->key[field]].count());
- }
-}
-
-/*!
- Append the vectors in \a ary to this geometry data, as lighting normals.
-*/
-void QGeometryData::appendNormalArray(const QVector3DArray &ary)
-{
- if (ary.count())
- {
- create();
- d->modified = true;
- enableField(QGL::Normal);
- d->normals.append(ary);
- d->count = qMax(d->count, d->normals.count());
- }
-}
-
-/*!
- Append the 2D points in \a ary to this geometry data, as texture \a field entries.
-*/
-void QGeometryData::appendTexCoordArray(const QVector2DArray &ary, QGL::VertexAttribute field)
-{
- if (ary.count())
- {
- create();
- d->modified = true;
- enableField(field);
- d->textures[d->key[field]].append(ary);
- d->count = qMax(d->count, d->textures[d->key[field]].count());
- }
-}
-
-/*!
- Append the colors in \a ary to this geometry data, as color fields.
-*/
-void QGeometryData::appendColorArray(const QArray<QColor4ub> &ary)
-{
- if (ary.count())
- {
- create();
- d->modified = true;
- enableField(QGL::Color);
- d->colors.append(ary);
- d->count = qMax(d->count, d->colors.count());
- }
-}
-
-/*!
- Returns a modifiable reference to the vertex data at index \a i.
-*/
-QVector3D &QGeometryData::vertex(int i)
-{
- create();
- d->modified = true;
- d->boxValid = false;
- return d->vertices[i];
-}
-
-/*!
- Returns a copy of the vertex position data.
-*/
-QVector3DArray QGeometryData::vertices() const
-{
- if (d)
- return d->vertices;
- return QArray<QVector3D>();
-}
-
-/*!
- \internal
- Returns a pointer to the vertex data.
-*/
-const QVector3DArray *QGeometryData::vertexData() const
-{
- if (d)
- return &d->vertices;
- return 0;
-}
-
-
-/*!
- Returns a non-modifiable reference to the vertex position data at index \a i.
-*/
-const QVector3D &QGeometryData::vertexAt(int i) const
-{
- Q_ASSERT(hasField(QGL::Position));
- return d->vertices.at(i);
-}
-
-/*!
- Returns a modifiable reference to the normal data at index \a i.
-*/
-QVector3D &QGeometryData::normal(int i)
-{
- create();
- d->modified = true;
- return d->normals[i];
-}
-
-/*!
- Returns a non-modifiable reference to the normal data at index \a i.
-*/
-const QVector3D &QGeometryData::normalAt(int i) const
-{
- Q_ASSERT(hasField(QGL::Normal));
- return d->normals.at(i);
-}
-
-/*!
- Returns a copy of the lighting normal data.
-*/
-QVector3DArray QGeometryData::normals() const
-{
- if (d)
- return d->normals;
- return QArray<QVector3D>();
-}
-
-/*!
- Returns a modifiable reference to the color data at index \a i.
-*/
-QColor4ub &QGeometryData::color(int i)
-{
- create();
- d->modified = true;
- return d->colors[i];
-}
-
-/*!
- Returns a non-modifiable reference to the color data at index \a i.
-*/
-const QColor4ub &QGeometryData::colorAt(int i) const
-{
- Q_ASSERT(hasField(QGL::Color));
- return d->colors.at(i);
-}
-
-/*!
- Returns a copy of the color data.
-*/
-QArray<QColor4ub> QGeometryData::colors() const
-{
- if (d)
- return d->colors;
- return QArray<QColor4ub>();
-}
-
-/*!
- Returns a modifiable reference to the \a field texture coordinate data at index \a i.
-*/
-QVector2D &QGeometryData::texCoord(int i, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- return d->textures[d->key[field]][i];
-}
-
-/*!
- Returns a copy of the \a field texture coordinate data.
-*/
-QVector2DArray QGeometryData::texCoords(QGL::VertexAttribute field) const
-{
- return hasField(field) ? d->textures.at(d->key[field]) : QVector2DArray();
-}
-
-/*!
- Returns a non-modifiable reference to the texture coordinate data at index \a i for \a field.
-*/
-const QVector2D &QGeometryData::texCoordAt(int i, QGL::VertexAttribute field) const
-{
- Q_ASSERT(hasField(field));
- return d->textures.at(d->key[field]).at(i);
-}
-
-/*!
- Returns a modifiable reference to the float \a field attribute data at index \a i.
-*/
-float &QGeometryData::floatAttribute(int i, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- QCustomDataArray &ary = d->attributes[d->key[field]];
- Q_ASSERT(ary.elementType() == QCustomDataArray::Float);
- return ary.m_array[i];
-}
-
-/*!
- Returns a modifiable reference to the 2D vector \a field attribute data at index \a i.
-*/
-QVector2D &QGeometryData::vector2DAttribute(int i, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- QCustomDataArray &ary = d->attributes[d->key[field]];
- Q_ASSERT(ary.elementType() == QCustomDataArray::Vector2D);
- float *data = ary.m_array.data();
- QVector2D *v = reinterpret_cast<QVector2D*>(data + i*2);
- return *v;
-}
-
-/*!
- Returns a modifiable reference to the 3D vector \a field attribute data at index \a i.
-*/
-QVector3D &QGeometryData::vector3DAttribute(int i, QGL::VertexAttribute field)
-{
- create();
- d->modified = true;
- QCustomDataArray &ary = d->attributes[d->key[field]];
- Q_ASSERT(ary.elementType() == QCustomDataArray::Vector3D);
- float *data = ary.m_array.data();
- QVector3D *v = reinterpret_cast<QVector3D*>(data + i*2);
- return *v;
-}
-
-/*!
- Returns a copy of the \a field attribute data.
-*/
-QCustomDataArray QGeometryData::attributes(QGL::VertexAttribute field) const
-{
- return hasField(field) ? d->attributes.at(d->key[field]) : QCustomDataArray();
-}
-
-/*!
- Returns a copy of the float \a field attribute data at index \a i.
-*/
-float QGeometryData::floatAttributeAt(int i, QGL::VertexAttribute field) const
-{
- Q_ASSERT(hasField(field));
- return d->attributes.at(d->key[field]).floatAt(i);
-}
-
-/*!
- Returns a copy of the 2D vector \a field attribute data at index \a i.
-*/
-QVector2D QGeometryData::vector2DAttributeAt(int i, QGL::VertexAttribute field) const
-{
- Q_ASSERT(hasField(field));
- return d->attributes.at(d->key[field]).vector2DAt(i);
-}
-
-/*!
- Returns a copy of the 3D vector \a field attribute data at index \a i.
-*/
-QVector3D QGeometryData::vector3DAttributeAt(int i, QGL::VertexAttribute field) const
-{
- Q_ASSERT(hasField(field));
- return d->attributes.at(d->key[field]).vector3DAt(i);
-}
-
-/*!
- Returns the attribute value for the \a field, suitable for passing
- to QGLPainter.
-
- \sa QGLPainter::setVertexAttribute()
-*/
-QGLAttributeValue QGeometryData::attributeValue(QGL::VertexAttribute field) const
-{
- if (hasField(field))
- {
- if (field < QGL::TextureCoord0)
- {
- if (field == QGL::Position)
- return QGLAttributeValue(d->vertices);
- else if (field == QGL::Normal)
- return QGLAttributeValue(d->normals);
- else if (field == QGL::Color)
- return QGLAttributeValue(d->colors);
- }
- else
- {
- if (field < QGL::CustomVertex0)
- return QGLAttributeValue(d->textures.at(d->key[field]));
- else
- return QGLAttributeValue(d->attributes.at(d->key[field]));
- }
- }
- return QGLAttributeValue();
-}
-
-/*!
- Returns true if this geometry has the field corresponding to \a attr. Note
- that it is still possible for no data to have been added for that field.
-*/
-bool QGeometryData::hasField(QGL::VertexAttribute attr) const
-{
- if (d)
- return d->key[attr] != -1;
- return false;
-}
-
-/*!
- Enables this geometry to contain data of type \a field. Generally it is
- not necessary to call this function since it is called by all the append
- functions.
-*/
-void QGeometryData::enableField(QGL::VertexAttribute field)
-{
- if (d && d->key[field] != -1)
- return;
- create();
- d->modified = true;
- Q_ASSERT(field < d->ATTR_CNT); // don't expand that enum too much
- d->fields |= (1 << field);
- switch (field)
- {
- case QGL::Position:
- d->key[QGL::Position] = 0;
- d->size[QGL::Position] = 3;
- if (d->reserved > 0)
- d->vertices.reserve(d->reserved);
- break;
- case QGL::Normal:
- d->key[QGL::Normal] = 1;
- d->size[QGL::Normal] = 3;
- if (d->reserved > 0)
- d->normals.reserve(d->reserved);
- break;
- case QGL::Color:
- d->key[QGL::Color] = 2;
- d->size[QGL::Color] = 1;
- if (d->reserved > 0)
- d->colors.reserve(d->reserved);
- break;
- case QGL::TextureCoord0:
- case QGL::TextureCoord1:
- case QGL::TextureCoord2:
- d->textures.append(QVector2DArray());
- d->key[field] = d->textures.count() - 1;
- d->size[field] = 2;
- if (d->reserved > 0)
- d->textures[d->key[field]].reserve(d->reserved);
- break;
- default:
- // Custom and User vertex attributes.
- d->attributes.append(QCustomDataArray());
- d->key[field] = d->attributes.count() - 1;
- d->size[field] = d->attributes.at(d->key[field]).elementSize();
- if (d->reserved > 0)
- d->attributes[d->key[field]].reserve(d->reserved);
- break;
- }
-}
-
-/*!
- Return a bit-mask of the supported fields in this geometry. The
- QGL::VertexAttribute enum can be recovered from this bit-mask by
- \code
- quint32 fields = fields();
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(fields);
- \endcode
-*/
-quint32 QGeometryData::fields() const
-{
- if (d)
- return d->fields;
- return 0;
-}
-
-/*!
- Returns the count of logical vertices stored. This is effectively
- the max() of QArray::count() over all of the enabled data types.
-*/
-int QGeometryData::count() const
-{
- if (d)
- return d->count;
- return 0;
-}
-
-/*!
- Returns the count of data stored in \a field. This will always be at
- most count(), but could be less.
-*/
-int QGeometryData::count(QGL::VertexAttribute field) const
-{
- int result = 0;
- if (d && (QGL::fieldMask(field) & d->fields))
- {
- if (field < QGL::TextureCoord0)
- {
- if (field == QGL::Position)
- result = d->vertices.count();
- else if (field == QGL::Normal)
- result = d->normals.count();
- else
- result = d->colors.count();
- }
- else if (field < QGL::CustomVertex0)
- {
- result = d->textures[d->key[field]].count();
- }
- else
- {
- result = d->attributes[d->key[field]].count();
- }
- }
- return result;
-}
-
-/*!
- Returns true if this geometry is identical to the \a other; and false otherwise.
-*/
-bool QGeometryData::operator==(const QGeometryData &other) const
-{
- bool isEqual = false;
- if (d)
- {
- if (d == other.d)
- {
- isEqual = true;
- }
- else
- {
- if (other.d && d->fields == other.d->fields && d->count == other.d->count)
- {
- const quint32 mask = 0x01;
- quint32 fields = d->fields;
- isEqual = true;
- for (int field = 0; fields && isEqual; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- isEqual = (d->vertices == other.d->vertices);
- else if (attr == QGL::Normal)
- isEqual = (d->normals == other.d->normals);
- else // colors
- isEqual = (d->colors == other.d->colors);
- }
- else if (attr < QGL::CustomVertex0)
- {
- isEqual = (d->textures.at(d->key[attr]) == other.d->textures.at(d->key[attr]));
- }
- else
- {
- QArray<float> me = d->attributes.at(d->key[attr]).toFloatArray();
- QArray<float> him = other.d->attributes.at(d->key[attr]).toFloatArray();
- isEqual = (me == him);
- }
- }
- }
- }
- }
- }
- else
- {
- isEqual = other.isNull();
- }
- return isEqual;
-}
-
-/*!
- Returns true if this geometry is empty - that is it contains no vertices
- or other data - and returns false otherwise. If an existing geometry has
- been made empty by a call to clear() then this will be true (but isNull()
- will be false).
-
- \sa isNull()
-*/
-bool QGeometryData::isEmpty() const
-{
- bool empty = true;
- if (d)
- empty = d->count == 0;
- return empty;
-}
-
-/*!
- Returns true if this geometry is uninitialized - that is it contains no
- internal data structures. A newly constructed QGeometryData object is
- null until some data is added or changed.
-
- \sa isEmpty()
-*/
-bool QGeometryData::isNull() const
-{
- return d == NULL;
-}
-
-/*!
- Returns the number of index values stored in this geometry data.
-
- This value is exactly the same as indices().size() (but does not
- incur the copy).
-*/
-int QGeometryData::indexCount() const
-{
- if (d)
- return d->indices.size();
- return 0;
-}
-
-void QGeometryData::create()
-{
- if (!d) // lazy creation of data block
- {
- d = new QGeometryDataPrivate;
- d->ref.ref();
- }
-}
-
-/*!
- Force this geometry to ensure it has its own unshared internal data
- block, making a copy in the case that it is currently shared.
-*/
-void QGeometryData::detach()
-{
- create();
- if (d->ref > 1) // being shared, must detach
- {
- QGeometryDataPrivate *temp = d->clone();
- d->ref.deref();
- d = temp;
- d->ref.ref();
- }
-}
-
-/*!
- \fn quint64 QGeometryData::id() const
- Return an opaque value that can be used to identify which data block is
- being used by this QGeometryData instance. See the class documentation
- relating to explicit sharing.
-*/
-
-#ifndef QT_NO_DEBUG
-void QGeometryData::check() const
-{
- if (!d)
- return;
- const quint32 mask = 0x01;
- quint32 fields = d->fields;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- {
- if (d->vertices.count() < d->count)
- qWarning("QGeometryData - expected %d vertices, only %d found!",
- d->count, d->vertices.count());
- }
- else if (attr == QGL::Normal)
- {
- if (d->normals.count() < d->count)
- qWarning("QGeometryData - expected %d normals, only %d found!",
- d->count, d->normals.count());
- }
- else
- {
- if (d->colors.count() < d->count)
- qWarning("QGeometryData - expected %d colors, only %d found!",
- d->count, d->colors.count());
- }
- }
- else if (attr < QGL::CustomVertex0)
- {
- if (d->textures.at(d->key[field]).count() < d->count)
- qWarning("QGeometryData - expected %d texture coordinates for"
- "QGL::TextureCoord%d, only %d found!",
- d->count, field - QGL::TextureCoord0, d->textures.at(d->key[field]).count());
- }
- else
- {
- if (d->attributes.at(d->key[field]).count() < d->count)
- qWarning("QGeometryData - expected %d attributes for"
- "QGL::CustomVertex%d, only %d found!",
- d->count, field - QGL::CustomVertex0, d->attributes.at(d->key[field]).count());
- }
- }
- }
-}
-#endif
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGeometryData &vertices)
-{
- dbg << "QGeometryData" << &vertices << " size:" << vertices.count()
-#ifndef QT_NO_DEBUG
- << "data block id:" << vertices.id()
-#endif
- ;
- quint32 fields = vertices.fields();
- const quint32 mask = 0x01;
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- {
- dbg << " vertices:" << vertices.count(attr);
- dbg << vertices.vertices();
- }
- else if (attr == QGL::Normal)
- {
- dbg << " normals:" << vertices.count(attr);
- dbg << vertices.normals();
- }
- else
- {
- dbg << " colors:" << vertices.count(attr);
- dbg << vertices.colors();
- }
- }
- else if (attr < QGL::CustomVertex0)
- {
- dbg << " textures:" << (attr - QGL::TextureCoord0) << vertices.count(attr);
- dbg << vertices.texCoords(attr);
- }
- else
- {
- dbg << " custom:" << (attr - QGL::CustomVertex0) << vertices.count(attr);
- dbg << vertices.texCoords(attr);
- }
- }
- }
- if (vertices.indexCount() > 0)
- {
- dbg << " indices:" << vertices.indices();
- }
- return dbg;
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qgeometrydata.h b/src/gui/extern/Qt3D/geometry/qgeometrydata.h
deleted file mode 100644
index 7ef6f2d0a7f9058c43c45c092f3699a140eff516..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qgeometrydata.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGEOMETRYDATA_H
-#define QGEOMETRYDATA_H
-
-#include "qcolor4ub.h"
-#include "qglnamespace.h"
-#include "qglindexbuffer.h"
-#include "qglvertexbundle.h"
-#include "qglattributevalue.h"
-#include "qcustomdataarray.h"
-#include "qbox3d.h"
-#include "qarray.h"
-#include "qvector2darray.h"
-#include "qvector3darray.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGeometryDataPrivate;
-class QLogicalVertex;
-class QGLPainter;
-
-namespace QGL
-{
- inline quint32 fieldMask(QGL::VertexAttribute f) { return (quint32)0x01 << f; }
-
-#if defined(QT_OPENGL_ES)
- typedef QArray<ushort> IndexArray;
-#else
- typedef QArray<uint> IndexArray;
-#endif
-};
-
-class Q_QT3D_EXPORT QGeometryData
-{
-public:
- QGeometryData();
- QGeometryData(const QGeometryData &);
- QGeometryData(quint32 fields);
- ~QGeometryData();
-
- QGeometryData &operator=(const QGeometryData &);
-
- void appendGeometry(const QGeometryData &data);
- int appendVertex(const QLogicalVertex &v);
- void normalizeNormals();
- QBox3D boundingBox() const;
- QVector3D center() const;
-
- QGeometryData reversed() const;
- QGeometryData translated(const QVector3D &) const;
- void generateTextureCoordinates(Qt::Orientation orientation = Qt::Horizontal,
- QGL::VertexAttribute attribute = QGL::TextureCoord0);
- QGeometryData interleavedWith(const QGeometryData &other) const;
- void interleaveWith(const QGeometryData &other);
- void clear();
- void clear(QGL::VertexAttribute);
- void reserve(int amount);
- void draw(QGLPainter *painter, int start, int count, GLenum mode = QGL::Triangles, qreal drawWidth=1.0);
- bool upload();
- enum BufferStrategyFlags
- {
- InvalidStrategy = 0x00,
- KeepClientData = 0x01,
- BufferIfPossible = 0x02,
- };
- Q_DECLARE_FLAGS(BufferStrategy, BufferStrategyFlags)
- void setBufferStrategy(BufferStrategy strategy);
- BufferStrategy bufferStrategy() const;
- QGLVertexBundle vertexBundle() const;
- QGLIndexBuffer indexBuffer() const;
-
- void appendIndex(int index);
- void appendIndices(int index1, int index2, int index3);
- void appendIndices(const QGL::IndexArray &indices);
- QGL::IndexArray indices() const;
-
- void appendVertex(const QVector3D &v0);
- void appendVertex(const QVector3D &v0, const QVector3D &v1);
- void appendVertex(const QVector3D &v0, const QVector3D &v1, const QVector3D &v2);
- void appendVertex(const QVector3D &v0, const QVector3D &v1, const QVector3D &v2, const QVector3D &v3);
-
- void appendAttribute(float a, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(float a, float b, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(float a, float b, float c, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(float a, float b, float c, float d, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(const QVector2D &a, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(const QVector3D &a, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendAttribute(const QVariant &a, QGL::VertexAttribute field = QGL::CustomVertex0);
-
- void appendNormal(const QVector3D &n0);
- void appendNormal(const QVector3D &n0, const QVector3D &n1);
- void appendNormal(const QVector3D &n0, const QVector3D &n1, const QVector3D &n2);
- void appendNormal(const QVector3D &n0, const QVector3D &n1, const QVector3D &n2, const QVector3D &n3);
-
- void appendTexCoord(const QVector2D &t0, QGL::VertexAttribute field = QGL::TextureCoord0);
- void appendTexCoord(const QVector2D &t0, const QVector2D &t1, QGL::VertexAttribute field = QGL::TextureCoord0);
- void appendTexCoord(const QVector2D &t0, const QVector2D &t1, const QVector2D &t2, QGL::VertexAttribute field = QGL::TextureCoord0);
- void appendTexCoord(const QVector2D &t0, const QVector2D &t1, const QVector2D &t2, const QVector2D &t3, QGL::VertexAttribute field = QGL::TextureCoord0);
-
- void appendColor(const QColor4ub &c0);
- void appendColor(const QColor4ub &c0, const QColor4ub &c1);
- void appendColor(const QColor4ub &c0, const QColor4ub &c1, const QColor4ub &c2);
- void appendColor(const QColor4ub &c0, const QColor4ub &c1, const QColor4ub &c2, const QColor4ub &c3);
-
- void appendVertexArray(const QVector3DArray &ary);
- void appendAttributeArray(const QCustomDataArray &ary, QGL::VertexAttribute field = QGL::CustomVertex0);
- void appendNormalArray(const QVector3DArray &ary);
- void appendTexCoordArray(const QVector2DArray &ary, QGL::VertexAttribute field = QGL::TextureCoord0);
- void appendColorArray(const QArray<QColor4ub> &ary);
-
- QLogicalVertex logicalVertexAt(int i) const;
-
- QVector3DArray vertices() const;
- QVector3D &vertex(int i);
- const QVector3D &vertexAt(int i) const;
-
- QVector3DArray normals() const;
- QVector3D &normal(int i);
- const QVector3D &normalAt(int i) const;
-
- QArray<QColor4ub> colors() const;
- QColor4ub &color(int i);
- const QColor4ub &colorAt(int i) const;
-
- QVector2DArray texCoords(QGL::VertexAttribute field = QGL::TextureCoord0) const;
- QVector2D &texCoord(int i, QGL::VertexAttribute field = QGL::TextureCoord0);
- const QVector2D &texCoordAt(int i, QGL::VertexAttribute field = QGL::TextureCoord0) const;
-
- float &floatAttribute(int i, QGL::VertexAttribute field = QGL::CustomVertex0);
- QVector2D &vector2DAttribute(int i, QGL::VertexAttribute field = QGL::CustomVertex0);
- QVector3D &vector3DAttribute(int i, QGL::VertexAttribute field = QGL::CustomVertex0);
- QCustomDataArray attributes(QGL::VertexAttribute field = QGL::CustomVertex0) const;
- float floatAttributeAt(int i, QGL::VertexAttribute field = QGL::CustomVertex0) const;
- QVector2D vector2DAttributeAt(int i, QGL::VertexAttribute field = QGL::CustomVertex0) const;
- QVector3D vector3DAttributeAt(int i, QGL::VertexAttribute field = QGL::CustomVertex0) const;
-
- QGLAttributeValue attributeValue(QGL::VertexAttribute field) const;
- bool hasField(QGL::VertexAttribute field) const;
- void enableField(QGL::VertexAttribute field);
- quint32 fields() const;
- int count() const;
- int count(QGL::VertexAttribute field) const;
- int indexCount() const;
- bool operator==(const QGeometryData &other) const;
- bool isEmpty() const;
- bool isNull() const;
- void detach();
-#ifndef QT_NO_DEBUG
- quint64 id() const { return (quint64)d; }
-#endif
-protected:
- const QVector3DArray *vertexData() const;
-private:
- void create();
-#ifndef QT_NO_DEBUG
- void check() const;
-#else
- void check() const {}
-#endif
- friend class QLogicalVertex;
-
- QGeometryDataPrivate *d;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGeometryData::BufferStrategy);
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGeometryData &vertices);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QGEOMETRYDATA_H
diff --git a/src/gui/extern/Qt3D/geometry/qglbezierpatches.cpp b/src/gui/extern/Qt3D/geometry/qglbezierpatches.cpp
deleted file mode 100644
index 7339d19c35a745c64741e53f68505521b887b3a8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglbezierpatches.cpp
+++ /dev/null
@@ -1,815 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglbezierpatches.h"
-#include "qglbuilder.h"
-#include "qray3d.h"
-#include "qtriangle3d.h"
-#include <QtCore/qnumeric.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLBezierPatches
- \brief The QGLBezierPatches class represents 3D geometry as a set of Bezier bicubic patches.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- Bezier bicubic patches represent a curved 3D surface by four fixed
- control points at indices 0, 3, 12, and 15, together with twelve
- additional floating control points that define the surface
- curvature. Bezier geometry objects are made up of one or more
- such patches to define the surface of an object.
-
- The application specifies the vertex position data to the
- constructor, and can optionally provide an index array.
- The class interprets groups of 16 vertices as the control
- points for successive patches.
-
- A mesh defined by QGLBezierPatches is subdivided into flat
- triangles for rendering when the \c{<<} operator is used
- to add the patches to a QGLBuilder.
-
- Many curved 3D objects can be defined as being made up of Bezier
- bicubic patches, stitched together into a mesh. The most famous
- Bezier bicubic object is probably the classic 3D "Utah Teapot",
- first rendered in 1975. The QGLTeapot class provides a built-in
- implementation of this object for testing purposes.
-
- If texture co-ordinates are supplied via setTextureCoords(),
- then patch texture co-ordinates will be derived from the
- specified values as the patches are subdivided. Otherwise,
- QGLBezierPatches will generate texture co-ordinates for each
- patch based on the default square from (0, 0) to (1, 1).
- The first vertex in the patch corresponds to (0, 0),
- and the opposite vertex in the patch corresponds to (1, 1).
-
- \sa QGLBuilder, QGLTeapot
-*/
-
-class QGLBezierPatchesPrivate
-{
-public:
- QGLBezierPatchesPrivate()
- : subdivisionDepth(4) {}
- QGLBezierPatchesPrivate(const QGLBezierPatchesPrivate *other)
- : positions(other->positions)
- , textureCoords(other->textureCoords)
- , subdivisionDepth(other->subdivisionDepth) {}
-
- void copy(const QGLBezierPatchesPrivate *other)
- {
- positions = other->positions;
- textureCoords = other->textureCoords;
- subdivisionDepth = other->subdivisionDepth;
- }
-
- void subdivide(QGLBuilder *list) const;
- qreal intersection
- (const QRay3D &ray, bool anyIntersection, QVector2D *texCoord, int *patch) const;
-
- QVector3DArray positions;
- QVector2DArray textureCoords;
- int subdivisionDepth;
-};
-
-// Temporary patch data for performing sub-divisions.
-class QGLBezierPatch
-{
-public:
- // Control points for this mesh.
- QVector3D points[16];
-
- // Triangle mesh indices of the control points at each corner.
- int indices[4];
-
- QVector3D normal(qreal s, qreal t) const;
- void convertToTriangles
- (QGeometryData *prim,
- qreal xtex, qreal ytex, qreal wtex, qreal htex);
- void subDivide(QGLBezierPatch &patch1, QGLBezierPatch &patch2,
- QGLBezierPatch &patch3, QGLBezierPatch &patch4);
- void createNewCorners(QGLBezierPatch &patch1, QGLBezierPatch &patch2,
- QGLBezierPatch &patch3, QGLBezierPatch &patch4,
- QGeometryData *prim,
- qreal xtex, qreal ytex, qreal wtex, qreal htex);
- void recursiveSubDivide
- (QGeometryData *prim,
- int depth, qreal xtex, qreal ytex, qreal wtex, qreal htex);
- qreal intersection
- (qreal result, int depth, const QRay3D &ray, bool anyIntersection,
- qreal xtex, qreal ytex, qreal wtex, qreal htex, QVector2D *tc);
-};
-
-static int const cornerOffsets[] = {0, 3, 12, 15};
-static qreal const cornerS[] = {0.0f, 1.0f, 0.0f, 1.0f};
-static qreal const cornerT[] = {0.0f, 0.0f, 1.0f, 1.0f};
-
-// Helper functions for calculating the components of the Bernstein
-// polynomial and its derivative that make up the surface.
-static inline qreal b0(qreal v)
-{
- return (1.0f - v) * (1.0f - v) * (1.0f - v);
-}
-static inline qreal b1(qreal v)
-{
- return 3.0f * v * (1.0f - v) * (1.0f - v);
-}
-static inline qreal b2(qreal v)
-{
- return 2.0f * v * v * (1.0f - v);
-}
-static inline qreal b3(qreal v)
-{
- return v * v * v;
-}
-static inline qreal db0(qreal v)
-{
- return -3.0f * (1.0f - v) * (1.0f - v);
-}
-static inline qreal db1(qreal v)
-{
- return -6.0f * v * (1.0f - v) + 3.0f * (1.0f - v) * (1.0f - v);
-}
-static inline qreal db2(qreal v)
-{
- return -3.0f * v * v + 6.0f * v * (1.0f - v);
-}
-static inline qreal db3(qreal v)
-{
- return 3.0f * v * v;
-}
-
-// Compute the normal at a specific point in the patch.
-// The s and t values vary between 0 and 1.
-QVector3D QGLBezierPatch::normal(qreal s, qreal t) const
-{
- qreal a[4];
- qreal b[4];
- qreal tx, ty, tz;
- qreal sx, sy, sz;
-
- // Compute the derivative of the surface in t.
- a[0] = b0(s);
- a[1] = b1(s);
- a[2] = b2(s);
- a[3] = b3(s);
- b[0] = db0(t);
- b[1] = db1(t);
- b[2] = db2(t);
- b[3] = db3(t);
- tx = 0.0f;
- ty = 0.0f;
- tz = 0.0f;
- for (int i = 0; i < 4; ++i) {
- for (int j = 0; j < 4; ++j) {
- tx += a[i] * points[j * 4 + i].x() * b[j];
- ty += a[i] * points[j * 4 + i].y() * b[j];
- tz += a[i] * points[j * 4 + i].z() * b[j];
- }
- }
-
- // Compute the derivative of the surface in s.
- a[0] = db0(s);
- a[1] = db1(s);
- a[2] = db2(s);
- a[3] = db3(s);
- b[0] = b0(t);
- b[1] = b1(t);
- b[2] = b2(t);
- b[3] = b3(t);
- sx = 0.0f;
- sy = 0.0f;
- sz = 0.0f;
- for (int i = 0; i < 4; ++i) {
- for (int j = 0; j < 4; ++j) {
- sx += a[i] * points[j * 4 + i].x() * b[j];
- sy += a[i] * points[j * 4 + i].y() * b[j];
- sz += a[i] * points[j * 4 + i].z() * b[j];
- }
- }
-
- // The normal is the cross-product of the two derivatives,
- // normalized to a unit vector.
- QVector3D n = QVector3D::normal(QVector3D(sx, sy, sz), QVector3D(tx, ty, tz));
- if (n.isNull()) {
- // A zero normal may occur if one of the patch edges is zero-length.
- // We correct for this by substituting an overall patch normal that
- // we compute from two of the sides that are not zero in length.
- QVector3D sides[4];
- QVector3D vectors[2];
- sides[0] = points[3] - points[0];
- sides[1] = points[15] - points[3];
- sides[2] = points[12] - points[15];
- sides[3] = points[0] - points[12];
- int i = 0;
- int j = 0;
- vectors[0] = QVector3D(1.0f, 0.0f, 0.0f);
- vectors[1] = QVector3D(0.0f, 1.0f, 0.0f);
- while (i < 2 && j < 4) {
- if (sides[j].isNull())
- ++j;
- else
- vectors[i++] = sides[j++];
- }
- n = QVector3D::normal(vectors[0], vectors[1]);
- }
- return n;
-}
-
-// Convert this patch into flat triangles.
-void QGLBezierPatch::convertToTriangles
- (QGeometryData *prim,
- qreal xtex, qreal ytex, qreal wtex, qreal htex)
-{
- // The edges are considered ok if they have a non-zero length.
- // Zero-length edges can occur in triangular-shaped patches.
- // There is no point generating triangles along such edges.
- bool edge1ok = (points[0] != points[3]);
- bool edge2ok = (points[0] != points[12]);
- bool edge3ok = (points[12] != points[15]);
- bool edge4ok = (points[15] != points[3]);
-
- // Find the mid-point on the patch by averaging the corners.
- QVector3D mid = (points[0] + points[3] + points[12] + points[15]) / 4.0f;
-
- // Allocate a triangle mesh vertex for the mid-point.
- int midIndex = prim->count();
- prim->appendVertex(mid);
- prim->appendNormal(normal(0.5f, 0.5f));
- prim->appendTexCoord
- (QVector2D(xtex + wtex / 2.0f, ytex + htex / 2.0f));
-
- // Divide the patch into 4 triangles pointing at the center.
- if (edge1ok)
- prim->appendIndices(indices[0], indices[1], midIndex);
- if (edge2ok)
- prim->appendIndices(indices[2], indices[0], midIndex);
- if (edge3ok)
- prim->appendIndices(indices[3], indices[2], midIndex);
- if (edge4ok)
- prim->appendIndices(indices[1], indices[3], midIndex);
-}
-
-// Sub-divide a Bezier curve (p1, p2, p3, p4) into two new
-// Bezier curves (l1, l2, l3, l4) and (r1, r2, r3, r4).
-static void subDivideBezierCurve
- (const QVector3D &p1, const QVector3D &p2,
- const QVector3D &p3, const QVector3D &p4,
- QVector3D &l1, QVector3D &l2, QVector3D &l3, QVector3D &l4,
- QVector3D &r1, QVector3D &r2, QVector3D &r3, QVector3D &r4)
-{
- l1 = p1;
- l2 = (p1 + p2) / 2.0f;
- QVector3D h = (p2 + p3) / 2.0f;
- l3 = (l2 + h) / 2.0f;
- r3 = (p3 + p4) / 2.0f;
- r2 = (h + r3) / 2.0f;
- l4 = r1 = (l3 + r2) / 2.0f;
- r4 = p4;
-}
-
-// Sub-divide this patch into four new patches. The triangle mesh
-// is used to allocate vertices for the corners of the new patches.
-void QGLBezierPatch::subDivide
- (QGLBezierPatch &patch1, QGLBezierPatch &patch2,
- QGLBezierPatch &patch3, QGLBezierPatch &patch4)
-{
- // Sub-divide the Bezier curves for the control rows to create
- // four rows of 8 control points. These define the left and
- // right halves of the patch.
- QVector3D row1[8];
- QVector3D row2[8];
- QVector3D row3[8];
- QVector3D row4[8];
- subDivideBezierCurve
- (points[0], points[1], points[2], points[3],
- row1[0], row1[1], row1[2], row1[3], row1[4], row1[5], row1[6], row1[7]);
- subDivideBezierCurve
- (points[4], points[5], points[6], points[7],
- row2[0], row2[1], row2[2], row2[3], row2[4], row2[5], row2[6], row2[7]);
- subDivideBezierCurve
- (points[8], points[9], points[10], points[11],
- row3[0], row3[1], row3[2], row3[3], row3[4], row3[5], row3[6], row3[7]);
- subDivideBezierCurve
- (points[12], points[13], points[14], points[15],
- row4[0], row4[1], row4[2], row4[3], row4[4], row4[5], row4[6], row4[7]);
-
- // Now sub-divide the 8 columns to create the four new patches.
- subDivideBezierCurve
- (row1[0], row2[0], row3[0], row4[0],
- patch1.points[0], patch1.points[4], patch1.points[8], patch1.points[12],
- patch3.points[0], patch3.points[4], patch3.points[8], patch3.points[12]);
- subDivideBezierCurve
- (row1[1], row2[1], row3[1], row4[1],
- patch1.points[1], patch1.points[5], patch1.points[9], patch1.points[13],
- patch3.points[1], patch3.points[5], patch3.points[9], patch3.points[13]);
- subDivideBezierCurve
- (row1[2], row2[2], row3[2], row4[2],
- patch1.points[2], patch1.points[6], patch1.points[10], patch1.points[14],
- patch3.points[2], patch3.points[6], patch3.points[10], patch3.points[14]);
- subDivideBezierCurve
- (row1[3], row2[3], row3[3], row4[3],
- patch1.points[3], patch1.points[7], patch1.points[11], patch1.points[15],
- patch3.points[3], patch3.points[7], patch3.points[11], patch3.points[15]);
- subDivideBezierCurve
- (row1[4], row2[4], row3[4], row4[4],
- patch2.points[0], patch2.points[4], patch2.points[8], patch2.points[12],
- patch4.points[0], patch4.points[4], patch4.points[8], patch4.points[12]);
- subDivideBezierCurve
- (row1[5], row2[5], row3[5], row4[5],
- patch2.points[1], patch2.points[5], patch2.points[9], patch2.points[13],
- patch4.points[1], patch4.points[5], patch4.points[9], patch4.points[13]);
- subDivideBezierCurve
- (row1[6], row2[6], row3[6], row4[6],
- patch2.points[2], patch2.points[6], patch2.points[10], patch2.points[14],
- patch4.points[2], patch4.points[6], patch4.points[10], patch4.points[14]);
- subDivideBezierCurve
- (row1[7], row2[7], row3[7], row4[7],
- patch2.points[3], patch2.points[7], patch2.points[11], patch2.points[15],
- patch4.points[3], patch4.points[7], patch4.points[11], patch4.points[15]);
-}
-
-void QGLBezierPatch::createNewCorners
- (QGLBezierPatch &patch1, QGLBezierPatch &patch2,
- QGLBezierPatch &patch3, QGLBezierPatch &patch4,
- QGeometryData *prim,
- qreal xtex, qreal ytex, qreal wtex, qreal htex)
-{
- // Add vertices for the new patch corners we have created.
- qreal hwtex = wtex / 2.0f;
- qreal hhtex = htex / 2.0f;
- int topPointIndex = prim->count();
- int leftPointIndex = topPointIndex + 1;
- int midPointIndex = topPointIndex + 2;
- int rightPointIndex = topPointIndex + 3;
- int bottomPointIndex = topPointIndex + 4;
-
- prim->appendVertex(patch1.points[3]);
- prim->appendNormal(normal(0.5f, 0.0f));
- prim->appendTexCoord(QVector2D(xtex + hwtex, ytex));
-
- prim->appendVertex(patch1.points[12]);
- prim->appendNormal(normal(0.0f, 0.5f));
- prim->appendTexCoord(QVector2D(xtex, ytex + hhtex));
-
- prim->appendVertex(patch1.points[15]);
- prim->appendNormal(normal(0.5f, 0.5f));
- prim->appendTexCoord(QVector2D(xtex + hwtex, ytex + hhtex));
-
- prim->appendVertex(patch2.points[15]);
- prim->appendNormal(normal(1.0f, 0.5f));
- prim->appendTexCoord(QVector2D(xtex + wtex, ytex + hhtex));
-
- prim->appendVertex(patch3.points[15]);
- prim->appendNormal(normal(0.5f, 1.0f));
- prim->appendTexCoord(QVector2D(xtex + hwtex, ytex + htex));
-
- // Copy the indices for the corners of the new patches.
- patch1.indices[0] = indices[0];
- patch1.indices[1] = topPointIndex;
- patch1.indices[2] = leftPointIndex;
- patch1.indices[3] = midPointIndex;
- patch2.indices[0] = topPointIndex;
- patch2.indices[1] = indices[1];
- patch2.indices[2] = midPointIndex;
- patch2.indices[3] = rightPointIndex;
- patch3.indices[0] = leftPointIndex;
- patch3.indices[1] = midPointIndex;
- patch3.indices[2] = indices[2];
- patch3.indices[3] = bottomPointIndex;
- patch4.indices[0] = midPointIndex;
- patch4.indices[1] = rightPointIndex;
- patch4.indices[2] = bottomPointIndex;
- patch4.indices[3] = indices[3];
-}
-
-// Recursively sub-divide a patch into triangles.
-void QGLBezierPatch::recursiveSubDivide
- (QGeometryData *prim,
- int depth, qreal xtex, qreal ytex, qreal wtex, qreal htex)
-{
- if (depth <= 1) {
- convertToTriangles(prim, xtex, ytex, wtex, htex);
- } else {
- QGLBezierPatch patch1, patch2, patch3, patch4;
- subDivide(patch1, patch2, patch3, patch4);
- createNewCorners(patch1, patch2, patch3, patch4, prim, xtex, ytex, wtex, htex);
- --depth;
- qreal hwtex = wtex / 2.0f;
- qreal hhtex = htex / 2.0f;
- patch1.recursiveSubDivide(prim, depth, xtex, ytex, hwtex, hhtex);
- patch2.recursiveSubDivide(prim, depth, xtex + hwtex, ytex, hwtex, hhtex);
- patch3.recursiveSubDivide(prim, depth, xtex, ytex + hhtex, hwtex, hhtex);
- patch4.recursiveSubDivide(prim, depth, xtex + hwtex, ytex + hhtex, hwtex, hhtex);
- }
-}
-
-void QGLBezierPatchesPrivate::subdivide(QGLBuilder *list) const
-{
- QGeometryData prim;
- int count = positions.size();
- for (int posn = 0; (posn + 15) < count; posn += 16) {
- // Construct a QGLBezierPatch object from the next high-level patch.
- QGLBezierPatch patch;
- int vertex;
- for (int vertex = 0; vertex < 16; ++vertex)
- patch.points[vertex] = positions[posn + vertex];
- QVector2D tex1, tex2;
- if (!textureCoords.isEmpty()) {
- tex1 = textureCoords[(posn / 16) * 2];
- tex2 = textureCoords[(posn / 16) * 2 + 1];
- } else {
- tex1 = QVector2D(0.0f, 0.0f);
- tex2 = QVector2D(1.0f, 1.0f);
- }
- qreal xtex = tex1.x();
- qreal ytex = tex1.y();
- qreal wtex = tex2.x() - xtex;
- qreal htex = tex2.y() - ytex;
- for (int corner = 0; corner < 4; ++corner) {
- vertex = posn + cornerOffsets[corner];
- QVector3D n = patch.normal(cornerS[corner], cornerT[corner]);
- patch.indices[corner] = prim.count();
- prim.appendVertex(patch.points[cornerOffsets[corner]]);
- prim.appendNormal(n);
- prim.appendTexCoord
- (QVector2D(xtex + wtex * cornerS[corner],
- ytex + htex * cornerT[corner]));
- }
-
- // Subdivide the patch and generate the final triangles.
- patch.recursiveSubDivide(&prim, subdivisionDepth,
- xtex, ytex, wtex, htex);
- }
- list->addTriangles(prim);
-}
-
-static inline qreal combineResults(qreal result, qreal t)
-{
- if (qIsNaN(result))
- return t;
- if (t >= 0.0f)
- return result < 0.0f ? t : qMin(result, t);
- else
- return result >= 0.0f ? result : qMax(result, t);
-}
-
-qreal QGLBezierPatch::intersection
- (qreal result, int depth, const QRay3D& ray, bool anyIntersection,
- qreal xtex, qreal ytex, qreal wtex, qreal htex, QVector2D *tc)
-{
- // Check the convex hull of the patch for an intersection.
- // If no intersection with the convex hull, then there is
- // no point subdividing this patch further.
- QBox3D box;
- for (int point = 0; point < 16; ++point)
- box.unite(points[point]);
- if (!box.intersects(ray))
- return result;
-
- // Are we at the lowest point of subdivision yet?
- if (depth <= 1) {
- // Divide the patch into two triangles and intersect with those.
- QTriangle3D triangle1(points[0], points[3], points[12]);
- qreal t = triangle1.intersection(ray);
- if (!qIsNaN(t)) {
- result = combineResults(result, t);
- if (result == t) {
- QVector2D uv = triangle1.uv(ray.point(t));
- QVector2D tp(xtex, ytex);
- QVector2D tq(xtex + wtex, ytex);
- QVector2D tr(xtex, ytex + htex);
- *tc = uv.x() * tp + uv.y() * tq + (1 - uv.x() - uv.y()) * tr;
- }
- } else {
- QTriangle3D triangle2(points[3], points[15], points[12]);
- qreal t = triangle2.intersection(ray);
- if (!qIsNaN(t)) {
- result = combineResults(result, t);
- if (result == t) {
- QVector2D uv = triangle2.uv(ray.point(t));
- QVector2D tp(xtex + wtex, ytex);
- QVector2D tq(xtex + wtex, ytex + htex);
- QVector2D tr(xtex, ytex + htex);
- *tc = uv.x() * tp + uv.y() * tq + (1 - uv.x() - uv.y()) * tr;
- }
- }
- }
- } else {
- // Subdivide the patch to find the point of intersection.
- QGLBezierPatch patch1, patch2, patch3, patch4;
- subDivide(patch1, patch2, patch3, patch4);
- --depth;
- qreal hwtex = wtex / 2.0f;
- qreal hhtex = htex / 2.0f;
- result = patch1.intersection
- (result, depth, ray, anyIntersection,
- xtex, ytex, hwtex, hhtex, tc);
- if (anyIntersection && !qIsNaN(result))
- return result;
- result = patch2.intersection
- (result, depth, ray, anyIntersection,
- xtex + hwtex, ytex, hwtex, hhtex, tc);
- if (anyIntersection && !qIsNaN(result))
- return result;
- result = patch3.intersection
- (result, depth, ray, anyIntersection,
- xtex, ytex + hhtex, hwtex, hhtex, tc);
- if (anyIntersection && !qIsNaN(result))
- return result;
- result = patch4.intersection
- (result, depth, ray, anyIntersection,
- xtex + hwtex, ytex + hhtex, hwtex, hhtex, tc);
- }
- return result;
-}
-
-qreal QGLBezierPatchesPrivate::intersection
- (const QRay3D &ray, bool anyIntersection, QVector2D *texCoord, int *bestPatch) const
-{
- int count = positions.size();
- qreal result = qSNaN();
- QVector2D tc;
- if (bestPatch)
- *bestPatch = -1;
- for (int posn = 0; (posn + 15) < count; posn += 16) {
- QGLBezierPatch patch;
- for (int vertex = 0; vertex < 16; ++vertex)
- patch.points[vertex] = positions[posn + vertex];
- QVector2D tex1, tex2;
- if (!textureCoords.isEmpty()) {
- tex1 = textureCoords[(posn / 16) * 2];
- tex2 = textureCoords[(posn / 16) * 2 + 1];
- } else {
- tex1 = QVector2D(0.0f, 0.0f);
- tex2 = QVector2D(1.0f, 1.0f);
- }
- qreal xtex = tex1.x();
- qreal ytex = tex1.y();
- qreal wtex = tex2.x() - xtex;
- qreal htex = tex2.y() - ytex;
- qreal prev = result;
- result = patch.intersection
- (result, subdivisionDepth, ray, anyIntersection,
- xtex, ytex, wtex, htex, &tc);
- if (bestPatch && result != prev)
- *bestPatch = posn / 16;
- if (anyIntersection && !qIsNaN(result))
- break;
- }
- if (texCoord && !qIsNaN(result))
- *texCoord = tc;
- return result;
-}
-
-/*!
- Constructs an empty Bezier patch list.
-
- \sa setPositions()
-*/
-QGLBezierPatches::QGLBezierPatches()
- : d_ptr(new QGLBezierPatchesPrivate())
-{
-}
-
-/*!
- Constructs a copy of \a other.
-
- \sa operator=()
-*/
-QGLBezierPatches::QGLBezierPatches(const QGLBezierPatches &other)
- : d_ptr(new QGLBezierPatchesPrivate(other.d_ptr.data()))
-{
-}
-
-/*!
- Destroys this Bezier patch list.
-*/
-QGLBezierPatches::~QGLBezierPatches()
-{
-}
-
-/*!
- Assigns \a other to this Bezier patch list.
-*/
-QGLBezierPatches &QGLBezierPatches::operator=
- (const QGLBezierPatches &other)
-{
- if (this != &other)
- d_ptr->copy(other.d_ptr.data());
- return *this;
-}
-
-/*!
- Returns the positions of the vertices in the Bezier patches.
-
- \sa setPositions(), textureCoords()
-*/
-QVector3DArray QGLBezierPatches::positions() const
-{
- Q_D(const QGLBezierPatches);
- return d->positions;
-}
-
-/*!
- Sets the \a positions of the vertices in the Bezier patches.
-
- \sa positions(), setTextureCoords()
-*/
-void QGLBezierPatches::setPositions(const QVector3DArray &positions)
-{
- Q_D(QGLBezierPatches);
- d->positions = positions;
-}
-
-/*!
- Returns the texture co-ordinates for the Bezier patches.
- Each patch consumes two elements from the texture
- co-ordinate array, defining the opposite corners.
-
- The default is an empty array, which indicates that each
- patch will generate texture co-ordinates in the range
- (0, 0) to (1, 1).
-
- \sa setTextureCoords(), positions()
-*/
-QVector2DArray QGLBezierPatches::textureCoords() const
-{
- Q_D(const QGLBezierPatches);
- return d->textureCoords;
-}
-
-/*!
- Sets the texture co-ordinates for the Bezier patches to
- the elements of \a textureCoords. Each patch consumes
- two elements from \a textureCoords, defining the opposite
- corners.
-
- If \a textureCoords is empty, then each patch will generate
- texture co-ordinates in the range (0, 0) to (1, 1).
-
- \sa textureCoords(), setPositions()
-*/
-void QGLBezierPatches::setTextureCoords(const QVector2DArray &textureCoords)
-{
- Q_D(QGLBezierPatches);
- d->textureCoords = textureCoords;
-}
-
-/*!
- Returns the depth of subdivision to use when converting the
- Bezier geometry into triangles. The default value is 4.
-
- \sa setSubdivisionDepth()
-*/
-int QGLBezierPatches::subdivisionDepth() const
-{
- Q_D(const QGLBezierPatches);
- return d->subdivisionDepth;
-}
-
-/*!
- Sets the depth of subdivision to use when converting the
- Bezier geometry into triangles to \a value.
-
- \sa subdivisionDepth()
-*/
-void QGLBezierPatches::setSubdivisionDepth(int value)
-{
- Q_D(QGLBezierPatches);
- d->subdivisionDepth = value;
-}
-
-/*!
- Transforms the positions() in this Bezier geometry object
- according to \a matrix.
-
- \sa transformed()
-*/
-void QGLBezierPatches::transform(const QMatrix4x4 &matrix)
-{
- Q_D(QGLBezierPatches);
- d->positions.transform(matrix);
-}
-
-/*!
- Returns a new Bezier geometry object that results from transforming
- this object's positions() according to \a matrix.
-
- \sa transform()
-*/
-QGLBezierPatches QGLBezierPatches::transformed(const QMatrix4x4 &matrix) const
-{
- QGLBezierPatches result(*this);
- result.d_ptr->positions.transform(matrix);
- return result;
-}
-
-/*!
- Returns true if \a ray intersects this Bezier geometry object;
- false otherwise.
-
- \sa intersection()
-*/
-bool QGLBezierPatches::intersects(const QRay3D &ray) const
-{
- Q_D(const QGLBezierPatches);
- return !qIsNaN(d->intersection(ray, true, 0, 0));
-}
-
-/*!
- Returns the t value at which \a ray intersects this Bezier
- geometry object, or not-a-number if there is no intersection.
-
- When the \a ray intersects this object, the return value is a
- parametric value that can be passed to QRay3D::point() to determine
- the actual intersection point, as shown in the following example:
-
- \code
- qreal t = patches.intersection(ray);
- QVector3D pt;
- if (qIsNaN(t)) {
- qWarning("no intersection occurred");
- else
- pt = ray.point(t);
- \endcode
-
- If \a ray intersects the object multiple times, the returned
- t will be the smallest t value, corresponding to the first
- intersection of the \a ray with the object. The t value may
- be negative if the first intersection occurs in the reverse
- direction of \a ray.
-
- The intersection is determined by subdividing the patches into
- triangles and intersecting with those triangles. A pruning
- algorithm is used to discard patches whose convex hull do not
- intersect with \a ray.
-
- If \a texCoord is not null, then it will return the texture
- co-ordinate of the intersection point.
-
- If \a patch is not null, then it will return the index of the
- patch that contains the intersection, or -1 if there is no
- intersection.
-
- \sa intersects()
-*/
-qreal QGLBezierPatches::intersection(const QRay3D &ray, QVector2D *texCoord, int *patch) const
-{
- Q_D(const QGLBezierPatches);
- return d->intersection(ray, false, texCoord, patch);
-}
-
-/*!
- \relates QGLBezierPatches
-
- Subdivides the Bezier patch data in \a patches into triangles
- and adds them to the specified display \a list.
-*/
-QGLBuilder &operator<<(QGLBuilder &list, const QGLBezierPatches &patches)
-{
- patches.d_ptr->subdivide(&list);
- return list;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglbezierpatches.h b/src/gui/extern/Qt3D/geometry/qglbezierpatches.h
deleted file mode 100644
index 7dd127305c9ef341b8419cc05eb45b3463229a95..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglbezierpatches.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLBEZIERPATCHES_H
-#define QGLBEZIERPATCHES_H
-
-#include "qvector2darray.h"
-#include "qvector3darray.h"
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLBezierPatchesPrivate;
-class QGLBuilder;
-class QRay3D;
-
-class Q_QT3D_EXPORT QGLBezierPatches
-{
-public:
- QGLBezierPatches();
- QGLBezierPatches(const QGLBezierPatches &other);
- virtual ~QGLBezierPatches();
-
- QGLBezierPatches &operator=(const QGLBezierPatches &other);
-
- QVector3DArray positions() const;
- void setPositions(const QVector3DArray &positions);
-
- QVector2DArray textureCoords() const;
- void setTextureCoords(const QVector2DArray &textureCoords);
-
- int subdivisionDepth() const;
- void setSubdivisionDepth(int value);
-
- void transform(const QMatrix4x4 &matrix);
- QGLBezierPatches transformed(const QMatrix4x4 &matrix) const;
-
- bool intersects(const QRay3D &ray) const;
- qreal intersection(const QRay3D &ray, QVector2D *texCoord = 0, int *patch = 0) const;
-
-private:
- QScopedPointer<QGLBezierPatchesPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLBezierPatches)
-
- friend Q_QT3D_EXPORT QGLBuilder &operator<<(QGLBuilder &list, const QGLBezierPatches &patches);
-};
-
-Q_QT3D_EXPORT QGLBuilder &operator<<(QGLBuilder &list, const QGLBezierPatches &patches);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qglbuilder.cpp b/src/gui/extern/Qt3D/geometry/qglbuilder.cpp
deleted file mode 100644
index 98c6e01814b2f97220f1d71b7268f5c8141ca1cc..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglbuilder.cpp
+++ /dev/null
@@ -1,1382 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglbuilder.h"
-#include "qglbuilder_p.h"
-#include "qglsection_p.h"
-#include "qglmaterialcollection.h"
-#include "qglpainter.h"
-#include "qgeometrydata.h"
-#include "qvector_utils_p.h"
-
-#include <QtGui/qvector2d.h>
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLBuilder
- \brief The QGLBuilder class constructs geometry for efficient display.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- \tableofcontents
-
- Use a QGLBuilder to build up vertex, index, texture and other data
- during application initialization. The finalizedSceneNode() function
- returns an optimized scene which can be efficiently and flexibly
- displayed during frames of rendering. It is suited to writing loaders
- for 3D models, and for programatically creating geometry.
-
- \section1 Geometry Building
-
- QGLBuilder makes the job of getting triangles on the GPU simple. It
- calculates indices and normals for you, then uploads the data. While
- it has addQuads() and other functions to deal with quads, all data is
- represented as triangles for portability.
-
- The simplest way to use QGLBuilder is to send a set of geometry
- values to it using QGeometryData in the constructor:
-
- \code
- MyView::MyView() : QGLView()
- {
- // in the constructor construct a builder on the stack
- QGLBuilder builder;
- QGeometryData triangle;
- QVector3D a(2, 2, 0);
- QVector3D b(-2, 2, 0);
- QVector3D c(0, -2, 0);
- triangle.appendVertex(a, b, c);
-
- // When adding geometry, QGLBuilder automatically creates lighting normals
- builder << triangle;
-
- // obtain the scene from the builder
- m_scene = builder.finalizedSceneNode();
-
- // apply effects at app initialization time
- QGLMaterial *mat = new QGLMaterial;
- mat->setDiffuseColor(Qt::red);
- m_scene->setMaterial(mat);
- }
- \endcode
-
- Then during rendering the scene is used to display the results:
- \code
- MyView::paintGL(QGLPainter *painter)
- {
- m_scene->draw(painter);
- }
- \endcode
-
- QGLBuilder automatically generates index values and normals
- on-the-fly during geometry building. During building, simply send
- primitives to the builder as a sequence of vertices, and
- vertices that are the same will be referenced by a single index
- automatically.
-
- Primitives will have standard normals generated automatically
- based on vertex winding.
-
- Consider the following code for OpenGL to draw a quad with corner
- points A, B, C and D :
-
- \code
- float vertices[12] =
- {
- -1.0, -1.0, -1.0, // A
- 1.0, -1.0, -1.0, // B
- 1.0, 1.0, 1.0, // C
- -1.0, 1.0, 1.0 // D
- };
- float normals[12] = { 0.0f };
- for (int i = 0; i < 12; i += 3)
- {
- normals[i] = 0.0;
- normals[i+1] = -sqrt(2.0);
- normals[i+2] = sqrt(2.0);
- }
- GLuint indices[6] = {
- 0, 1, 2, // triangle A-B-C
- 0, 2, 3 // triangle A-C-D
- };
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_NORMAL_ARRAY);
- glVertexPointer(3, GL_FLOAT, 0, vertices);
- glNormalPointer(3, GL_FLOAT, 0, normals);
- glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, indices);
- \endcode
-
- With QGLBuilder this code becomes:
-
- \code
- float vertices[12] =
- {
- -1.0, -1.0, -1.0, // A
- 1.0, -1.0, -1.0, // B
- 1.0, 1.0, 1.0, // C
- -1.0, 1.0, 1.0 // D
- };
- QGLBuilder quad;
- QGeometryData data;
- data.appendVertexArray(QArray<QVector3D>::fromRawData(
- reinterpret_cast<const QVector3D*>(vertices), 4));
- quad.addQuads(data);
- \endcode
-
- The data primitive is added to the list, as two triangles, indexed to
- removed the redundant double storage of B & C - just the same as the
- OpenGL code.
-
- QGLBuilder will also calculate a normal for the quad and apply it
- to the vertices.
-
- In this trivial example the indices are easily calculated, however
- in more complex geometry it is easy to introduce bugs by trying
- to manually control indices. Extra work is required to generate,
- track and store the index values correctly.
-
- Bugs such as trying to index two vertices with different data -
- one with texture data and one without - into one triangle can
- easily result. The picture becomes more difficult when smoothing
- groups are introduced - see below.
-
- Using indices is always preferred since it saves space on the GPU,
- and makes the geometry perform faster during application run time.
-
- \section2 Removing Epsilon Errors
-
- Where vertices are generated by modelling packages or tools, or
- during computation in code, very frequently rounding errors will
- result in several vertices being generated that are actually
- the same vertex but are separated by tiny amounts. At best these
- duplications waste space on the GPU but at worst can introduce
- visual artifacts that mar the image displayed.
-
- Closing paths, generating solids of rotation, or moving model
- sections out and back can all introduce these types of epsilon
- errors, resulting in "cracks" or artifacts on display.
-
- QGLBuilder's index generation process uses a fuzzy match that
- coalesces all vertex values at a point - even if they are out by
- a tiny amount - and references them with a single index.
-
- \section2 Lighting Normals and Null Triangles
-
- QGLBuilder functions calculate lighting normals, when building
- geometry. This saves the application programmer from having to write
- code to calculate them. Normals for each triangle (a, b, c) are
- calculated as the QVector3D::normal(a, b, c).
-
- If lighting normals are explicitly supplied when using QGLBuilder,
- then this calculation is not done. This may save on build time.
-
- As an optimization, QGLBuilder skips null triangles, that is ones
- with zero area, where it can. Such triangles generate no fragments on
- the GPU, and thus do not display but nonetheless can take up space
- and processing power.
-
- Null triangles can easily occur when calculating vertices results
- in two vertices coinciding, or three vertices lying on the same line.
-
- This skipping is done using the lighting normals cross-product. If the
- cross-product is a null vector then the triangle is null.
-
- When lighting normals are specified explicitly the skipping
- optimization is suppressed, so if for some reason null triangles are
- required to be retained, then specify normals for each logical vertex.
-
- See the documentation below of the individual addTriangle() and other
- functions for more details.
-
- \section2 Raw Triangle Mode
-
- Where generation of indices and normals is not needed - for example if
- porting an existing application, it is possible to do a raw import of
- triangle data, without using any of QGLBuilder's processing.
-
- To do this ensure that indices are placed in the QGeometryData passed to
- the addTriangles() function, and this will trigger \bold{raw triangle} mode.
-
- When adding triangles in this way ensure that all appropriate values
- have been correctly set, and that the normals, indices and other data
- are correctly calculated, since no checking is done.
-
- When writing new applications, simply leave construction of normals and
- indices to the QGLBuilder
-
- \section1 Rendering and QGLSceneNode items.
-
- QGLSceneNodes are used to manage application of local transformations,
- materials and effects.
-
- QGLBuilder generates a root level QGLSceneNode, which can be accessed
- with the sceneNode() function. Under this a new node is created for
- each section of geometry, and also by using pushNode() and popNode().
-
- To organize geometry for painting with different materials and effects
- call the newNode() function:
-
- \code
- QGLSceneNode *box = builder.newNode();
- box->setMaterial(wood);
- \endcode
-
- Many nodes may be created this way, but they will be optimized into
- a small number of buffers under the one scene when the
- finalizedSceneNode() function is called.
-
- \image soup.png
-
- Here the front can is a set of built geometry and the other two are
- scene nodes that reference it, without copying any geometry.
-
- \snippet qt3d/builder/builder.cpp 0
-
- QGLSceneNodes can be used after the builder is created to cheaply
- copy and redisplay the whole scene. Or to reference parts of the geometry
- use the functions newNode() or pushNode() and popNode() to manage
- QGLSceneNode generation while building geometry.
-
- To draw the resulting built geometry simply call the draw method of the
- build geometry.
-
- \snippet qt3d/builder/builder.cpp 1
-
- Call the \l{QGLSceneNode::palette()}{palette()} function on the sceneNode()
- to get the QGLMaterialCollection for the node, and place textures
- and materials into it.
-
- Built geometry will typically share the one palette. Either create a
- palette, and pass it to the \l{QGLBuilder::QGLBuilder()}{constructor};
- or pass no arguments to the constructor and the QGLBuilder
- will create a palette:
-
- \snippet qt3d/builder/builder.cpp 2
-
- These may then be applied as needed throughout the building of the
- geometry using the integer reference, \c{canMat} in the above code.
-
- See the QGLSceneNode documentation for more.
-
- \section1 Using Sections
-
- During initialization of the QGLBuilder, while accumulating
- geometry, the geometry data in a QGLBuilder is placed into
- sections - there must be at least one section.
-
- Call the newSection() function to create a new section:
-
- \snippet qt3d/builder/builder.cpp 3
-
- Here separate sections for the rounded outside cylinder and flat top and
- bottom of the soup can model makes for the appearance of a sharp edge
- between them. If the sides and top and bottom were in the same section
- QGLBuilder would attempt to average the normals around the edge resulting
- in an unrealistic effect.
-
- In 3D applications this concept is referred to as
- \l{http://www.google.com/search?smoothing+groups}{smoothing groups}. Within
- a section (smoothing group) all normals are averaged making it appear
- as one smoothly shaded surface.
-
- The can has 3 smoothing groups - bottom, top and sides.
-
- This mesh of a Q is a faceted model - it has 0 smoothing groups:
-
- \image faceted-q.png
-
- To create geometry with a faceted appearance call newSection() with
- an argument of QGL::Faceted thus \c{newSection(QGL::Faceted)}.
-
- Faceted geometry is suitable for small models, where hard edges are
- desired between every face - a dice, gem or geometric solid for example.
-
- If no section has been created when geometry is added a new section is
- created automatically. This section will have its smoothing set
- to QGL::Smooth.
-
- To create a faceted appearance rather than accepting the automatically
- created section the << operator can also be used:
-
- \code
- QGLBuilder builder;
- QGeometryData triangles;
- triangles.appendVertices(a, b, c);
- builder << QGL::Faceted << triangles;
- \endcode
-
- \section2 Geometry Data in a Section
-
- Management of normals and vertices for smoothing, and other data is
- handled automatically by the QGLBuilder instance.
-
- Within a section, incoming geometry data will be coalesced and
- indices created to reference the fewest possible copies of the vertex
- data. For example, in smooth geometry all copies of a vertex are
- coalesced into one, and referenced by indices.
-
- One of the few exceptions to this is the case where texture data forms
- a \i seam and a copy of a vertex must be created to carry the two
- texture coordinates either side of the seam.
-
- \image texture-seam.png
-
- Coalescing has the effect of packing geometry data into the
- smallest space possible thus improving cache coherence and performance.
-
- Again all this is managed automatically by QGLBuilder and all
- that is required is to create smooth or faceted sections, and add
- geometry to them.
-
- Each QGLSection references a contiguous range of vertices in a
- QGLBuilder.
-
- \section1 Finalizing and Retrieving the Scene
-
- Once the geometry has been accumulated in the QGLBuilder instance, the
- finalizedSceneNode() method must be called to retrieve the optimized
- scene. This function serves to normalize the geometry and optimize
- it for display.
-
- While it may be convenient to get pointers to sub nodes in the scene
- during construction, it is important to retrieve the root of the scene
- so that the memory consumed by the scene can be recovered. The builder
- will create a QGLMaterialCollection; and there may be geometry, materials
- and other resources: these are all parented onto the root scene node.
- These can easily be recovered by deleting the root scene node:
-
- \code
- MyView::MyView() : QGLView()
- {
- // in the constructor construct a builder on the stack
- QGLBuilder builder;
-
- // add geometry as shown above
- builder << triangles;
-
- // obtain the scene from the builder & take ownership
- m_scene = builder.finalizedSceneNode();
- }
-
- MyView::~MyView()
- {
- // recover all scene resources
- delete m_scene;
- }
- \endcode
-
- Alternatively set the scene's parent to ensure resource recovery
- \c{m_scene->setParent(this)}.
-
-
-*/
-
-QGLBuilderPrivate::QGLBuilderPrivate(QGLBuilder *parent)
- : currentSection(0)
- , currentNode(0)
- , rootNode(0)
- , defThreshold(5)
- , q(parent)
-{
-}
-
-QGLBuilderPrivate::~QGLBuilderPrivate()
-{
- qDeleteAll(sections);
- if (rootNode)
- {
- qWarning("Destroying QGLBuilder but finalizedSceneNode() not called");
- delete rootNode;
- }
-}
-
-/*!
- Construct a new QGLBuilder using \a materials for the palette. If the
- \a materials argument is null, then a new palette is created.
-*/
-QGLBuilder::QGLBuilder(QGLMaterialCollection *materials)
- : dptr(new QGLBuilderPrivate(this))
-{
- dptr->rootNode = new QGLSceneNode;
- if (!materials)
- materials = new QGLMaterialCollection(dptr->rootNode);
- dptr->rootNode->setPalette(materials);
-}
-
-/*!
- Destroys this QGLBuilder recovering any resources.
-*/
-QGLBuilder::~QGLBuilder()
-{
- delete dptr;
-}
-
-/*!
- Helper function to calculate the normal for and set it on vertices
- in \a i, \a j and \a k in triangle data \a p. If the triangle in
- data \a p is a null triangle (area == 0) then the function returns
- false, otherwise it returns true.
-*/
-static inline void setNormals(int i, int j, int k, QGeometryData &p, const QVector3D &n)
-{
- p.normal(i) = n;
- p.normal(j) = n;
- p.normal(k) = n;
-}
-
-static bool qCalculateNormal(int i, int j, int k, QGeometryData &p, QVector3D *vec = 0)
-{
- QVector3D norm;
- QVector3D *n = &norm;
- if (vec)
- n = vec;
- bool nullTriangle = false;
- *n = QVector3D::crossProduct(p.vertexAt(j) - p.vertexAt(i),
- p.vertexAt(k) - p.vertexAt(j));
- if (qFskIsNull(n->x()))
- n->setX(0.0f);
- if (qFskIsNull(n->y()))
- n->setY(0.0f);
- if (qFskIsNull(n->z()))
- n->setZ(0.0f);
- if (n->isNull())
- {
- nullTriangle = true;
- }
- else
- {
- setNormals(i, j, k, p, *n);
- }
- return nullTriangle;
-}
-
-/*!
- \internal
- Helper function to actually add the vertices to geometry.
-*/
-void QGLBuilderPrivate::addTriangle(int i, int j, int k,
- const QGeometryData &p, int &count)
-{
- if (currentSection == 0)
- q->newSection();
- QLogicalVertex a(p, i);
- QLogicalVertex b(p, j);
- QLogicalVertex c(p, k);
- currentSection->append(a, b, c);
- count += 3;
-}
-
-/*!
- Add \a triangles - a series of one or more triangles - to this builder.
-
- The data is broken into groups of 3 vertices, each processed as a triangle.
-
- If \a triangles has less than 3 vertices this function exits without
- doing anything. Any vertices at the end of the list under a multiple
- of 3 are ignored.
-
- If no normals are supplied in \a triangles, a normal is calculated; as
- the cross-product \c{(b - a) x (c - a)}, for each group of 3
- logical vertices \c{a(triangle, i), b(triangle, i+1), c(triangle, i+2)}.
-
- In the case of a degenerate triangle, where the cross-product is null,
- that triangle is skipped. Supplying normals suppresses this behaviour
- (and means any degenerate triangles will be added to the geometry).
-
- \bold{Raw Triangle Mode}
-
- If \a triangles has indices specified then no processing of any kind is
- done and all the geometry is simply dumped in to the builder.
-
- This \bold{raw triangle} mode is for advanced use, and it is assumed that
- the user knows what they are doing, in particular that the indices
- supplied are correct, and normals are supplied and correct.
-
- Normals are not calculated in raw triangle mode, and skipping of null
- triangles is likewise not performed. See the section on
- \l{raw-triangle-mode}{raw triangle mode}
- in the class documentation above.
-
- \sa addQuads(), operator>>()
-*/
-void QGLBuilder::addTriangles(const QGeometryData &triangles)
-{
- if (triangles.count() < 3)
- return;
- if (triangles.indexCount() > 0)
- {
- // raw triangle mode
- if (dptr->currentSection == 0)
- newSection();
- dptr->currentSection->appendGeometry(triangles);
- dptr->currentSection->appendIndices(triangles.indices());
- dptr->currentNode->setCount(dptr->currentNode->count() + triangles.indexCount());
- }
- else
- {
- QGeometryData t = triangles;
- bool calcNormal = !t.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(t.count());
- t.appendNormalArray(nm);
- }
- bool skip = false;
- int k = 0;
- for (int i = 0; i < t.count() - 2; i += 3)
- {
- if (calcNormal)
- skip = qCalculateNormal(i, i+1, i+2, t);
- if (!skip)
- dptr->addTriangle(i, i+1, i+2, t, k);
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
- }
-}
-
-/*!
- Add \a quads - a series of one or more quads - to this builder.
-
- If \a quads has less than four vertices this function exits without
- doing anything.
-
- One normal per quad is calculated if \a quads does not have normals.
- For this reason quads should have all four vertices in the same plane.
- If the vertices do not lie in the same plane, use addTriangleStrip()
- to add two adjacent triangles instead.
-
- Since internally \l{geometry-building}{quads are stored as two triangles},
- each quad is actually divided in half into two triangles.
-
- Degenerate triangles are skipped in the same way as addTriangles().
-
- \sa addTriangles(), addTriangleStrip()
-*/
-void QGLBuilder::addQuads(const QGeometryData &quads)
-{
- if (quads.count() < 4)
- return;
- QGeometryData q = quads;
- bool calcNormal = !q.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(q.count());
- q.appendNormalArray(nm);
- }
- bool skip = false;
- int k = 0;
- QVector3D norm;
- for (int i = 0; i < q.count(); i += 4)
- {
- if (calcNormal)
- skip = qCalculateNormal(i, i+1, i+2, q, &norm);
- if (!skip)
- dptr->addTriangle(i, i+1, i+2, q, k);
- if (skip)
- skip = qCalculateNormal(i, i+2, i+3, q, &norm);
- if (!skip)
- {
- if (calcNormal)
- setNormals(i, i+2, i+3, q, norm);
- dptr->addTriangle(i, i+2, i+3, q, k);
- }
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- Adds to this section a set of connected triangles defined by \a fan.
-
- N triangular faces are generated, where \c{N == fan.count() - 2}. Each
- face contains the 0th vertex in \a fan, followed by the i'th and i+1'th
- vertex - where i takes on the values from 1 to \c{fan.count() - 1}.
-
- If \a fan has less than three vertices this function exits without
- doing anything.
-
- This function is similar to the OpenGL mode GL_TRIANGLE_FAN. It
- generates a number of triangles all sharing one common vertex, which
- is the 0'th vertex of the \a fan.
-
- Normals are calculated as for addTriangle(), given the above ordering.
- There is no requirement or assumption that all triangles lie in the
- same plane. Degenerate triangles are skipped in the same way as
- addTriangles().
-
- \sa addTriangulatedFace()
-*/
-void QGLBuilder::addTriangleFan(const QGeometryData &fan)
-{
- if (fan.count() < 3)
- return;
- QGeometryData f = fan;
- bool calcNormal = !f.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(f.count());
- f.appendNormalArray(nm);
- }
- int k = 0;
- bool skip = false;
- for (int i = 1; i < f.count() - 1; ++i)
- {
- if (calcNormal)
- skip = qCalculateNormal(0, i, i+1, f);
- if (!skip)
- dptr->addTriangle(0, i, i+1, f, k);
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- Adds to this section a set of connected triangles defined by \a strip.
-
- N triangular faces are generated, where \c{N == strip.count() - 2}.
- The triangles are generated from vertices 0, 1, & 2, then 2, 1 & 3,
- then 2, 3 & 4, and so on. In other words every second triangle has
- the first and second vertices switched, as a new triangle is generated
- from each successive set of three vertices.
-
- If \a strip has less than three vertices this function exits without
- doing anything.
-
- Normals are calculated as for addTriangle(), given the above ordering.
-
- This function is very similar to the OpenGL mode GL_TRIANGLE_STRIP. It
- generates triangles along a strip whose two sides are the even and odd
- vertices.
-
- \sa addTriangulatedFace()
-*/
-void QGLBuilder::addTriangleStrip(const QGeometryData &strip)
-{
- if (strip.count() < 3)
- return;
- QGeometryData s = strip;
- bool calcNormal = !s.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(s.count());
- s.appendNormalArray(nm);
- }
- bool skip = false;
- int k = 0;
- for (int i = 0; i < s.count() - 2; ++i)
- {
- if (i % 2)
- {
- if (calcNormal)
- skip = qCalculateNormal(i+1, i, i+2, s);
- if (!skip)
- dptr->addTriangle(i+1, i, i+2, s, k);
- }
- else
- {
- if (calcNormal)
- skip = qCalculateNormal(i, i+1, i+2, s);
- if (!skip)
- dptr->addTriangle(i, i+1, i+2, s, k);
- }
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- Adds to this section a set of quads defined by \a strip.
-
- If \a strip has less than four vertices this function exits without
- doing anything.
-
- The first quad is formed from the 0'th, 2'nd, 3'rd and 1'st vertices.
- The second quad is formed from the 2'nd, 4'th, 5'th and 3'rd vertices,
- and so on, as shown in this diagram:
-
- \image quads.png
-
- One normal per quad is calculated if \a strip does not have normals.
- For this reason quads should have all four vertices in the same plane.
- If the vertices do not lie in the same plane, use addTriangles() instead.
-
- Since internally \l{geometry-building}{quads are stored as two triangles},
- each quad is actually divided in half into two triangles.
-
- Degenerate triangles are skipped in the same way as addTriangles().
-
- \sa addQuads(), addTriangleStrip()
-*/
-void QGLBuilder::addQuadStrip(const QGeometryData &strip)
-{
- if (strip.count() < 4)
- return;
- QGeometryData s = strip;
- bool calcNormal = !s.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(s.count());
- s.appendNormalArray(nm);
- }
- bool skip = false;
- QVector3D norm;
- int k = 0;
- for (int i = 0; i < s.count() - 3; i += 2)
- {
- if (calcNormal)
- skip = qCalculateNormal(i, i+2, i+3, s, &norm);
- if (!skip)
- dptr->addTriangle(i, i+2, i+3, s, k);
- if (skip)
- skip = qCalculateNormal(i, i+3, i+1, s, &norm);
- if (!skip)
- {
- if (calcNormal)
- setNormals(i, i+3, i+1, s, norm);
- dptr->addTriangle(i, i+3, i+1, s, k);
- }
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- Adds to this section a polygonal face made of triangular sub-faces,
- defined by \a face. The 0'th vertex is used for the center, while
- the subsequent vertices form the perimeter of the face, which must
- at minimum be a triangle.
-
- If \a face has less than four vertices this function exits without
- doing anything.
-
- This function provides functionality similar to the OpenGL mode GL_POLYGON,
- except it divides the face into sub-faces around a \bold{central point}.
- The center and perimeter vertices must lie in the same plane (unlike
- triangle fan). If they do not normals will be incorrectly calculated.
-
- \image triangulated-face.png
-
- Here the sub-faces are shown divided by green lines. Note how this
- function handles some re-entrant (non-convex) polygons, whereas
- addTriangleFan will not support such polygons.
-
- If required, the center point can be calculated using the center() function
- of QGeometryData:
-
- \code
- QGeometryData face;
- face.appendVertex(perimeter.center()); // perimeter is a QGeometryData
- face.appendVertices(perimeter);
- builder.addTriangulatedFace(face);
- \endcode
-
- N sub-faces are generated where \c{N == face.count() - 2}.
-
- Each triangular sub-face consists of the center; followed by the \c{i'th}
- and \c{((i + 1) % N)'th} vertex. The last face generated then is
- \c{(center, face[N - 1], face[0]}, the closing face. Note that the closing
- face is automatically created, unlike addTriangleFan().
-
- If no normals are supplied in the vertices of \a face, normals are
- calculated as per addTriangle(). One normal is calculated, since a
- faces vertices lie in the same plane.
-
- Degenerate triangles are skipped in the same way as addTriangles().
-
- \sa addTriangleFan(), addTriangles()
-*/
-void QGLBuilder::addTriangulatedFace(const QGeometryData &face)
-{
- if (face.count() < 4)
- return;
- QGeometryData f;
- f.appendGeometry(face);
- int cnt = f.count();
- bool calcNormal = !f.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(cnt);
- f.appendNormalArray(nm);
- }
- bool skip = false;
- QVector3D norm;
- int k = 0;
- for (int i = 1; i < cnt; ++i)
- {
- int n = i + 1;
- if (n == cnt)
- n = 1;
- if (calcNormal)
- {
- skip = qCalculateNormal(0, i, n, f);
- if (norm.isNull() && !skip)
- {
- norm = f.normalAt(0);
- for (int i = 0; i < cnt; ++i)
- f.normal(i) = norm;
- }
- }
- if (!skip)
- dptr->addTriangle(0, i, n, f, k);
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- Add a series of quads by 'interleaving' \a top and \a bottom.
-
- This function behaves like quadStrip(), where the odd-numbered vertices in
- the input primitive are from \a top and the even-numbered vertices from
- \a bottom.
-
- It is trivial to do extrusions using this function:
-
- \code
- // create a series of quads for an extruded edge along -Y
- addQuadsInterleaved(topEdge, topEdge.translated(QVector3D(0, -1, 0));
- \endcode
-
- N quad faces are generated where \c{N == min(top.count(), bottom.count() - 1}.
- If \a top or \a bottom has less than 2 elements, this functions does
- nothing.
-
- Each face is formed by the \c{i'th} and \c{(i + 1)'th}
- vertices of \a bottom, followed by the \c{(i + 1)'th} and \c{i'th}
- vertices of \a top.
-
- If the vertices in \a top and \a bottom are the perimeter vertices of
- two polygons then this function can be used to generate quads which form
- the sides of a \l{http://en.wikipedia.org/wiki/Prism_(geometry)}{prism}
- with the polygons as the prisms top and bottom end-faces.
-
- \image quad-extrude.png
-
- In the diagram above, the \a top is shown in orange, and the \a bottom in
- dark yellow. The first generated quad, (a, b, c, d) is generated in
- the order shown by the blue arrow.
-
- To create such a extruded prismatic solid, complete with top and bottom cap
- polygons, given just the top edge do this:
- \code
- QGeometryData top = buildTopEdge();
- QGeometryData bottom = top.translated(QVector3D(0, 0, -1));
- builder.addQuadsInterleaved(top, bottom);
- builder.addTriangulatedFace(top);
- builder.addTriangulatedFace(bottom.reversed());
- \endcode
- The \a bottom QGeometryData must be \bold{reversed} so that the correct
- winding for an outward facing polygon is obtained.
-*/
-void QGLBuilder::addQuadsInterleaved(const QGeometryData &top,
- const QGeometryData &bottom)
-{
- if (top.count() < 2 || bottom.count() < 2)
- return;
- QGeometryData zipped = bottom.interleavedWith(top);
- bool calcNormal = !zipped.hasField(QGL::Normal);
- if (calcNormal)
- {
- QVector3DArray nm(zipped.count());
- zipped.appendNormalArray(nm);
- }
- bool skip = false;
- QVector3D norm;
- int k = 0;
- for (int i = 0; i < zipped.count() - 2; i += 2)
- {
- if (calcNormal)
- skip = qCalculateNormal(i, i+2, i+3, zipped, &norm);
- if (!skip)
- dptr->addTriangle(i, i+2, i+3, zipped, k);
- if (skip)
- skip = qCalculateNormal(i, i+3, i+1, zipped, &norm);
- if (!skip)
- {
- if (calcNormal)
- setNormals(i, i+3, i+1, zipped, norm);
- dptr->addTriangle(i, i+3, i+1, zipped, k);
- }
- }
- dptr->currentNode->setCount(dptr->currentNode->count() + k);
-}
-
-/*!
- \fn void QGLBuilder::addPane(QSizeF size)
- Convenience function to create a quad centered on the origin,
- lying in the Z=0 plane, with width (x dimension) and height
- (y dimension) specified by \a size.
-*/
-
-/*!
- \fn void QGLBuilder::addPane(qreal size)
- Convenience method to add a single quad of dimensions \a size wide by
- \a size high in the z = 0 plane, centered on the origin. The quad has
- texture coordinates of (0, 0) at the bottom left and (1, 1) at the top
- right. The default value for \a size is 1.0, resulting in a quad
- from QVector3D(-0.5, -0.5, 0.0) to QVector3D(0.5, 0.5, 0.0).
-*/
-
-/*!
- \internal
-*/
-void QGLBuilderPrivate::adjustSectionNodes(QGLSection *sec,
- int offset, const QGeometryData &geom)
-{
- QList<QGLSceneNode*> children = sec->nodes();
- QList<QGLSceneNode*>::iterator it = children.begin();
- QList<QGLSceneNode*> deleted;
- for ( ; it != children.end(); ++it)
- adjustNodeTree(*it, offset, geom, deleted);
-}
-
-/*!
- \internal
- Adjust \a top by incrementing its start by \a offset, and setting its
- geometry to \a geom. Find the cumulative total of indexes -
- QGLSceneNode::count() - for \a top and all its children. If this total is
- equal to zero, then delete that node.
-*/
-int QGLBuilderPrivate::adjustNodeTree(QGLSceneNode *top,
- int offset, const QGeometryData &geom,
- QList<QGLSceneNode*> &deleted)
-{
- int totalItems = 0;
- if (top && !deleted.contains(top))
- {
- top->setStart(top->start() + offset);
- top->setGeometry(geom);
- totalItems = top->count();
- QList<QGLSceneNode*> children = top->children();
- QList<QGLSceneNode*>::iterator it = children.begin();
- for ( ; it != children.end(); ++it)
- {
- totalItems += adjustNodeTree(*it, offset, geom, deleted);
- }
- if (totalItems == 0 && top->objectName().isEmpty())
- {
- delete top;
- deleted.append(top);
- }
- }
- return totalItems;
-}
-
-/*!
- \internal
- Returns a count of all the items referenced by this node
- and all its children.
-*/
-static int recursiveCount(QGLSceneNode *top)
-{
- int totalItems = 0;
- if (top)
- {
- totalItems = top->count();
- QList<QGLSceneNode*> children = top->children();
- QList<QGLSceneNode*>::const_iterator it = children.constBegin();
- for ( ; it != children.constEnd(); ++it)
- totalItems += recursiveCount(*it);
- }
- return totalItems;
-}
-
-static int nodeCount(const QList<QGLSceneNode*> &list)
-{
- int total = 0;
- QList<QGLSceneNode*>::const_iterator it = list.constBegin();
- for ( ; it != list.constEnd(); ++it)
- total += recursiveCount(*it);
- return total;
-}
-
-static inline void warnIgnore(int secCount, QGLSection *s, int vertCount, int nodeCount,
- const char *msg)
-{
- qWarning("Ignoring section %d (%p) with %d vertices and"
- " %d indexes - %s", secCount, s, vertCount, nodeCount, msg);
-}
-
-/*!
- Finish the building of this geometry, optimize it for rendering, and return a
- pointer to the detached top-level scene node (root node).
-
- Since the scene is detached from the builder object, the builder itself
- may be deleted or go out of scope while the scene lives on:
-
- \code
- void MyView::MyView()
- {
- QGLBuilder builder;
- // construct geometry
- m_thing = builder.finalizedSceneNode();
- }
-
- void MyView::~MyView()
- {
- delete m_thing;
- }
-
- void MyView::paintGL()
- {
- m_thing->draw(painter);
- }
- \endcode
-
- The root node will have a child node for each section that was created
- during geometry building.
-
- This method must be called exactly once after building the scene.
-
- \bold{Calling code takes ownership of the scene.} In particular take care
- to either explicitly destroy the scene when it is no longer needed - as shown
- above.
-
- For more complex applications parent each finalized scene node onto a QObject
- so it will be implictly cleaned up by Qt. If you use QGLSceneNode::setParent()
- to do this, you can save an explicit call to addNode() since if setParent()
- detects that the new parent is a QGLSceneNode it will call addNode() for you:
-
- \code
- // here a top level node for the app is created, and parented to the view
- QGLSceneNode *topNode = new QGLSceneNode(this);
-
- QGLBuilder b1;
- // build geometry
-
- QGLSceneNode *thing = b1.finalizedSceneNode();
-
- // does a QObject::setParent() to manage memory, and also adds to the scene
- // graph, so no need to call topNode->addNode(thing)
- thing->setParent(topNode);
-
- QGLBuilder b2;
- // build more geometry
- QGLSceneNode *anotherThing = b2.finalizedSceneNode();
-
- // again parent on get addNode for free
- anotherThing->setParent(topNode);
- \endcode
-
- If this builder is destroyed without calling this method to take
- ownership of the scene, a warning will be printed on the console and the
- scene will be deleted. If this method is called more than once, on the
- second and subsequent calls a warning is printed and NULL is returned.
-
- This function does the following:
- \list
- \o packs all geometry data from sections into QGLSceneNode instances
- \o recalculates QGLSceneNode start() and count() for the scene
- \o deletes all QGLBuilder's internal data structures
- \o returns the top level scene node that references the geometry
- \o sets the internal pointer to the top level scene node to NULL
- \endlist
-
- \sa sceneNode()
-*/
-QGLSceneNode *QGLBuilder::finalizedSceneNode()
-{
- if (dptr->rootNode == 0)
- {
- qWarning("QGLBuilder::finalizedSceneNode() called twice");
- return 0;
- }
- QGeometryData g;
- QMap<quint32, QGeometryData> geos;
- QMap<QGLSection*, int> offsets;
- for (int i = 0; i < dptr->sections.count(); ++i)
- {
- // pack sections that have the same fields into one geometry
- QGLSection *s = dptr->sections.at(i);
- QGL::IndexArray indices = s->indices();
- int icnt = indices.size();
- int ncnt = nodeCount(s->nodes());
- int scnt = s->count();
- if (scnt == 0 || icnt == 0 || ncnt == 0)
- {
- if (!qgetenv("Q_WARN_EMPTY_MESH").isEmpty())
- {
- if (ncnt == 0)
- warnIgnore(scnt, s, icnt, ncnt, "nodes empty");
- else if (scnt == 0)
- warnIgnore(scnt, s, icnt, ncnt, "geometry count zero");
- else
- warnIgnore(scnt, s, icnt, ncnt, "index count zero");
- }
- continue;
- }
- s->normalizeNormals();
- int sectionOffset = 0;
- int sectionIndexOffset = 0;
- if (geos.contains(s->fields()))
- {
- QGeometryData &gd = geos[s->fields()];
- sectionOffset = gd.count();
- sectionIndexOffset = gd.indexCount();
- offsets.insert(s, sectionIndexOffset);
- gd.appendGeometry(*s);
- for (int i = 0; i < icnt; ++i)
- indices[i] += sectionOffset;
- gd.appendIndices(indices);
- }
- else
- {
- g = QGeometryData(*s);
- geos.insert(s->fields(), g);
- }
- }
- while (dptr->sections.count() > 0)
- {
- QGLSection *s = dptr->sections.takeFirst();
- dptr->adjustSectionNodes(s, offsets[s], geos[s->fields()]);
- delete s;
- }
- QGLSceneNode *tmp = dptr->rootNode;
- dptr->rootNode = 0; // indicates root node detached
- return tmp;
-}
-
-/*!
- Creates a new section with smoothing mode set to \a smooth. By default
- \a smooth is QGL::Smooth.
-
- A section must be created before any geometry or new nodes can be added
- to the builder. However one is created automatically by addTriangle()
- and the other add functions; and also by newNode(), pushNode() or popNode()
- if needed.
-
- The internal node stack - see pushNode() and popNode() - is cleared,
- and a new top-level QGLSceneNode is created for this section by calling
- newNode().
-
- \sa newNode(), pushNode()
-*/
-void QGLBuilder::newSection(QGL::Smoothing smooth)
-{
- new QGLSection(this, smooth); // calls addSection
-}
-
-void QGLBuilder::addSection(QGLSection *sec)
-{
- dptr->currentSection = sec;
- sec->setMapThreshold(dptr->defThreshold);
- dptr->sections.append(sec);
- dptr->nodeStack.clear();
- newNode();
-}
-
-/*!
- \internal
- Returns the current section, in which new geometry is being added.
-*/
-QGLSection *QGLBuilder::currentSection() const
-{
- return dptr->currentSection;
-}
-
-/*!
- \internal
- Returns a list of the sections of the geometry in this builder.
-*/
-QList<QGLSection*> QGLBuilder::sections() const
-{
- return dptr->sections;
-}
-
-/*!
- \internal
- Test function only.
-*/
-void QGLBuilder::setDefaultThreshold(int t)
-{
- dptr->defThreshold = t;
-}
-
-/*!
- Returns the root scene node of the geometry created by this builder.
-
- \sa newNode(), newSection()
-*/
-QGLSceneNode *QGLBuilder::sceneNode()
-{
- return dptr->rootNode;
-}
-
-/*!
- Creates a new QGLSceneNode and makes it current. A pointer to the new
- node is returned. The node is added into the scene at the same level
- as the currentNode().
-
- The node is set to reference the geometry starting from the next
- vertex created, such that currentNode()->start() will return the
- index of this next vertex.
-
- \sa newSection()
-*/
-QGLSceneNode *QGLBuilder::newNode()
-{
- if (dptr->currentSection == 0)
- {
- newSection(); // calls newNode()
- return dptr->currentNode;
- }
- QGLSceneNode *parentNode = dptr->rootNode;
- if (dptr->nodeStack.count() > 0)
- parentNode = dptr->nodeStack.last();
- dptr->currentNode = new QGLSceneNode(parentNode);
- dptr->currentNode->setPalette(parentNode->palette());
- dptr->currentNode->setStart(dptr->currentSection->indexCount());
- if (dptr->nodeStack.count() == 0)
- dptr->currentSection->addNode(dptr->currentNode);
- return dptr->currentNode;
-}
-
-/*!
- Returns a pointer to the current scene node, within the current section.
-
- If there is no current section then newSection() will be called to
- create one.
-
- \sa newNode(), newSection()
-*/
-QGLSceneNode *QGLBuilder::currentNode()
-{
- if (dptr->currentSection == 0)
- newSection(); // calls newNode()
- return dptr->currentNode;
-}
-
-/*!
- Creates a new scene node that is a child of the current node and,
- makes it the current node. A pointer to the new node is returned.
- The previous current node is saved on a stack and it may
- be made current again by calling popNode().
-
- \sa popNode(), newNode()
-*/
-QGLSceneNode *QGLBuilder::pushNode()
-{
- if (dptr->currentSection == 0)
- newSection(); // calls newNode()
- QGLSceneNode *parentNode = dptr->currentNode;
- dptr->nodeStack.append(parentNode);
- dptr->currentNode = new QGLSceneNode(parentNode);
- dptr->currentNode->setStart(dptr->currentSection->indexCount());
- dptr->currentNode->setPalette(parentNode->palette());
- return dptr->currentNode;
-}
-
-/*!
- Removes the node from the top of the stack, makes a copy of it, and
- makes the copy current.
-
- If the stack is empty, behaviour is undefined. In debug mode, calling
- this function when the stack is empty will cause an assert.
-
- A pointer to the new current node is returned.
-
- The node is set to reference the geometry starting from the next
- vertex created, such that QGLSceneNode::start() will return the
- index of this next vertex.
-
- \sa pushNode(), newNode()
-*/
-QGLSceneNode *QGLBuilder::popNode()
-{
- if (dptr->currentSection == 0)
- newSection(); // calls newNode()
- int cnt = dptr->currentSection->indexCount();
- QGLSceneNode *s = dptr->nodeStack.takeLast(); // assert here
- QGLSceneNode *parentNode = dptr->rootNode;
- if (dptr->nodeStack.count() > 0)
- parentNode = dptr->nodeStack.last();
- dptr->currentNode = s->cloneNoChildren(parentNode);
- dptr->currentNode->setStart(cnt);
- dptr->currentNode->setCount(0);
- dptr->currentNode->setPalette(parentNode->palette());
- if (dptr->nodeStack.count() == 0)
- dptr->currentSection->addNode(dptr->currentNode);
- return dptr->currentNode;
-}
-
-/*!
- Returns the palette for this builder. This is the QGLMaterialCollection
- pointer that was passed to the constructor; or if that was null a new
- QGLMaterialCollection. This function returns the same result as
- \c{sceneNode()->palette()}.
-
- \sa sceneNode()
-*/
-QGLMaterialCollection *QGLBuilder::palette()
-{
- return dptr->rootNode->palette();
-}
-
-/*!
- \relates QGLBuilder
- Convenience operator for creating a new section in \a builder with \a smoothing.
-
- \code
- // equivalent to builder.newSection(QGL::Faceted)
- builder << QGL::Faceted;
- \endcode
-*/
-QGLBuilder& operator<<(QGLBuilder& builder, const QGL::Smoothing& smoothing)
-{
- builder.newSection(smoothing);
- return builder;
-}
-
-/*!
- \relates QGLBuilder
- Convenience operator for adding \a triangles to the \a builder.
-
- \code
- // equivalent to builder.addTriangles(triangles);
- builder << triangles;
- \endcode
-*/
-QGLBuilder& operator<<(QGLBuilder& builder, const QGeometryData& triangles)
-{
- builder.addTriangles(triangles);
- return builder;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglbuilder.h b/src/gui/extern/Qt3D/geometry/qglbuilder.h
deleted file mode 100644
index 792e0ac7cfab3da7b0a69c02570f5e45c5121a1f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglbuilder.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLBuilder_H
-#define QGLBuilder_H
-
-#include <QtCore/qvector.h>
-#include <QtCore/qlist.h>
-#include <QtGui/qvector3d.h>
-#include <QtOpenGL/qgl.h>
-
-#include "qglnamespace.h"
-#include "qglscenenode.h"
-#include "qglattributevalue.h"
-#include "qgeometrydata.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLSection;
-class QGLMaterialCollection;
-class QGLBuilderPrivate;
-class QGLPainter;
-
-class Q_QT3D_EXPORT QGLBuilder
-{
-public:
- explicit QGLBuilder(QGLMaterialCollection *materials = 0);
- virtual ~QGLBuilder();
-
- // section management
- void newSection(QGL::Smoothing sm = QGL::Smooth);
-
- // scene management
- QGLSceneNode *sceneNode();
- QGLSceneNode *currentNode();
- QGLSceneNode *newNode();
- QGLSceneNode *pushNode();
- QGLSceneNode *popNode();
- QGLMaterialCollection *palette();
- QGLSceneNode *finalizedSceneNode();
-
- // geometry building by primitive
- void addTriangles(const QGeometryData &triangle);
- void addQuads(const QGeometryData &quad);
- void addTriangleFan(const QGeometryData &fan);
- void addTriangleStrip(const QGeometryData &strip);
- void addTriangulatedFace(const QGeometryData &face);
- void addQuadStrip(const QGeometryData &strip);
- void addQuadsInterleaved(const QGeometryData &top,
- const QGeometryData &bottom);
- inline void addPane(qreal size = 1.0f);
- inline void addPane(QSizeF size);
-
-protected:
- // internal and test functions
- QGLSection *currentSection() const;
- QList<QGLSection*> sections() const;
- void setDefaultThreshold(int);
-
-private:
- Q_DISABLE_COPY(QGLBuilder);
- void addSection(QGLSection *section);
-
- friend class QGLSection;
-
- QGLBuilderPrivate *dptr;
-};
-
-inline void QGLBuilder::addPane(qreal size)
-{
- addPane(QSizeF(size, size));
-}
-
-inline void QGLBuilder::addPane(QSizeF size)
-{
- QSizeF f = size / 2.0f;
- QVector2D a(-f.width(), -f.height());
- QVector2D b(f.width(), -f.height());
- QVector2D c(f.width(), f.height());
- QVector2D d(-f.width(), f.height());
- QVector2D ta(0.0f, 0.0f);
- QVector2D tb(1.0f, 0.0f);
- QVector2D tc(1.0f, 1.0f);
- QVector2D td(0.0f, 1.0f);
- QGeometryData quad;
- quad.appendVertex(a, b, c, d);
- quad.appendTexCoord(ta, tb, tc, td);
- addQuads(quad);
-}
-
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGL::Smoothing& smoothing);
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGeometryData& triangles);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLBuilder_H
diff --git a/src/gui/extern/Qt3D/geometry/qglbuilder_p.h b/src/gui/extern/Qt3D/geometry/qglbuilder_p.h
deleted file mode 100644
index 45f04fc219eba78d631ce5765498e49bf761abdf..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglbuilder_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLBuilder_P_H
-#define QGLBuilder_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglbuilder.h"
-
-#include <QtCore/qmap.h>
-#include <QPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QGLBuilder;
-class QGLSection;
-class QGeometryData;
-
-class QGLBuilderPrivate
-{
-public:
- QGLBuilderPrivate(QGLBuilder *parent);
- ~QGLBuilderPrivate();
- inline void setDirty(bool dirty = true);
- void addTriangle(int a, int b, int c, const QGeometryData &p, int &count);
- void adjustSectionNodes(QGLSection *sec, int offset, const QGeometryData &geom);
- int adjustNodeTree(QGLSceneNode *top, int offset, const QGeometryData &geom,
- QList<QGLSceneNode*> &deleted);
-
- QList<QGLSection*> sections;
- QGLSection *currentSection;
- QList<QGLSceneNode*> nodeStack;
- QGLSceneNode *currentNode;
- QGLSceneNode *rootNode;
- int defThreshold;
- QGLBuilder *q;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLBuilder_P_H
diff --git a/src/gui/extern/Qt3D/geometry/qglcube.cpp b/src/gui/extern/Qt3D/geometry/qglcube.cpp
deleted file mode 100644
index a125672719401ae75fbd90037f70bd2c709d475f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglcube.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcube.h"
-#include "qglbuilder.h"
-#include "qvector3darray.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLCube
- \brief The QGLCube class represents the geometry of simple six-sided cube in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The following example adds a cube of 2 units on a side to a
- geometry builder, and draws it at (10, 25, 0) in a QGLPainter:
-
- \code
- QGLBuilder list;
- list.newSection(QGL::Faceted);
- list << QGLCube(2);
- painter->translate(10, 25, 0);
- list.draw(painter);
- \endcode
-
- QGLCube will create a default set of texture coordinates that shows
- the same texture of all six faces.
-*/
-
-/*!
- \fn QGLCube::QGLCube(qreal size)
-
- Constructs the geometry for a regular cube of \a size
- units on a side.
-*/
-
-/*!
- \fn qreal QGLCube::size() const
-
- Returns the size of this cube.
-
- \sa setSize()
-*/
-
-/*!
- \fn void QGLCube::setSize(qreal size)
-
- Sets the \a size of this cube.
-
- \sa size()
-*/
-
-static const int vertexDataLen = 6 * 4 * 3;
-
-static const float vertexData[vertexDataLen] = {
- // +X
- 0.5f, 0.5f, -0.5f,
- 0.5f, 0.5f, 0.5f,
- 0.5f, -0.5f, 0.5f,
- 0.5f, -0.5f, -0.5f,
- // -X
- -0.5f, -0.5f, -0.5f,
- -0.5f, -0.5f, 0.5f,
- -0.5f, 0.5f, 0.5f,
- -0.5f, 0.5f, -0.5f,
-
- // +Y
- -0.5f, 0.5f, -0.5f,
- -0.5f, 0.5f, 0.5f,
- 0.5f, 0.5f, 0.5f,
- 0.5f, 0.5f, -0.5f,
- // -Y
- 0.5f, -0.5f, -0.5f,
- 0.5f, -0.5f, 0.5f,
- -0.5f, -0.5f, 0.5f,
- -0.5f, -0.5f, -0.5f,
-
- // +Z
- 0.5f, -0.5f, 0.5f,
- 0.5f, 0.5f, 0.5f,
- -0.5f, 0.5f, 0.5f,
- -0.5f, -0.5f, 0.5f,
- // -Z
- 0.5f, 0.5f, -0.5f,
- 0.5f, -0.5f, -0.5f,
- -0.5f, -0.5f, -0.5f,
- -0.5f, 0.5f, -0.5f
-};
-
-static const int texCoordDataLen = 6 * 4 * 2;
-
-static const float texCoordData[texCoordDataLen] = {
- // +X
- 1.0f, 1.0f,
- 0.0f, 1.0f,
- 0.0f, 0.0f,
- 1.0f, 0.0f,
- // -X
- 0.0f, 0.0f,
- 1.0f, 0.0f,
- 1.0f, 1.0f,
- 0.0f, 1.0f,
-
- // +Y
- 0.0f, 1.0f,
- 0.0f, 0.0f,
- 1.0f, 0.0f,
- 1.0f, 1.0f,
- // -Y
- 1.0f, 0.0f,
- 1.0f, 1.0f,
- 0.0f, 1.0f,
- 0.0f, 0.0f,
-
- // +Z
- 1.0f, 0.0f,
- 1.0f, 1.0f,
- 0.0f, 1.0f,
- 0.0f, 0.0f,
- // -Z
- 0.0f, 1.0f,
- 0.0f, 0.0f,
- 1.0f, 0.0f,
- 1.0f, 1.0f,
-};
-
-/*!
- \relates QGLCube
-
- Builds the geometry for \a cube within the specified
- geometry \a builder.
-
- This operator specifies the positions, and 2D texture
- co-ordinates for all of the vertices that make up the cube.
- Normals will be calculated by the \a builder, depending on its
- current section's smoothing setting.
-*/
-QGLBuilder& operator<<(QGLBuilder& builder, const QGLCube& cube)
-{
- QGeometryData op;
-
- QVector3DArray vrts = QVector3DArray::fromRawData(
- reinterpret_cast<const QVector3D *>(vertexData), vertexDataLen / 3);
- if (cube.size() != 1.0f)
- vrts.scale(cube.size());
-
- op.appendVertexArray(vrts);
-
- QVector2DArray texx = QVector2DArray::fromRawData(
- reinterpret_cast<const QVector2D *>(texCoordData), texCoordDataLen / 2);
-
- op.appendTexCoordArray(texx);
-
- builder.addQuads(op);
- return builder;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglcube.h b/src/gui/extern/Qt3D/geometry/qglcube.h
deleted file mode 100644
index 4ccd00fb96080cfbfb1869aed5e6fdaa8be74bdf..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglcube.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCUBE_H
-#define QGLCUBE_H
-
-#include "qt3dglobal.h"
-
-#include <QtGui/qvector2d.h>
-#include "qvector2darray.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLBuilder;
-
-class Q_QT3D_EXPORT QGLCube
-{
-public:
- explicit QGLCube(qreal size = 1.0f) : m_size(size) {}
-
- qreal size() const { return m_size; }
- void setSize(qreal size) { m_size = size; }
-
-private:
- qreal m_size;
-};
-
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGLCube& cube);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qglcylinder.cpp b/src/gui/extern/Qt3D/geometry/qglcylinder.cpp
deleted file mode 100644
index d1903558fe8da824f3bcee2fac24c2d70537c288..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglcylinder.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcylinder.h"
-#include "qglbuilder.h"
-#include "qvector2darray.h"
-#include "qvector3darray.h"
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLCylinder
- \brief The QGLCylinder class represents the geometry of a simple cylinder/cone in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The following example creates a cone with a top diameter of 1 unit,
- a bottom diameter of of 2 units in diameter and height of 3 units.
-
- It then draws it at (10, 25, 0) in a QGLPainter:
-
- \code
- QGLBuilder builder;
- builder << QGLCylinder(1.0,2.0,3.0);
- QGLSceneNode *node = builder.finalizedSceneNode();
-
- // view the cylinder structure during development
- qDumpScene(node);
-
- painter.translate(10, 25, 0);
- node->draw(&painter);
- \endcode
-
- Note that the bottom circle of the cylinder will always be centred at (0,0,0)
- unless otherwise transformed after cylinder creation.
-
- The QGLCylinder class specifies positions, normals and 2D texture
- co-ordinates for all of the vertices that make up the cylinder.
-
- The texture co-ordinates are fixed at construction time. This
- is because constructing the cylinder can involve generating additional
- vertices which need to interpolate the texture co-ordinates of their
- neighboring vertices.
-
- The QGLCylinder is divided into slices and layers. The slices value
- indicate number of triangular sections into which the top and bottom
- circles of the cylinder are broken into. Consequently it also sets the
- number of facets which run the length of the cylinder. More slices
- results in a smoother circumference.
-
- The layers value indicates the number of longitudinal sections the
- cylinder is broken into. Fewer layers means that the side facets of the
- cylinder will be made up of fewer, very long, triangles, while a higher
- number of layers will produce many and smaller triangles. Often it is
- desirable to avoid large triangles as they may cause inefficiencies in
- texturing/lighting on certain platforms.
-
- The end-caps and sides of the cylinder are independent sections of the
- scene-graph, and so may be textured separately.
-
- Textures are wrapped around the sides of thecylinder in such a way that
- the texture may distort across the x axis if the top and bottom diameters
- of the cylinder differ (ie. the cylinder forms a truncated cone). Textures
- begin and end at the centre points of the top and bottom end-caps of the
- cylinder. This wrapping means that textures on either end-cap may be
- distorted.
-
- Texture coordinates are assigned as shown below.
-
- \image cylinder-texture-coords.png
-
- It is worth noting that the cylinder class can, in fact, be used to generate
- any regular solid polygonal prism. A rectangular prism can be created, for
- example, by creating a 4 sided cylinder. Likewise a hexagonal prism is
- simply a 6 sided cylinder.
-
- With this knowledge, and an understanding of the texture coordinate mapping,
- it is possible to make custom textures which will be usable with these
- three dimensional objects.
-
- \section1 Cylinder Sections and Non-Trivial Scene Structure
-
- When the cylinder is placed in the builder, by necessity separate sections are created
- so that the correct hard edge for the normals is rendered. If there were no
- sections, the smooth shading would try to make the cylinder sides and its flat bases
- all part of a smoothly shaded surface instead of having a sharp crease between them.
-
- Because of this necessary limitation when working with QGLCylinder always examine the
- generate node structure using the qDumpScene() function, as shown above. This will
- display the structure of the generated sections by their named scenenodes,and quickly
- make obvious what required code is needed to render the scene as desired.
-
- In the case of most non-trivial programatically generate geometry, for example
- compiling cubes, cylinders and domes into a single builder, the resulting scene
- will be not organised in a predictable way. Due to the section limitation it is hard
- to avoid the results all being siblings. Using pushNode() does not work because
- section boundaries cause QGLBuilder to reset it's node stack, as the section
- boundaries must be discrete.
-
- \section1 Analysing and Re-organising Scenes
-
- To deal with the structure imposed by separate sections, first use qDumpScene() to
- analyse the scene.
-
- In the simplest case disable the caps of the cylinder so that only one simple node is
- generated, and get a handle to this node via builder.currentNode(). Alternatively
- use seperate builder objects and finalizedSceneNode() calls to obtain distinct
- nodes - these will have Base and Dome sibling objects beneath them.
-
- In extreme cases the tree can have nodes cut out and transplanted onto alternative
- parents like this:
- \code
- // Here root is the builder's root node, either from the
- // sceneNode() function or from finalizedSceneNode():
- QGLSceneNode *dome = new QGLSceneNode;
- dome->setObjectName("Icecream Top");
- QList<QGLSceneNode*> c = root->allChildren();
- for (int i = 0; i < c.size(); ++i)
- {
- if (c.at(i)->objectName() == "Dome" || c.at(i)->objectName() == "Base")
- {
- root->removeNode(c.at(i));
- dome->addNode(c.at(i));
- }
- }
- dome->setPalette(root->palette());
- dome->setMaterialIndex(domeMat);
- \endcode
-
- Note that this code relies on knowledge that the nodes "Dome" and "Base" are created
- and this is obtained via qDumpScene. Using the QGLSceneNode::allChildren() function
- returns a flat list of the heierarchy enabling easy finding of nodes that might be
- deeper in the scene.
-
- Executive summary - use qDumpScene();
-
- \sa QGLBuilder
-*/
-
-
-/*!
- \fn QGLCylinder::QGLCylinder(qreal diameterTop, qreal diameterBase , qreal height, int slices, int layers, bool top, bool base)
-
- Constructs the geometry for a cylinder with top of diameter \a diameterTop,
- a base of diameter \a diameterBase, and a height of \a height.
-
- The resultant mesh will be divided around the vertical axis of the cylinder
- into \a slices individual wedges, and shall be formed of \a layers stacked
- to form the cylinder.
-
- If the values for \a top or \a base are true, then the cylinder will be
- created with solid endcaps. Otherwise, it shall form a hollow pipe.
-
- units on a side.
-*/
-
-
-/*!
- \fn qreal QGLCylinder::diameterTop() const
-
- Returns the diameter of the top of the cylinder.
-
- The default value is 1.
-
- \sa setDiameterTop()
-*/
-
-/*!
- \fn void QGLCylinder::setDiameterTop(qreal diameter)
-
- Sets the diameter of the top of this cylinder to \a diameter.
-
- \sa diameterTop()
-*/
-
-/*!
- \fn qreal QGLCylinder::diameterBottom() const
-
- Returns the diameter of the bottom of the cylinder.
-
- The default value is 1.
-
- \sa setDiameterBottom()
-*/
-
-/*!
- \fn void QGLCylinder::setDiameterBottom(qreal diameter)
-
- Sets the diameter of the bottom of this cylinder to \a diameter.
-
- \sa diameterBottom()
-*/
-
-/*!
- \fn qreal QGLCylinder::height() const
-
- Returns the height of the cylinder.
-
- The default value is 1.0
-
- \sa setDiameterBottom()
-*/
-
-/*!
- \fn void QGLCylinder::setHeight(qreal height)
-
- Sets the height of this cylinder to \a height.
-
- \sa diameterBottom()
-*/
-
-
-/*!
- \fn int QGLCylinder::slices() const
-
- Returns the number of triangular slices the cylinder is divided into
- around its polar axis.
-
- The default is 6.
-
- \sa setSlices()
-*/
-
-/*!
- \fn int QGLCylinder::setSlices(int slices)
-
- Sets the number of triangular \a slices the cylinder is divided into
- around its polar axis.
-
- \sa slices()
-*/
-
-/*!
- \fn int QGLCylinder::layers() const
-
- Returns the number of cylindrical layers the cylinder is divided into
- along its height.
-
- The default is 3.
-
- \sa setLayers()
-*/
-
-/*!
- \fn int QGLCylinder::setLayers(int layers)
-
- Sets the number of stacked \a layers the cylinder is divided into
- along its height.
-
- \sa layers()
-*/
-
-/*!
- \fn bool QGLCylinder::topEnabled() const
-
- Returns true if the top of the cyclinder will be created when
- building the mesh.
-
- The default is true.
-
- \sa setTopEnabled()
-*/
-
-/*!
- \fn void QGLCylinder::setTopEnabled(bool top)
-
- Set whether the top end-cap of the cylinder will be created when
- building the mesh. If \a top is true, the end-cap will be created.
-
- \sa topEnabled()
-*/
-
-/*!
- \fn bool QGLCylinder::baseEnabled() const
-
- Returns true if the base of the cyclinder will be created when
- building the mesh.
-
- The default is true.
-
- \sa setBaseEnabled()
-*/
-
-/*!
- \fn void QGLCylinder::setBaseEnabled(bool base)
-
- Set whether the base end-cap of the cylinder will be created when
- building the mesh. If \a base is true, the end-cap will be created.
-
- \sa baseEnabled()
-*/
-
-/*!
- \relates QGLCylinder
-
- Builds the geometry for \a cylinder within the specified
- geometry \a builder.
-*/
-
-QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder)
-{
- /* WALBERLA_ASSERT(cylinder.diameterBottom()>=0 &&
- cylinder.diameterTop()>=0 &&
- cylinder.height()>0);*/
-
- qreal numSlices = qreal(cylinder.slices());
- qreal numLayers = qreal(cylinder.layers());
- qreal topRadius = cylinder.diameterTop()/2.0;
- qreal bottomRadius = cylinder.diameterBottom()/2.0;
-
- qreal angle = 0;
- qreal angleIncrement = (2.0 * M_PI) / numSlices;
- qreal radius = topRadius;
- qreal radiusIncrement = qreal(bottomRadius-topRadius)/ numLayers;
- qreal height = qreal(cylinder.height());
- qreal heightDecrement = height/numLayers;
- height *= 0.5;
-
- qreal textureHeight = 1.0;
- qreal textureDecrement = 1.0/numLayers;
-
- QGeometryData oldLayer;
-
- //Generate vertices for the next layer of cylinder
- for (int layerCount=0; layerCount<=cylinder.layers(); layerCount++) {
- QGeometryData newLayer;
-
- //Generate a circle of vertices for this layer.
- for (int i=0; i<cylinder.slices(); i++)
- {
- newLayer.appendVertex(QVector3D(radius * qCos(angle),
- radius * qSin(angle),
- height));
- angle+=angleIncrement;
- }
- angle = 0;
- // Generate texture coordinates (including an extra seam vertex for textures).
- newLayer.appendVertex(newLayer.vertex(0));
- newLayer.generateTextureCoordinates();
- for (int i = 0; i < newLayer.count(); i++) newLayer.texCoord(i).setY(textureHeight);
-
- //Special cases for top end-cap
- if (layerCount==0 && cylinder.topEnabled()) {
- //Draw end-cap at top
- QGeometryData top;
- builder.newSection();
- builder.currentNode()->setObjectName("Cylinder Top");
- top.appendVertex(newLayer.center());
- top.appendVertexArray(newLayer.vertices());
- //Generate a circle of texture vertices for this layer.
- top.appendTexCoord(QVector2D(0.5,0.5));
-
- for (int i=1; i<top.count(); i++)
- {
- top.appendTexCoord(QVector2D(0.5*qCos(angle)+0.5, 0.5*qSin(angle)+0.5));
- angle+=angleIncrement;
- }
- angle = 0;
- builder.addTriangulatedFace(top);
- }
-
-
- //Add a new cylinder layer to the mesh
- if (layerCount>0)
- {
- //If it's the first section, create a cylinder sides section
- if (layerCount==1) {
- builder.newSection();
- builder.currentNode()->setObjectName("Cylinder Sides");
- }
- builder.addQuadsInterleaved(oldLayer, newLayer);
- }
-
- //Special cases for bottom end-cap
- if (layerCount==cylinder.layers() && cylinder.baseEnabled()) {
- //Draw end-cap at bottom
- QGeometryData base;
- builder.newSection();
- builder.currentNode()->setObjectName("Cylinder Base");
- base.appendVertexArray(newLayer.vertices());
- base.appendVertex(newLayer.center());
- //Generate a circle of texture vertices for this layer.
- for (int i=1; i<base.count(); i++)
- {
- base.appendTexCoord(QVector2D(0.5*qCos(angle)+0.5, 0.5*qSin(angle)+0.5));
- angle+=angleIncrement;
- }
- base.appendTexCoord(QVector2D(0.5,0.5));
- angle = 0;
-
- //we need to reverse the above to draw it properly - windings!
- builder.addTriangulatedFace(base.reversed());
- }
-
- //Keep the current layer for drawing the next segment of the cylinder
- oldLayer.clear();
- oldLayer.appendGeometry(newLayer);
- radius+=radiusIncrement;
- height-=heightDecrement;
- textureHeight-=textureDecrement;
- }
-
- return builder;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglcylinder.h b/src/gui/extern/Qt3D/geometry/qglcylinder.h
deleted file mode 100644
index 78301f3c0924843863f04c480df42b442405a831..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglcylinder.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCYLINDER_H
-#define QGLCYLINDER_H
-
-#include "qt3dglobal.h"
-#include "qglmaterialcollection.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLBuilder;
-class QVector2D;
-
-class Q_QT3D_EXPORT QGLCylinder
-{
-public:
- explicit QGLCylinder(qreal diameterTop = 1.0f, qreal diameterBase = 1.0f, qreal height = 1.0f, int slices = 6, int layers = 3, bool top = true, bool base = true)
- : m_diameterTop(diameterTop), m_diameterBottom(diameterBase), m_height(height), m_slices(slices), m_layers(layers), m_top(top), m_base(base) {}
-
- //Cylinder dimensions
- qreal diameterTop() const {return m_diameterTop;}
- void setDiameterTop(qreal diameter) {m_diameterTop=diameter;}
-
- qreal diameterBottom() const {return m_diameterBottom;}
- void setDiameterBottom(qreal diameter) {m_diameterBottom=diameter;}
-
- qreal height() const {return m_height;}
- void setHeight(qreal height) {m_height = height;}
-
- //Cylinder geometrical subdivisions
- int slices() const {return m_slices;}
- void setSlices(int slices) {m_slices = slices;}
-
- int layers() const {return m_layers;}
- void setLayers(int layers) {m_layers = layers;}
-
- //End-caps attached?
- bool topEnabled() const {return m_top;}
- void setTopEnabled(bool top) {m_top = top;}
-
- bool baseEnabled() const {return m_base;}
- void setBaseEnabled(bool base) {m_base = base;}
-
-protected:
- qreal m_diameterTop;
- qreal m_diameterBottom;
- qreal m_height;
-
- int m_slices;
- int m_layers;
-
- bool m_top;
- bool m_base;
-};
-
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLCYLINDER_H
diff --git a/src/gui/extern/Qt3D/geometry/qgldome.cpp b/src/gui/extern/Qt3D/geometry/qgldome.cpp
deleted file mode 100644
index ad63dac5dea86b19cfadd46ebc5ce107ab728797..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qgldome.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgldome.h"
-#include "qglbuilder.h"
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLDome
- \brief The QGLDome class represents the geometry of a simple hemisphere in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The following example creates a dome of 2 units in diameter and
- draws it at (10, 25, 0) in a QGLPainter:
-
- \code
- QGLBuilder builder;
- builder << QGLDome(2);
- QGLSceneNode *node = builder.finalizedSceneNode();
-
- // view the dome structure during development
- qDumpScene(node);
-
- painter.translate(10, 25, 0);
- node->draw(&painter);
- \endcode
-
- The QGLDome class specifies positions, normals and 2D texture
- co-ordinates for all of the vertices that make up the sphere.
-
- The texture co-ordinates are fixed at construction time. This
- is because constructing the sphere can involve generating additional
- vertices which need to interpolate the texture co-ordinates of their
- neighboring vertices.
-
- The default mode of QGLDome is half of a "UV sphere", which divides
- the object up into longitudinal and latitudinal sections. The longitudinal
- slices meet at the pole, which in a single unit dome is defined to
- be at (0, 0, +0.5) and (0, 0, -0.5). This choice is the simplest to
- texture map as the texture will only distort along the x-axis of the
- 2D texture. However the density of vertices is significantly higher at
- the poles than it is elsewhere on the sphere and is a poor choice if a
- uniform density of pixels from the texture map is required.
-
- \section1 Dome Sections and Non-Trivial Scene Structure
-
- When the dome is placed in the builder, by necessity separate sections are created
- so that the correct hard edge for the normals is rendered. If there were no
- sections, the smooth shading would try to make the dome surface and its flat base
- all part of a smoothly shaded surface instead of having a sharp crease between them.
-
- Because of this necessary limitation when working with QGLDome always examine the
- generate node structure using the qDumpScene() function, as shown above. This will
- display the structure of the generated sections by their named scenenodes,and quickly
- make obvious what required code is needed to render the scene as desired.
-
- In the simplest case disable the base of the dome so that only one simple node is
- generated, and get a handle to this node via builder.currentNode(). Alternatively
- use seperate builder objects and finalizedSceneNode() calls to obtain distinct
- nodes - these will have Base and Dome sibling objects beneath them.
-
- For other options see \l{QGLCylinder#analysing-and-re-organising-scenes}{Analysing and Re-organising Scenes} in the QGLCylinder class
- documentation.
-
- Executive summary - use qDumpScene();
-
- \sa QGLBuilder, QGLCylinder
-*/
-
-/*!
- \fn QGLDome::QGLDome(qreal diameter, int depth, bool base)
-
- Creates a dome of \a diameter across (default is 1). When the dome
- is recursively subdivided into triangles, it will be subdivided no more
- than \a depth times (between 1 and 5, default is 3).
-
- If \a base is true, the dome will be drawn with a bottom circle, creating
- an enclosed solid.
-*/
-
-/*!
- Destroys this dome object.
-*/
-QGLDome::~QGLDome()
-{
-}
-
-/*!
- \fn qreal QGLDome::diameter() const
-
- Returns the diameter of this dome. The default is 1.
-
- \sa setDiameter()
-*/
-
-/*!
- \fn void QGLDome::setDiameter(qreal diameter)
-
- Sets the diameter of this dome to \a diameter.
-
- \sa diameter()
-*/
-
-/*!
- \fn int QGLDome::subdivisionDepth() const
-
- Returns the maximum depth when this hemisphere is subdivided into
- triangles. The default is 3. The following picture shows the effect
- of depth values between 1 and 5 for a UV sphere (hemisphere subdivision
- depth shares this scheme).
-
- \image sphere-detail.png
-
- \sa setSubdivisionDepth(), QGLSphere::subdivisionDepth()
-*/
-
-/*!
- \fn void QGLDome::setSubdivisionDepth(int depth)
-
- Sets the maximum \a depth when this hemisphere is subdivided into triangles.
-
- \sa subdivisionDepth()
-*/
-
-/*!
- \fn bool QGLDome::baseEnabled() const
-
- Returns true if the base of the dome will be created when
- building the mesh.
-
- The default is true.
-
- \sa setBaseEnabled()
-*/
-
-/*!
- \fn void QGLDome::setBaseEnabled(bool base)
-
- Set whether the bottom of the dome will be created when
- building the mesh. If \a base is true, the end-cap will be
- created.
-
- \sa baseEnabled()
-*/
-
-/*!
- \relates QGLDome
-
- Builds the geometry for \a dome within the specified
- geometry \a builder.
-*/
-QGLBuilder& operator<<(QGLBuilder& builder, const QGLDome& dome)
-{
- qreal radius = dome.diameter() / 2.0f;
-
- // Determine the number of slices and stacks to generate.
- int divisions = dome.subdivisionDepth();
- if (divisions < 1)
- divisions = 1;
- else if (divisions > 5)
- divisions = 5;
- int stacks = 2 * (1 << divisions);
- int slices = 2 * stacks;
- stacks = stacks>>1;
-
- // Precompute sin/cos values for the slices and stacks.
- const int maxSlices = 4 * (1 << 5) + 1;
- const int maxStacks = 2 * (1 << 5) + 1;
- qreal sliceSin[maxSlices];
- qreal sliceCos[maxSlices];
- qreal stackSin[maxStacks];
- qreal stackCos[maxStacks];
- for (int slice = 0; slice < slices; ++slice) {
- qreal angle = 2 * M_PI * slice / slices;
- sliceSin[slice] = qFastSin(angle);
- sliceCos[slice] = qFastCos(angle);
- }
- sliceSin[slices] = sliceSin[0]; // Join first and last slice.
- sliceCos[slices] = sliceCos[0];
-
- const qreal halfPi=M_PI/2.0;
-
- for (int stack = 0; stack <= stacks; ++stack) {
- qreal angle = halfPi * stack / stacks;
- stackSin[stack] = qFastSin(angle);
- stackCos[stack] = qFastCos(angle);
- }
- stackSin[0] = 0.0f; // Come to a point at the poles.
- stackSin[stacks] = 1.0f;
-
- builder.newSection();
- builder.currentNode()->setObjectName("Dome");
- // Create the stacks for the dome part of the dome
- for (int stack = 0; stack < stacks; ++stack) {
- QGeometryData prim;
- qreal z = radius * stackCos[stack];
- qreal nextz = radius * stackCos[stack + 1];
- qreal s = stackSin[stack];
- qreal nexts = stackSin[stack + 1];
- qreal c = stackCos[stack];
- qreal nextc = stackCos[stack + 1];
- qreal r = radius * s;
- qreal nextr = radius * nexts;
- for (int slice = 0; slice <= slices; ++slice) {
- prim.appendVertex(QVector3D(nextr * sliceSin[slice], nextr * sliceCos[slice], nextz));
- prim.appendNormal(QVector3D(sliceSin[slice] * nexts, sliceCos[slice] * nexts, nextc));
- prim.appendTexCoord(QVector2D(1.0f - qreal(slice) / slices, 1.0f - qreal(stack + 1) / stacks));
-
- prim.appendVertex(QVector3D(r * sliceSin[slice], r * sliceCos[slice], z));
- prim.appendNormal(QVector3D(sliceSin[slice] * s, sliceCos[slice] * s, c));
- prim.appendTexCoord(QVector2D(1.0f - qreal(slice) / slices, 1.0f - qreal(stack) / stacks));
- }
- builder.addQuadStrip(prim);
- }
-
- if (dome.baseEnabled()) {
- //Draw end-cap at bottom
- builder.newSection();
- builder.currentNode()->setObjectName("Base");
-
- //Generate a circle of vertices for this layer.
- QGeometryData tempBase;
-
- tempBase.appendVertex(QVector3D(0,0,0));
- tempBase.appendTexCoord(QVector2D(0.5,0.5));
- for (int slice=0; slice<=slices+1; slice++)
- {
- tempBase.appendVertex(QVector3D(radius * sliceCos[slice], radius * sliceSin[slice], 0));
- tempBase.appendTexCoord(QVector2D(0.5*sliceCos[slice]+0.5, 0.5*sliceSin[slice]+0.5));
- }
-
- //we need to reverse the above to draw it properly - windings!
- builder.addTriangulatedFace(tempBase.reversed());
- }
- return builder;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/Qt3D/geometry/qgldome.h b/src/gui/extern/Qt3D/geometry/qgldome.h
deleted file mode 100644
index 69023d3ac035630aab149d80398aa30c3a37ee2a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qgldome.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLDOME_H
-#define QGLDOME_H
-
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLBuilder;
-
-class Q_QT3D_EXPORT QGLDome
-{
-public:
- explicit QGLDome(qreal diameter = 1.0f, int depth = 3, bool baseEnabled = true)
- : m_diameter(diameter), m_subdivisionDepth(depth), m_baseEnabled(baseEnabled) {}
- virtual ~QGLDome();
-
- qreal diameter() const { return m_diameter; }
- void setDiameter(qreal diameter) { m_diameter = diameter; }
-
- int subdivisionDepth() const { return m_subdivisionDepth; }
- void setSubdivisionDepth(int depth) { m_subdivisionDepth = depth; }
-
- bool baseEnabled() const {return m_baseEnabled; }
- void setBaseEnabled(bool baseEnabled) {m_baseEnabled = baseEnabled;}
-
-private:
- qreal m_diameter;
- int m_subdivisionDepth;
- bool m_baseEnabled;
-};
-
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGLDome& dome);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qglmaterialcollection.cpp b/src/gui/extern/Qt3D/geometry/qglmaterialcollection.cpp
deleted file mode 100644
index e49c87e251a5400dad82f3d1848620d78b0fa2d3..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglmaterialcollection.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglmaterialcollection.h"
-#include "qglmaterial_p.h"
-#include <QtCore/qlist.h>
-#include <QtCore/qhash.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLMaterialCollection
- \brief The QGLMaterialCollection class manages groups of materials.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::enablers
-
- Managing more complex 3d graphics with several materials is easier when the
- materials can be referred to as a collection. This is the role of the
- QGLMaterialCollection class.
-
- Plug-ins implementing 3D formats may make the materials defined in
- the format available to the application via a QGLMaterialCollection.
-
- The collection is also optimised for the case where many small objects
- must refer to materials - such as faces in a mesh, or particles. In
- this case the materials can be specified as a short data type using an
- offset into the collection, rather than the material name.
-
- When building up a collection, meshes that refer to the various materials
- can check off which ones are used by calling markMaterialAsUsed(), and then
- remove spurious unused materials by calling removeUnusedMaterials(). This
- technique is suitable for models loaded from a model file where a large
- number of materials may be specified but only a few of those materials
- are used by the particular mesh selected from the scene.
-
- To make a material available from a collection, call addMaterial(). To
- retrieve a material from the collection call removeMaterial().
-
- The collection takes ownership of the QGLMaterial
- objects passed to it by the addMaterial() function. These
- objects will be destroyed when the collection is destroyed.
-*/
-
-class QGLMaterialCollectionPrivate
-{
-public:
- QGLMaterialCollectionPrivate()
- {
- }
-
- QList<QGLMaterial *> materials;
- QHash<QString, int> materialNames;
-};
-
-/*!
- Construct a new empty QGLMaterialCollection object. The \a parent
- is set as the parent of this object.
-*/
-QGLMaterialCollection::QGLMaterialCollection(QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLMaterialCollectionPrivate)
-{
-}
-
-/*!
- Destroy this collection. All material objects referred to by this
- collection will be destroyed.
-*/
-QGLMaterialCollection::~QGLMaterialCollection()
-{
- // The QGLMaterial QObject's are reparented to the collection
- // when addMaterial() is called, so the QObject destructor
- // will take care of cleaning them up for us.
-}
-
-/*!
- Returns a pointer to the material corresponding to \a index; or null
- if \a index is out of range or the material has been removed.
-
- Here's an example of searching for a material with a given ambient
- \c{color} in the collection \c{materials}:
-
- \code
- for (int colorIndex; colorIndex < materials->size(); ++colorIndex) {
- if (material(colorIndex) &&
- material(colorIndex)->ambientColor() == color)
- break;
- }
- if (colorIndex < materials->size())
- myObject->setMaterial(colorIndex);
- \endcode
-*/
-QGLMaterial *QGLMaterialCollection::material(int index) const
-{
- Q_D(const QGLMaterialCollection);
- return d->materials.value(index, 0);
-}
-
-/*!
- \overload
-
- Returns the material associated with \a name in this collection;
- null if \a name is not present or the material has been removed.
-*/
-QGLMaterial *QGLMaterialCollection::material(const QString &name) const
-{
- Q_D(const QGLMaterialCollection);
- int index = d->materialNames.value(name, -1);
- if (index >= 0)
- return d->materials[index];
- else
- return 0;
-}
-
-/*!
- Returns true if this collection contains \a material; false otherwise.
-
- \sa indexOf()
-*/
-bool QGLMaterialCollection::contains(QGLMaterial *material) const
-{
- return material && material->d_func()->collection == this;
-}
-
-/*!
- \overload
-
- Returns true if this collection contains a material called \a name;
- false otherwise.
-
- \sa indexOf()
-*/
-bool QGLMaterialCollection::contains(const QString &name) const
-{
- Q_D(const QGLMaterialCollection);
- return d->materialNames.contains(name);
-}
-
-/*!
- Returns the index of \a material in this collection; -1 if
- \a material is not present in this collection.
-
- \sa contains()
-*/
-int QGLMaterialCollection::indexOf(QGLMaterial *material) const
-{
- if (material && material->d_func()->collection == this)
- return material->d_func()->index;
- else
- return -1;
-}
-
-/*!
- \overload
-
- Returns the index of the material called \a name in this collection;
- -1 if \a name is not present in this collection.
-
- \sa contains()
-*/
-int QGLMaterialCollection::indexOf(const QString &name) const
-{
- Q_D(const QGLMaterialCollection);
- return d->materialNames.value(name, -1);
-}
-
-/*!
- Returns the name of the material at \a index in this material collection;
- a null QString if \a index is out of range.
-*/
-QString QGLMaterialCollection::materialName(int index) const
-{
- Q_D(const QGLMaterialCollection);
- if (index >= 0 && index < d->materials.count()) {
- QGLMaterial *material = d->materials[index];
- if (material) {
- // Use the name in the private data block just in case the
- // application has modified objectName() since adding.
- return material->d_func()->name;
- }
- }
- return QString();
-}
-
-/*!
- Returns true if the material at \a index in this collection has been
- marked as used by markMaterialAsUsed().
-
- \sa markMaterialAsUsed()
-*/
-bool QGLMaterialCollection::isMaterialUsed(int index) const
-{
- QGLMaterial *mat = material(index);
- if (mat)
- return mat->d_func()->used;
- else
- return false;
-}
-
-/*!
- Flags the material corresponding to the \a index as used. Some model files
- may contain a range of materials, applying to various objects in the scene.
-
- When a particular object is loaded from the file, many of those
- materials may not be used in that object. This wastes space,
- with many spurious materials being stored.
-
- Use this method during model loading or construction to mark off
- materials that have been used. Materials so marked will not
- be removed by removeUnusedMaterials().
-
- \sa removeUnusedMaterials(), isMaterialUsed()
-*/
-void QGLMaterialCollection::markMaterialAsUsed(int index)
-{
- QGLMaterial *mat = material(index);
- if (mat)
- mat->d_func()->used = true;
-}
-
-/*!
- Removes and deletes materials which have not been marked as used.
-
- \sa markMaterialAsUsed(), isMaterialUsed()
-*/
-void QGLMaterialCollection::removeUnusedMaterials()
-{
- Q_D(QGLMaterialCollection);
- for (int index = 0; index < d->materials.size(); ++index) {
- QGLMaterial *material = d->materials[index];
- if (material && !material->d_func()->used)
- delete removeMaterial(index);
- }
-}
-
-/*!
- Adds \a material to this collection and returns its new index. The
- collection takes ownership of the material and will delete it when the
- collection is destroyed. Initially the \a material is marked as unused.
-
- The QObject::objectName() of \a material at the time addMaterial()
- is called will be used as the material's name within this collection.
- Changes to the object name after the material is added are ignored.
-
- If \a material is already present in this collection, then this
- function will return the index that was previously assigned.
-
- Returns -1 if \a material has been added to another collection.
-
- \sa removeMaterial(), markMaterialAsUsed()
-*/
-int QGLMaterialCollection::addMaterial(QGLMaterial *material)
-{
- Q_D(QGLMaterialCollection);
- Q_ASSERT(material);
-
- // Allocate a new index for the material.
- int index = d->materials.count();
-
- // Record the index in the private data attached to the material.
- // This allows us to find the material's index quickly later.
- QGLMaterialPrivate *dm = material->d_func();
- if (dm->collection) {
- if (dm->collection == this)
- return dm->index;
- return -1;
- }
- dm->collection = this;
- dm->index = index;
- dm->name = material->objectName();
- dm->used = false;
-
- // Add the material to this collection.
- material->setParent(this);
- d->materials.append(material);
- if (!dm->name.isEmpty())
- d->materialNames[dm->name] = index;
- connect(material, SIGNAL(destroyed()), this, SLOT(materialDeleted()));
- return index;
-}
-
-/*!
- Removes all instances of \a material from this collection.
- The \a material object is not deleted and can be reused.
-
- Does nothing if \a material is null or not a member of
- this collection.
-
- \sa addMaterial()
-*/
-void QGLMaterialCollection::removeMaterial(QGLMaterial *material)
-{
- Q_D(QGLMaterialCollection);
- if (!material)
- return;
-
- // Check the material's owning collection.
- QGLMaterialPrivate *dm = material->d_func();
- if (dm->collection != this)
- return;
-
- // Remove the material from the collection.
- d->materials[dm->index] = 0;
- if (!dm->name.isEmpty())
- d->materialNames.remove(dm->name);
- material->setParent(0);
-
- // Detach from the owning collection.
- dm->collection = 0;
- dm->index = -1;
-}
-
-/*!
- Removes the material at \a index from this collection, and returns
- a pointer to the material.
-
- Since the collection is designed for fast lookup by index, the
- the stored material pointer is set to null but the \a index
- otherwise remains valid.
-*/
-QGLMaterial *QGLMaterialCollection::removeMaterial(int index)
-{
- Q_D(QGLMaterialCollection);
-
- // Bail out if the material is invalid.
- if (index < 0 || index >= d->materials.count())
- return 0;
- QGLMaterial *material = d->materials[index];
- if (!material)
- return 0;
-
- // Remove the material from the collection.
- QGLMaterialPrivate *dm = material->d_func();
- d->materials[index] = 0;
- if (!dm->name.isEmpty())
- d->materialNames.remove(dm->name);
- material->setParent(0);
-
- // Detach from the owning collection.
- dm->collection = 0;
- dm->index = -1;
- return material;
-}
-
-/*!
- Returns true if this collection is empty, false otherwise.
-
- \sa size()
-*/
-bool QGLMaterialCollection::isEmpty() const
-{
- Q_D(const QGLMaterialCollection);
- return d->materials.isEmpty();
-}
-
-/*!
- Returns the number of (possibly null) materials in this collection.
- Null materials result from calling removeMaterial().
-
- \sa isEmpty()
-*/
-int QGLMaterialCollection::size() const
-{
- Q_D(const QGLMaterialCollection);
- return d->materials.size();
-}
-
-/*!
- \internal
- Responds to the destroyed() signal by calling removeMaterial() on the
- material about to be deleted;
-*/
-void QGLMaterialCollection::materialDeleted()
-{
- removeMaterial(qobject_cast<QGLMaterial *>(sender()));
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglmaterialcollection.h b/src/gui/extern/Qt3D/geometry/qglmaterialcollection.h
deleted file mode 100644
index b7294e06bdff3fc554110dc7caa0fa19643eb6b6..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglmaterialcollection.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLMATERIALCOLLECTION_H
-#define QGLMATERIALCOLLECTION_H
-
-#include <QtCore/qobject.h>
-
-#include "qt3dglobal.h"
-#include "qglmaterial.h"
-#include "qgltexture2d.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLMaterialCollectionPrivate;
-
-class Q_QT3D_EXPORT QGLMaterialCollection : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLMaterialCollection)
- Q_DISABLE_COPY(QGLMaterialCollection)
-public:
- QGLMaterialCollection(QObject *parent = 0);
- virtual ~QGLMaterialCollection();
-
- QGLMaterial *material(int index) const;
- QGLMaterial *material(const QString &name) const;
-
- bool contains(QGLMaterial *material) const;
- bool contains(const QString &name) const;
-
- int indexOf(QGLMaterial *material) const;
- int indexOf(const QString &name) const;
-
- QString materialName(int index) const;
-
- bool isMaterialUsed(int index) const;
- void markMaterialAsUsed(int index);
- void removeUnusedMaterials();
-
- int addMaterial(QGLMaterial *material);
- void removeMaterial(QGLMaterial *material);
- QGLMaterial *removeMaterial(int index);
-
- bool isEmpty() const;
- int size() const;
-
-private Q_SLOTS:
- void materialDeleted();
-
-private:
- QScopedPointer<QGLMaterialCollectionPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLMATERIALCOLLECTION_H
diff --git a/src/gui/extern/Qt3D/geometry/qglsection.cpp b/src/gui/extern/Qt3D/geometry/qglsection.cpp
deleted file mode 100644
index ea6583daf84582c6a77af02d4a2b97a669fde8fb..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglsection.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglsection_p.h"
-#include "qglbuilder_p.h"
-#include "qarray.h"
-#include "qvector_utils_p.h"
-
-#include <QtGui/qvector3d.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qpointer.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qbitarray.h>
-
-#include <limits.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \internal
- \class QGLSection
- \brief The QGLSection class clusters like geometry in a QGLBuilder.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- QGLSection instances partition a QGLBuilder into related sections,
- while the builder is being initialized with geometry data.
-
- Once the builder is initialized, and geometry building is complete
- the QGLSection instances are destroyed and the data is uploaded to the
- graphics hardware.
-
- The QGLSection class is a work horse for the QGLBuilder, and it
- takes care of automatically managing vertex data. As such
- for usual use cases, its functionality will not need to be referenced
- directly. For low-level access to geometry, QGLSection provides a
- range of accessors to reference geometry data during scene building.
-
- Within a section, incoming geometry data will be coalesced and
- indexes created to reference the fewest possible copies of the vertex
- data. For example, in smooth geometry all copies of a vertex are
- coalesced into one, and referenced by indices - except in the case
- where texture data forms a \i seam and a copy must be created to carry
- the two texture coordinates of the seam.
-
- This is handled automatically by QGLSection, to pack data into the
- smallest space possible thus improving cache coherence and performance.
-
- All the vertices in a QGLSection are treated with the same
- \l{QGL::Smoothing}{smoothing}, and have the same
- \l{QLogicalVertex::Type}{data types}.
-
- Each QGLSection references a contiguous range of vertices in a
- QGLBuilder.
-
- A QGLBuilder instance has the \l{QGLBuilder::newSection()}{newSection()}
- function which creates a new QGLSection to reference its data. Use this
- to construct new QGLSection instances, or alternatively construct
- a new QGLSection() and pass a non-null QGLBuilder pointer.
-
- These functions all return QVector values. QVector instances are
- implicitly shared, thus the copies are inexpensive unless a
- non-const function is called on them, triggering a copy-on-write.
-
- Generally for adding geometry, use append(). This function simply
- calls virtual protected functions appendSmooth() (for smoothed vertices)
- and appendFaceted() (for faceted vertices). See QGLBuilder for a
- discussion of smoothing.
-*/
-
-// allow QVector3D's to be stored in a QMap
-inline bool operator<(const QVector3D &a, const QVector3D &b)
-{
- if (qFskCompare(a.x(), b.x()))
- {
- if (qFskCompare(a.y(), b.y()))
- {
- if (qFskCompare(a.z(), b.z()))
- {
- return false; // equal so not less-than
- }
- else
- {
- return a.z() < b.z();
- }
- }
- else
- {
- return a.y() < b.y();
- }
- }
- else
- {
- return a.x() < b.x();
- }
-}
-
-static inline bool qSameDirection(const QVector3D &a , const QVector3D &b)
-{
- bool res = false;
- if (!a.isNull() && !b.isNull())
- {
- float dot = QVector3D::dotProduct(a, b);
- res = qFskCompare((qreal)dot, a.length() * b.length());
- }
- return res;
-}
-
-class QGLSectionPrivate
-{
-public:
- QGLSectionPrivate(const QVector3DArray *ary)
- : vec_data(ary)
- , it(vec_map.end())
- , map_threshold(5)
- , number_mapped(0)
- , start_ptr(-1)
- , end_ptr(-1)
- {
- normIndices.fill(-1, 32);
- }
-
- ~QGLSectionPrivate() {}
-
- bool normalAccumulated(int index, const QVector3D &norm) const
- {
- if (index >= normIndices.size())
- return false;
- int ptr = normIndices.at(index);
- while (ptr != -1)
- {
- int val_ptr = normPtrs.at(ptr);
- //if (normValues.at(val_ptr) == norm)
- if (qSameDirection(normValues.at(val_ptr), norm))
- return true;
- ptr = normPtrs.at(ptr+1);
- }
- return false;
- }
-
- void accumulateNormal(int index, const QVector3D &norm)
- {
- int new_norm_index = normValues.size();
- normValues.append(norm);
- if (normIndices.size() <= index)
- {
- int old_size = normIndices.size();
- normIndices.extend(32);
- for (int i = old_size; i < normIndices.size(); ++i)
- normIndices[i] = -1;
- }
- int new_norm_ptr = normPtrs.size();
- normPtrs.append(new_norm_index); // even ptrs point to vector value
- normPtrs.append(-1); // odd ptrs point to next in normPtr linked list
- if (normIndices.at(index) == -1)
- {
- normIndices[index] = new_norm_ptr;
- }
- else
- {
- int norm_ptr = normIndices.at(index);
- while (normPtrs.at(norm_ptr + 1) != -1)
- {
- norm_ptr = normPtrs.at(norm_ptr + 1);
- }
- normPtrs[norm_ptr+1] = new_norm_ptr;
- }
- }
-
- void mapVertex(const QVector3D &v, int ix)
- {
- Q_UNUSED(ix);
- Q_UNUSED(v);
- static bool seeded = false;
- if (!seeded)
- qsrand(31415);
- Q_ASSERT(vec_data->at(ix) == v);
- if ((vec_data->size() - number_mapped) > map_threshold)
- {
- int to_map = vec_data->size() - number_mapped;
- QArray<int, 100> shuffle(to_map, -1);
- for (int i = number_mapped, k = 0; i < vec_data->size(); ++i, ++k)
- shuffle[k] = i;
- for (int n = to_map; n > 1; --n)
- {
- int k = qrand() % n;
- int tmp = shuffle[k];
- shuffle[k] = shuffle[n - 1];
- shuffle[n - 1] = tmp;
- }
- for (int i = 0; i < to_map; ++i)
- vec_map.insertMulti(vec_data->at(shuffle.at(i)), shuffle.at(i));
- number_mapped += to_map;
- }
- }
-
- int nextIndex()
- {
- int result = -1;
- if (end_ptr != -1)
- {
- // first look through the unmapped items
- while (start_ptr <= end_ptr && result == -1)
- {
- // search from the end and beginning, favouring the end - most often
- // its in the last few we added, sometimes in the first ones
- if (qFskCompare(vec_data->at(end_ptr--), target))
- result = end_ptr+1;
- else if (start_ptr <= end_ptr && qFskCompare(vec_data->at(end_ptr--), target))
- result = end_ptr+1;
- else if (start_ptr <= end_ptr && qFskCompare(vec_data->at(start_ptr++), target))
- result = start_ptr-1;
- }
- // if that found nothing, have a look at the map
- if (result == -1)
- {
- start_ptr = -1;
- end_ptr = -1;
- it = vec_map.constEnd();
- if (vec_map.size() > 0)
- it = vec_map.find(target);
- }
- }
- if (it != vec_map.constEnd())
- {
- // if there was something in the map see if its still on target
- if (qFskCompare(it.key(), target))
- {
- result = it.value();
- ++it; // increment to find more insertMulti instances
- }
- else
- {
- // not on target - flag that we're done here
- it = vec_map.constEnd();
- }
- }
- return result;
- }
-
- int findVertex(const QVector3D &v)
- {
- end_ptr = vec_data->size() - 1; // last one not in QMap
- start_ptr = number_mapped; // first one not in QMap
- target = v;
- return nextIndex();
- }
-
- // mapper
- int index;
- QVector3D target;
- const QVector3DArray *vec_data;
- QMap<QVector3D, int> vec_map;
- QMap<int, int> index_map;
- QMap<QVector3D,int>::const_iterator it;
- int map_threshold; // if more than this is unmapped, do a mapping run
- int number_mapped; // how many vertices have been mapped
- int start_ptr;
- int end_ptr;
-
- QArray<int, 32> normIndices;
- QArray<int, 32> normPtrs;
- QArray<QVector3D, 32> normValues;
-
- QList<QGLSceneNode*> nodes;
-};
-
-/*!
- \internal
- Construct a new QGLSection on \a builder, and with smoothing \a s.
- By default the smoothing is QGL::Smooth.
-
- See QGLBuilder for a discussion of smoothing.
-
- The pointer \a list must be non-null, and in debug mode, unless QT_NO_DEBUG is
- defined, this function will assert if \a list is null.
-
- The following lines of code have identical effect:
- \code
- QGLSection *s = myDisplayList->newSection(QGL::Faceted);
- QGLSection *s2 = new QGLSection(myDisplayList, QGL::Faceted);
- \endcode
-*/
-QGLSection::QGLSection(QGLBuilder *builder, QGL::Smoothing s)
- : m_smoothing(s)
- , d(0)
-{
- Q_ASSERT(builder);
- enableField(QGL::Position);
- Q_ASSERT(vertexData());
- d = new QGLSectionPrivate(vertexData());
- builder->addSection(this);
-}
-
-/*!
- \internal
- Destroy this QGLSection, recovering any resources.
-*/
-QGLSection::~QGLSection()
-{
- delete d;
-}
-
-/*!
- \internal
- Reserve capacity for \a amount items. This may avoid realloc
- overhead when a large number of items will be appended.
-*/
-void QGLSection::reserve(int amount)
-{
- QGeometryData::reserve(amount);
- d->normIndices.reserve(amount);
- d->normPtrs.reserve(amount * 2);
- d->normValues.reserve(amount);
-}
-
-/*!
- \internal
- Adds the logical vertices \a a, \a b and \c to this section. All
- should have the same fields. This function is exactly equivalent to
- \code
- append(a); append(b); append(c);
- \endcode
-
- \sa appendSmooth(), appendFaceted()
-*/
-void QGLSection::append(const QLogicalVertex &a, const QLogicalVertex &b, const QLogicalVertex &c)
-{
- Q_ASSERT(a.fields() == b.fields() && b.fields() == c.fields());
- if (!a.hasField(QGL::Normal))
- {
- appendFaceted(a, b, c);
- }
- else
- {
- if (m_smoothing == QGL::Smooth)
- appendSmooth(a, b, c);
- else
- appendFaceted(a, b, c);
- }
-}
-
-/*!
- \internal
- Adds the logical vertex \a lv to this section.
-
- Otherwise, if the \a lv does have a lighting normal; then the
- vertex processing depends on the smoothing property of this section.
- If this section has smoothing QGL::Smooth, then the append will be done
- by calling appendSmooth(); or if this section has smoothing QGL::Faceted,
- then the append will be done by calling appendFaceted().
-
- \sa appendSmooth(), appendFaceted()
-*/
-void QGLSection::append(const QLogicalVertex &lv)
-{
- if (!lv.hasField(QGL::Normal))
- {
- appendFaceted(lv);
- }
- else
- {
- if (m_smoothing == QGL::Smooth)
- appendSmooth(lv);
- else
- appendFaceted(lv);
- }
-}
-
-static bool qCompareByAttributes(const QLogicalVertex &a, const QLogicalVertex &b)
-{
- static const quint32 ATTRS_AND_TEXTURES = (0xFFFFFFFF << QGL::TextureCoord0);
- quint32 af = a.fields() & ATTRS_AND_TEXTURES;
- quint32 bf = b.fields() & ATTRS_AND_TEXTURES;
- if (af != bf)
- return false;
- quint32 flds = af | bf;
- const quint32 mask = 0x01;
- flds >>= QGL::TextureCoord0;
- for (int i = QGL::TextureCoord0; flds; ++i, flds >>= 1)
- {
- if (flds & mask)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(i);
- if (attr < QGL::CustomVertex0)
- {
- if (!qFskCompare(a.texCoord(attr), b.texCoord(attr)))
- return false;
- }
- else
- {
- QVariant v1 = a.attribute(attr);
- QVariant v2 = b.attribute(attr);
- if (v1.type() == (QVariant::Type)QMetaType::Float)
- return qFskCompare(v1.toFloat(), v2.toFloat());
- else if (v1.type() == QVariant::Vector2D)
- return qFskCompare(qVariantValue<QVector2D>(v1), qVariantValue<QVector2D>(v2));
- else if (v1.type() == QVariant::Vector3D)
- return qFskCompare(qVariantValue<QVector3D>(v1), qVariantValue<QVector3D>(v2));
- else
- return v1 == v2;
- }
- }
- }
- return true;
-}
-
-int QGLSection::appendOne(const QLogicalVertex &lv)
-{
-#ifndef QT_NO_DEBUG_STREAM
- if (count() && lv.fields() != fields())
- {
- qDebug() << "Warning: adding" << lv << "fields:" << lv.fields()
- << "fields do not match existing:" << fields()
- << "create new section first?";
- }
-#endif
- int index = appendVertex(lv);
- d->mapVertex(lv.vertex(), index);
- appendIndex(index);
- return index;
-}
-
-/*!
- \internal
- Adds the logical vertex \a lv to this section of a builder.
-
- Two QLogicalVertex instances a and b are treated as being duplicates for
- the purpose of smoothing, if \c{qFuzzyCompare(a.vertex(), b.vertex())} is
- true
-
- All duplicate occurrences of a vertex are coalesced, that is replaced
- by a GL index referencing the one copy.
-
- In order to draw \a lv as part of a smooth continuous surface, with
- no distinct edge, duplicates of vertex \a lv are coalesced into one
- (within this section) and the normal for that one set to the average of
- the incoming unique normals.
-
- The incoming vertex \a lv is not treated as a duplicate if \a lv has
- different texture coordinates or attributes. This occurs for example
- in the case of a texture seam, where two different texture coordinates
- are required at the same point on the geometry.
-
- In that case a new duplicate vertex is added to carry the unique
- texture coordinates or attributes. When new vertex copies are added in
- this way all copies receive the averaged normals.
-
- Call this function to add the vertices of a smooth face to the section
- of a builder, or use:
-
- \code
- myDisplayList->newSection(QGLBuilder::Smooth);
- myDisplayList->addTriangle(a, b, c);
- \endcode
-
- In smooth surfaces, the vertex and its normal is only sent to the
- graphics hardware once (not once per face), thus smooth geometry may
- consume fewer resources.
-
- \sa appendFaceted(), updateTexCoord(), QGLBuilder::newSection()
-*/
-void QGLSection::appendSmooth(const QLogicalVertex &lv)
-{
- Q_ASSERT(lv.hasField(QGL::Position));
- Q_ASSERT(lv.hasField(QGL::Normal));
-
- int found_index = d->findVertex(lv.vertex());
- bool coalesce = false;
- if (found_index == -1)
- {
- int newIndex = appendOne(lv);
- d->accumulateNormal(newIndex, lv.normal());
- }
- else
- {
- while (!coalesce && found_index != -1)
- {
- if (qCompareByAttributes(lv, logicalVertexAt(found_index)))
- coalesce = true;
- else
- found_index = d->nextIndex();
- }
- if (!coalesce) // texture or attributes prevented coalesce
- {
- // new vert to carry tex/attrib data
- d->accumulateNormal(appendOne(lv), lv.normal());
- }
- else
- {
- appendIndex(found_index);
- while (found_index != -1)
- {
- if (!d->normalAccumulated(found_index, lv.normal()))
- {
- normal(found_index) += lv.normal();
- d->accumulateNormal(found_index, lv.normal());
- }
- found_index = d->nextIndex();
- }
- }
- }
-}
-
-
-void QGLSection::appendSmooth(const QLogicalVertex &lv, int index)
-{
- Q_ASSERT(lv.hasField(QGL::Position));
- Q_ASSERT(lv.hasField(QGL::Normal));
-
- int found_index = -1;
- QMap<int, int>::const_iterator it = d->index_map.constFind(index);
- if (it != d->index_map.constEnd())
- found_index = it.value();
- if (found_index == -1)
- {
- int newIndex = appendVertex(lv);
- d->index_map.insert(index, newIndex);
- appendIndex(newIndex);
- d->accumulateNormal(newIndex, lv.normal());
- }
- else
- {
- appendIndex(found_index);
- if (!d->normalAccumulated(found_index, lv.normal()))
- {
- normal(found_index) += lv.normal();
- d->accumulateNormal(found_index, lv.normal());
- }
- }
-}
-
-/*!
- \internal
- Add the logical vertex \a lv to this section of a builder.
-
- The vertex will be drawn as a distinct edge, instead of just part of a
- continuous smooth surface. To acheive this the vertex value of \a lv
- is duplicated for each unique normal in the current section.
-
- Note that duplication is only for unique normals: if a vertex is already
- present with a given normal it is coalesced and simply referenced by index.
- As for appendSmooth() vertices are not coalesced in this way if \a lv
- has a different texture coordinate or attribute than its duplicate.
-
- In faceted surfaces, the vertex is sent to the graphics hardware once for
- each normal it has, and thus may consume more resources.
-
- \sa appendSmooth(), updateTexCoord(), QGLBuilder::newSection()
-*/
-void QGLSection::appendFaceted(const QLogicalVertex &lv)
-{
- Q_ASSERT(lv.hasField(QGL::Position));
- int found_index = d->findVertex(lv.vertex());
- bool coalesce = false;
- while (!coalesce && found_index != -1)
- {
- if (logicalVertexAt(found_index) == lv)
- coalesce = true;
- else
- found_index = d->nextIndex();
- }
- if (coalesce) // found
- {
- appendIndex(found_index);
- }
- else
- {
- appendOne(lv);
- }
-}
-
-/*!
- \internal
- Returns the current map threshold for this section. The threshold is the
- point at which the section switches from using a plain QArray - with
- linear performance ie O(n) - to using a QMap - with approx O(log n). These
- structures are used for looking up vertices during the index generation and
- normals calculation.
-
- The default value is 50.
-
- \sa setMapThreshold()
-*/
-int QGLSection::mapThreshold() const
-{
- return d->map_threshold;
-}
-
-/*!
- \internal
- Sets the current map threshold to \a t for this section.
-
- \sa mapThreshold()
-*/
-void QGLSection::setMapThreshold(int t)
-{
- d->map_threshold = t;
-}
-
-/*!
- \internal
- Returns a list of the QGLSceneNode instances associated with this section.
-*/
-QList<QGLSceneNode*> QGLSection::nodes() const
-{
- return d->nodes;
-}
-
-/*!
- \internal
- Adds the \a node to the list of QGLSceneNode instances associated with
- this section.
-*/
-void QGLSection::addNode(QGLSceneNode *node)
-{
- d->nodes.append(node);
-}
-
-/*!
- \internal
- Deletes the \a node from the list of QGLSceneNode instances associated
- with this section. Returns true if the \a node was found, false
- otherwise.
-*/
-bool QGLSection::deleteNode(QGLSceneNode *node)
-{
- int ix = d->nodes.indexOf(node);
- if (ix != -1)
- {
- d->nodes.removeAt(ix);
- return true;
- }
- return false;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-/*!
- \internal
- Output a string representation of \a section to a debug stream \a dbg.
- \relates QGLSection
-*/
-QDebug operator<<(QDebug dbg, const QGLSection §ion)
-{
- dbg.space()
- << "QGLSection(" << §ion
- << "- count:" << section.count()
- << "- smoothing mode:" << (section.smoothing() == QGL::Smooth ?
- "QGL::Smooth" : "QGL::Faceted") << "\n";
- QGL::IndexArray indices = section.indices();
- for (int i = 0; i < section.count(); ++i)
- {
- int ix = indices[i];
- dbg << section.logicalVertexAt(ix) << "\n";
- }
- dbg << ")\n";
- return dbg.space();
-}
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglsection_p.h b/src/gui/extern/Qt3D/geometry/qglsection_p.h
deleted file mode 100644
index 8da4079d89d00a11e06b1a47c0d34b9f4d828451..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglsection_p.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSECTION_H
-#define QGLSECTION_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglpainter.h"
-#include "qlogicalvertex.h"
-#include "qbox3d.h"
-#include "qglnamespace.h"
-
-#include <QtOpenGL/qgl.h>
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLPainter;
-class QGLBuilder;
-class QGLSectionPrivate;
-class QGeometryData;
-class QGLSceneNode;
-
-class Q_QT3D_EXPORT QGLSection : public QGeometryData
-{
-public:
- QGLSection(QGLBuilder *d, QGL::Smoothing sm = QGL::Smooth);
- ~QGLSection();
-
- void reserve(int amount);
-
- void append(const QLogicalVertex &lv);
- void append(const QLogicalVertex &a, const QLogicalVertex &b, const QLogicalVertex &c);
- void appendSmooth(const QLogicalVertex &lv);
- void appendSmooth(const QLogicalVertex &lv, int index);
- void appendSmooth(const QLogicalVertex &a, const QLogicalVertex &b, const QLogicalVertex &c)
- {
- appendSmooth(a);
- appendSmooth(b);
- appendSmooth(c);
- }
- void appendFaceted(const QLogicalVertex &lv);
- void appendFaceted(const QLogicalVertex &a, const QLogicalVertex &b, const QLogicalVertex &c)
- {
- appendFaceted(a);
- appendFaceted(b);
- appendFaceted(c);
- }
-
- inline QGL::Smoothing smoothing() const;
- inline void setSmoothing(QGL::Smoothing s);
- int mapThreshold() const;
- void setMapThreshold(int);
- QList<QGLSceneNode*> nodes() const;
- void addNode(QGLSceneNode *node);
- bool deleteNode(QGLSceneNode *node);
-private:
- Q_DISABLE_COPY(QGLSection);
- friend class QGLBuilder;
-
- int appendOne(const QLogicalVertex &vertex);
-
- QGL::Smoothing m_smoothing;
- QGLSectionPrivate *d;
-};
-
-inline QGL::Smoothing QGLSection::smoothing() const
-{
- return m_smoothing;
-}
-
-inline void QGLSection::setSmoothing(QGL::Smoothing s)
-{
- m_smoothing = s;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGLSection §ion);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QGLSECTION_H
diff --git a/src/gui/extern/Qt3D/geometry/qglsphere.cpp b/src/gui/extern/Qt3D/geometry/qglsphere.cpp
deleted file mode 100644
index 88a6a1874818d60b3374f5c5bfa335a35857e264..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglsphere.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglsphere.h"
-#include "qglbuilder.h"
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLSphere
- \brief The QGLSphere class represents the geometry of a simple sphere in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The following example creates a sphere of 2 units in diameter and
- draws it at (10, 25, 0) in a QGLPainter:
-
- \code
- QGLBuilder builder;
- builder << QGLSphere(2);
- QGLSceneNode *node = builder.finalizedSceneNode();
-
- painter.translate(10, 25, 0);
- node->draw(&painter);
- \endcode
-
- The QGLSphere class specifies positions, normals and 2D texture
- co-ordinates for all of the vertices that make up the sphere.
-
- The texture co-ordinates are fixed at construction time. This
- is because constructing the sphere can involve generating additional
- vertices which need to interpolate the texture co-ordinates of their
- neighboring vertices.
-
- The default mode of QGLSphere is a "UV sphere", which divides the
- sphere up into longitudinal and latitudinal sections. The longitudinal
- slices meet at the poles, which in a single unit sphere are defined to
- be at (0, 0, +0.5) and (0, 0, -0.5). This choice is the simplest to
- texture map as the texture will only distort along the x-axis of the
- 2D texture. However the density of vertices is significantly higher at
- the poles than it is elsewhere on the sphere and is a poor choice if a
- uniform density of pixels from the texture map is required.
-
- \sa QGLBuilder
-*/
-
-/*!
- \fn QGLSphere::QGLSphere(qreal diameter, int depth)
-
- Creates a sphere of \a diameter across (default is 1). When the sphere
- is recursively subdivided into triangles, it will be subdivided no more
- than \a depth times (between 1 and 10, default is 5).
-*/
-
-/*!
- Destroys this sphere object.
-*/
-QGLSphere::~QGLSphere()
-{
-}
-
-/*!
- \fn qreal QGLSphere::diameter() const
-
- Returns the diameter of this sphere. The default is 1.
-
- \sa setDiameter()
-*/
-
-/*!
- \fn void QGLSphere::setDiameter(qreal diameter)
-
- Sets the diameter of this sphere to \a diameter.
-
- \sa diameter()
-*/
-
-/*!
- \fn int QGLSphere::subdivisionDepth() const
-
- Returns the maximum depth when this sphere is subdivided into triangles.
- The default is 5. The following picture shows the effect of depth
- values between 1 and 10 for a UV sphere:
-
- \image sphere-detail.png
-
- \table
- \header \o Level of Detail \o Number of Triangles
- \row \o 1 \o 64
- \row \o 2 \o 128
- \row \o 3 \o 256
- \row \o 4 \o 512
- \row \o 5 \o 1024
- \row \o 6 \o 2048
- \row \o 7 \o 4096
- \row \o 8 \o 8192
- \row \o 9 \o 16384
- \row \o 10 \o 32768
- \endtable
-
- \sa setSubdivisionDepth()
-*/
-
-/*!
- \fn void QGLSphere::setSubdivisionDepth(int depth)
-
- Sets the maximum \a depth when this sphere is subdivided into triangles.
-
- \sa subdivisionDepth()
-*/
-
-/*!
- \relates QGLSphere
-
- Builds the geometry for \a sphere within the specified
- geometry \a builder.
-*/
-QGLBuilder& operator<<(QGLBuilder& builder, const QGLSphere& sphere)
-{
- qreal radius = sphere.diameter() / 2.0f;
-
- // Determine the number of slices and stacks to generate.
- static int const slicesAndStacks[] = {
- 8, 4,
- 8, 8,
- 16, 8,
- 16, 16,
- 32, 16,
- 32, 32,
- 64, 32,
- 64, 64,
- 128, 64,
- 128, 128
- };
- int divisions = sphere.subdivisionDepth();
- if (divisions < 1)
- divisions = 1;
- else if (divisions > 10)
- divisions = 10;
- int stacks = slicesAndStacks[divisions * 2 - 1];
- int slices = slicesAndStacks[divisions * 2 - 2];
-
- // Precompute sin/cos values for the slices and stacks.
- const int maxSlices = 128 + 1;
- const int maxStacks = 128 + 1;
- qreal sliceSin[maxSlices];
- qreal sliceCos[maxSlices];
- qreal stackSin[maxStacks];
- qreal stackCos[maxStacks];
- for (int slice = 0; slice < slices; ++slice) {
- qreal angle = 2 * M_PI * slice / slices;
- sliceSin[slice] = qFastSin(angle);
- sliceCos[slice] = qFastCos(angle);
- }
- sliceSin[slices] = sliceSin[0]; // Join first and last slice.
- sliceCos[slices] = sliceCos[0];
- for (int stack = 0; stack <= stacks; ++stack) {
- qreal angle = M_PI * stack / stacks;
- stackSin[stack] = qFastSin(angle);
- stackCos[stack] = qFastCos(angle);
- }
- stackSin[0] = 0.0f; // Come to a point at the poles.
- stackSin[stacks] = 0.0f;
-
- // Create the stacks.
- for (int stack = 0; stack < stacks; ++stack) {
- QGeometryData prim;
- qreal z = radius * stackCos[stack];
- qreal nextz = radius * stackCos[stack + 1];
- qreal s = stackSin[stack];
- qreal nexts = stackSin[stack + 1];
- qreal c = stackCos[stack];
- qreal nextc = stackCos[stack + 1];
- qreal r = radius * s;
- qreal nextr = radius * nexts;
- for (int slice = 0; slice <= slices; ++slice) {
- prim.appendVertex
- (QVector3D(nextr * sliceSin[slice],
- nextr * sliceCos[slice], nextz));
- prim.appendNormal
- (QVector3D(sliceSin[slice] * nexts,
- sliceCos[slice] * nexts, nextc));
- prim.appendTexCoord
- (QVector2D(1.0f - qreal(slice) / slices,
- 1.0f - qreal(stack + 1) / stacks));
-
- prim.appendVertex
- (QVector3D(r * sliceSin[slice],
- r * sliceCos[slice], z));
- prim.appendNormal
- (QVector3D(sliceSin[slice] * s,
- sliceCos[slice] * s, c));
- prim.appendTexCoord
- (QVector2D(1.0f - qreal(slice) / slices,
- 1.0f - qreal(stack) / stacks));
- }
- builder.addQuadStrip(prim);
- }
-
- return builder;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglsphere.h b/src/gui/extern/Qt3D/geometry/qglsphere.h
deleted file mode 100644
index ce25ef7ad8394eec6e3fe0667fcc0bfc702e57ed..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglsphere.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSPHERE_H
-#define QGLSPHERE_H
-
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLBuilder;
-
-class Q_QT3D_EXPORT QGLSphere
-{
-public:
- explicit QGLSphere(qreal diameter = 1.0f, int depth = 5)
- : m_diameter(diameter), m_subdivisionDepth(depth) {}
- virtual ~QGLSphere();
-
- qreal diameter() const { return m_diameter; }
- void setDiameter(qreal diameter) { m_diameter = diameter; }
-
- int subdivisionDepth() const { return m_subdivisionDepth; }
- void setSubdivisionDepth(int depth) { m_subdivisionDepth = depth; }
-
-private:
- qreal m_diameter;
- int m_subdivisionDepth;
-};
-
-Q_QT3D_EXPORT QGLBuilder& operator<<(QGLBuilder& builder, const QGLSphere& sphere);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qglteapot.cpp b/src/gui/extern/Qt3D/geometry/qglteapot.cpp
deleted file mode 100644
index 103527331721704b9f1a47d3debaecf2927ae200..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglteapot.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglteapot.h"
-#include "qglteapot_data_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLTeapot
- \brief The QGLTeapot class represents a 3D teapot object.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- The classic 3D "Utah Teapot" was originally drawn by Martin Newell
- in 1975. The vertex data was made publicly available by him and
- it has been a standard 3D test object ever since.
-
- For more information on the history of the "Utah Teapot", see
- Wikipedia, http://en.wikipedia.org/wiki/Utah_teapot.
-
- The following example code uses QGLTeapot to draw a teapot of size
- 0.5 at the origin:
-
- \code
- QGLBuilder builder;
- builder << QGLTeapot();
- teapot = builder.finalizedSceneNode();
-
- painter.modelViewMatrix().scale(0.5f);
- teapot->draw(painter);
- \endcode
-
- The QGLTeapot object contains a lot of vertex data once it has
- been subdivided into triangles. It is recommended that instances
- of this class be created at startup, added to a QGLBuilder,
- and then the finalized scene node can be reused over and over.
-
- \sa QGLBezierPatches
-*/
-
-/*!
- Constructs a new 3D teapot geometry object.
-*/
-QGLTeapot::QGLTeapot()
-{
- QVector3DArray positions;
- for (int pindex = 0; pindex < teapotPatchCount * 16; ++pindex) {
- int vindex = teapotPatchData[pindex];
- positions.append(teapotBezierVertexData[vindex * 3],
- teapotBezierVertexData[vindex * 3 + 1],
- teapotBezierVertexData[vindex * 3 + 2]);
- }
- setPositions(positions);
- setSubdivisionDepth(teapotDepth);
-}
-
-/*!
- Destroys this teapot geometry object.
-*/
-QGLTeapot::~QGLTeapot()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qglteapot.h b/src/gui/extern/Qt3D/geometry/qglteapot.h
deleted file mode 100644
index 7c4df3983814417f0563df894e89aad06d9ba1e0..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglteapot.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEAPOT_H
-#define QGLTEAPOT_H
-
-#include "qglbezierpatches.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLTeapot : public QGLBezierPatches
-{
-public:
- QGLTeapot();
- ~QGLTeapot();
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qglteapot_data_p.h b/src/gui/extern/Qt3D/geometry/qglteapot_data_p.h
deleted file mode 100644
index bee82aec03c50f930fb814c1e489da00cc5fe0b3..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qglteapot_data_p.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEAPOT_DATA_P_H
-#define QGLTEAPOT_DATA_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglbezierpatches.h"
-
-// Generated from teapot.txt by meshcvt, depth = 4
-
-#define teapotBezierVertexCount 306
-#define teapotBezierVertexStride 3
-#define teapotPatchCount 32
-#define teapotDepth 4
-static float const teapotBezierVertexData[] = {
- 0.700000f, 0.450000f, -0.000000f,
- 0.700000f, 0.450000f, 0.392000f,
- 0.392000f, 0.450000f, 0.700000f,
- 0.000000f, 0.450000f, 0.700000f,
- 0.668750f, 0.515625f, -0.000000f,
- 0.668750f, 0.515625f, 0.374500f,
- 0.374500f, 0.515625f, 0.668750f,
- 0.000000f, 0.515625f, 0.668750f,
- 0.718750f, 0.515625f, -0.000000f,
- 0.718750f, 0.515625f, 0.402500f,
- 0.402500f, 0.515625f, 0.718750f,
- 0.000000f, 0.515625f, 0.718750f,
- 0.750000f, 0.450000f, -0.000000f,
- 0.750000f, 0.450000f, 0.420000f,
- 0.420000f, 0.450000f, 0.750000f,
- 0.000000f, 0.450000f, 0.750000f,
- -0.392000f, 0.450000f, 0.700000f,
- -0.700000f, 0.450000f, 0.392000f,
- -0.700000f, 0.450000f, -0.000000f,
- -0.374500f, 0.515625f, 0.668750f,
- -0.668750f, 0.515625f, 0.374500f,
- -0.668750f, 0.515625f, -0.000000f,
- -0.402500f, 0.515625f, 0.718750f,
- -0.718750f, 0.515625f, 0.402500f,
- -0.718750f, 0.515625f, -0.000000f,
- -0.420000f, 0.450000f, 0.750000f,
- -0.750000f, 0.450000f, 0.420000f,
- -0.750000f, 0.450000f, -0.000000f,
- -0.700000f, 0.450000f, -0.392000f,
- -0.392000f, 0.450000f, -0.700000f,
- 0.000000f, 0.450000f, -0.700000f,
- -0.668750f, 0.515625f, -0.374500f,
- -0.374500f, 0.515625f, -0.668750f,
- 0.000000f, 0.515625f, -0.668750f,
- -0.718750f, 0.515625f, -0.402500f,
- -0.402500f, 0.515625f, -0.718750f,
- 0.000000f, 0.515625f, -0.718750f,
- -0.750000f, 0.450000f, -0.420000f,
- -0.420000f, 0.450000f, -0.750000f,
- 0.000000f, 0.450000f, -0.750000f,
- 0.392000f, 0.450000f, -0.700000f,
- 0.700000f, 0.450000f, -0.392000f,
- 0.374500f, 0.515625f, -0.668750f,
- 0.668750f, 0.515625f, -0.374500f,
- 0.402500f, 0.515625f, -0.718750f,
- 0.718750f, 0.515625f, -0.402500f,
- 0.420000f, 0.450000f, -0.750000f,
- 0.750000f, 0.450000f, -0.420000f,
- 0.875000f, 0.187500f, -0.000000f,
- 0.875000f, 0.187500f, 0.490000f,
- 0.490000f, 0.187500f, 0.875000f,
- 0.000000f, 0.187500f, 0.875000f,
- 1.000000f, -0.075000f, -0.000000f,
- 1.000000f, -0.075000f, 0.560000f,
- 0.560000f, -0.075000f, 1.000000f,
- 0.000000f, -0.075000f, 1.000000f,
- 1.000000f, -0.300000f, -0.000000f,
- 1.000000f, -0.300000f, 0.560000f,
- 0.560000f, -0.300000f, 1.000000f,
- 0.000000f, -0.300000f, 1.000000f,
- -0.490000f, 0.187500f, 0.875000f,
- -0.875000f, 0.187500f, 0.490000f,
- -0.875000f, 0.187500f, -0.000000f,
- -0.560000f, -0.075000f, 1.000000f,
- -1.000000f, -0.075000f, 0.560000f,
- -1.000000f, -0.075000f, -0.000000f,
- -0.560000f, -0.300000f, 1.000000f,
- -1.000000f, -0.300000f, 0.560000f,
- -1.000000f, -0.300000f, -0.000000f,
- -0.875000f, 0.187500f, -0.490000f,
- -0.490000f, 0.187500f, -0.875000f,
- 0.000000f, 0.187500f, -0.875000f,
- -1.000000f, -0.075000f, -0.560000f,
- -0.560000f, -0.075000f, -1.000000f,
- 0.000000f, -0.075000f, -1.000000f,
- -1.000000f, -0.300000f, -0.560000f,
- -0.560000f, -0.300000f, -1.000000f,
- 0.000000f, -0.300000f, -1.000000f,
- 0.490000f, 0.187500f, -0.875000f,
- 0.875000f, 0.187500f, -0.490000f,
- 0.560000f, -0.075000f, -1.000000f,
- 1.000000f, -0.075000f, -0.560000f,
- 0.560000f, -0.300000f, -1.000000f,
- 1.000000f, -0.300000f, -0.560000f,
- 1.000000f, -0.525000f, -0.000000f,
- 1.000000f, -0.525000f, 0.560000f,
- 0.560000f, -0.525000f, 1.000000f,
- 0.000000f, -0.525000f, 1.000000f,
- 0.750000f, -0.637500f, -0.000000f,
- 0.750000f, -0.637500f, 0.420000f,
- 0.420000f, -0.637500f, 0.750000f,
- 0.000000f, -0.637500f, 0.750000f,
- 0.750000f, -0.675000f, -0.000000f,
- 0.750000f, -0.675000f, 0.420000f,
- 0.420000f, -0.675000f, 0.750000f,
- 0.000000f, -0.675000f, 0.750000f,
- -0.560000f, -0.525000f, 1.000000f,
- -1.000000f, -0.525000f, 0.560000f,
- -1.000000f, -0.525000f, -0.000000f,
- -0.420000f, -0.637500f, 0.750000f,
- -0.750000f, -0.637500f, 0.420000f,
- -0.750000f, -0.637500f, -0.000000f,
- -0.420000f, -0.675000f, 0.750000f,
- -0.750000f, -0.675000f, 0.420000f,
- -0.750000f, -0.675000f, -0.000000f,
- -1.000000f, -0.525000f, -0.560000f,
- -0.560000f, -0.525000f, -1.000000f,
- 0.000000f, -0.525000f, -1.000000f,
- -0.750000f, -0.637500f, -0.420000f,
- -0.420000f, -0.637500f, -0.750000f,
- 0.000000f, -0.637500f, -0.750000f,
- -0.750000f, -0.675000f, -0.420000f,
- -0.420000f, -0.675000f, -0.750000f,
- 0.000000f, -0.675000f, -0.750000f,
- 0.560000f, -0.525000f, -1.000000f,
- 1.000000f, -0.525000f, -0.560000f,
- 0.420000f, -0.637500f, -0.750000f,
- 0.750000f, -0.637500f, -0.420000f,
- 0.420000f, -0.675000f, -0.750000f,
- 0.750000f, -0.675000f, -0.420000f,
- -0.800000f, 0.262500f, -0.000000f,
- -0.800000f, 0.262500f, 0.150000f,
- -0.750000f, 0.375000f, 0.150000f,
- -0.750000f, 0.375000f, -0.000000f,
- -1.150000f, 0.262500f, -0.000000f,
- -1.150000f, 0.262500f, 0.150000f,
- -1.250000f, 0.375000f, 0.150000f,
- -1.250000f, 0.375000f, -0.000000f,
- -1.350000f, 0.262500f, -0.000000f,
- -1.350000f, 0.262500f, 0.150000f,
- -1.500000f, 0.375000f, 0.150000f,
- -1.500000f, 0.375000f, -0.000000f,
- -1.350000f, 0.150000f, -0.000000f,
- -1.350000f, 0.150000f, 0.150000f,
- -1.500000f, 0.150000f, 0.150000f,
- -1.500000f, 0.150000f, -0.000000f,
- -0.750000f, 0.375000f, -0.150000f,
- -0.800000f, 0.262500f, -0.150000f,
- -1.250000f, 0.375000f, -0.150000f,
- -1.150000f, 0.262500f, -0.150000f,
- -1.500000f, 0.375000f, -0.150000f,
- -1.350000f, 0.262500f, -0.150000f,
- -1.500000f, 0.150000f, -0.150000f,
- -1.350000f, 0.150000f, -0.150000f,
- -1.350000f, 0.037500f, -0.000000f,
- -1.350000f, 0.037500f, 0.150000f,
- -1.500000f, -0.075000f, 0.150000f,
- -1.500000f, -0.075000f, -0.000000f,
- -1.250000f, -0.187500f, -0.000000f,
- -1.250000f, -0.187500f, 0.150000f,
- -1.325000f, -0.281250f, 0.150000f,
- -1.325000f, -0.281250f, -0.000000f,
- -1.000000f, -0.300000f, 0.150000f,
- -0.950000f, -0.450000f, 0.150000f,
- -0.950000f, -0.450000f, -0.000000f,
- -1.500000f, -0.075000f, -0.150000f,
- -1.350000f, 0.037500f, -0.150000f,
- -1.325000f, -0.281250f, -0.150000f,
- -1.250000f, -0.187500f, -0.150000f,
- -0.950000f, -0.450000f, -0.150000f,
- -1.000000f, -0.300000f, -0.150000f,
- 0.850000f, -0.037500f, -0.000000f,
- 0.850000f, -0.037500f, 0.330000f,
- 0.850000f, -0.450000f, 0.330000f,
- 0.850000f, -0.450000f, -0.000000f,
- 1.300000f, -0.037500f, -0.000000f,
- 1.300000f, -0.037500f, 0.330000f,
- 1.550000f, -0.337500f, 0.330000f,
- 1.550000f, -0.337500f, -0.000000f,
- 1.150000f, 0.300000f, -0.000000f,
- 1.150000f, 0.300000f, 0.125000f,
- 1.200000f, 0.262500f, 0.125000f,
- 1.200000f, 0.262500f, -0.000000f,
- 1.350000f, 0.450000f, -0.000000f,
- 1.350000f, 0.450000f, 0.125000f,
- 1.650000f, 0.450000f, 0.125000f,
- 1.650000f, 0.450000f, -0.000000f,
- 0.850000f, -0.450000f, -0.330000f,
- 0.850000f, -0.037500f, -0.330000f,
- 1.550000f, -0.337500f, -0.330000f,
- 1.300000f, -0.037500f, -0.330000f,
- 1.200000f, 0.262500f, -0.125000f,
- 1.150000f, 0.300000f, -0.125000f,
- 1.650000f, 0.450000f, -0.125000f,
- 1.350000f, 0.450000f, -0.125000f,
- 1.400000f, 0.487500f, -0.000000f,
- 1.400000f, 0.487500f, 0.125000f,
- 1.762500f, 0.496875f, 0.125000f,
- 1.762500f, 0.496875f, -0.000000f,
- 1.450000f, 0.487500f, -0.000000f,
- 1.450000f, 0.487500f, 0.075000f,
- 1.725000f, 0.506250f, 0.075000f,
- 1.725000f, 0.506250f, -0.000000f,
- 1.400000f, 0.450000f, -0.000000f,
- 1.400000f, 0.450000f, 0.075000f,
- 1.600000f, 0.450000f, 0.075000f,
- 1.600000f, 0.450000f, -0.000000f,
- 1.762500f, 0.496875f, -0.125000f,
- 1.400000f, 0.487500f, -0.125000f,
- 1.725000f, 0.506250f, -0.075000f,
- 1.450000f, 0.487500f, -0.075000f,
- 1.600000f, 0.450000f, -0.075000f,
- 1.400000f, 0.450000f, -0.075000f,
- 0.000000f, 0.825000f, -0.000000f,
- 0.000000f, 0.825000f, 0.001000f,
- 0.001000f, 0.825000f, -0.000000f,
- 0.400000f, 0.825000f, -0.000000f,
- 0.400000f, 0.825000f, 0.225000f,
- 0.225000f, 0.825000f, 0.400000f,
- 0.000000f, 0.825000f, 0.400000f,
- 0.000000f, 0.675000f, -0.000000f,
- 0.100000f, 0.600000f, -0.000000f,
- 0.100000f, 0.600000f, 0.056000f,
- 0.056000f, 0.600000f, 0.100000f,
- 0.000000f, 0.600000f, 0.100000f,
- -0.001000f, 0.825000f, -0.000000f,
- -0.225000f, 0.825000f, 0.400000f,
- -0.400000f, 0.825000f, 0.225000f,
- -0.400000f, 0.825000f, -0.000000f,
- -0.056000f, 0.600000f, 0.100000f,
- -0.100000f, 0.600000f, 0.056000f,
- -0.100000f, 0.600000f, -0.000000f,
- 0.000000f, 0.825000f, -0.001000f,
- -0.400000f, 0.825000f, -0.225000f,
- -0.225000f, 0.825000f, -0.400000f,
- 0.000000f, 0.825000f, -0.400000f,
- -0.100000f, 0.600000f, -0.056000f,
- -0.056000f, 0.600000f, -0.100000f,
- 0.000000f, 0.600000f, -0.100000f,
- 0.225000f, 0.825000f, -0.400000f,
- 0.400000f, 0.825000f, -0.225000f,
- 0.056000f, 0.600000f, -0.100000f,
- 0.100000f, 0.600000f, -0.056000f,
- 0.200000f, 0.525000f, -0.000000f,
- 0.200000f, 0.525000f, 0.112000f,
- 0.112000f, 0.525000f, 0.200000f,
- 0.000000f, 0.525000f, 0.200000f,
- 0.650000f, 0.525000f, -0.000000f,
- 0.650000f, 0.525000f, 0.364000f,
- 0.364000f, 0.525000f, 0.650000f,
- 0.000000f, 0.525000f, 0.650000f,
- 0.650000f, 0.450000f, -0.000000f,
- 0.650000f, 0.450000f, 0.364000f,
- 0.364000f, 0.450000f, 0.650000f,
- 0.000000f, 0.450000f, 0.650000f,
- -0.112000f, 0.525000f, 0.200000f,
- -0.200000f, 0.525000f, 0.112000f,
- -0.200000f, 0.525000f, -0.000000f,
- -0.364000f, 0.525000f, 0.650000f,
- -0.650000f, 0.525000f, 0.364000f,
- -0.650000f, 0.525000f, -0.000000f,
- -0.364000f, 0.450000f, 0.650000f,
- -0.650000f, 0.450000f, 0.364000f,
- -0.650000f, 0.450000f, -0.000000f,
- -0.200000f, 0.525000f, -0.112000f,
- -0.112000f, 0.525000f, -0.200000f,
- 0.000000f, 0.525000f, -0.200000f,
- -0.650000f, 0.525000f, -0.364000f,
- -0.364000f, 0.525000f, -0.650000f,
- 0.000000f, 0.525000f, -0.650000f,
- -0.650000f, 0.450000f, -0.364000f,
- -0.364000f, 0.450000f, -0.650000f,
- 0.000000f, 0.450000f, -0.650000f,
- 0.112000f, 0.525000f, -0.200000f,
- 0.200000f, 0.525000f, -0.112000f,
- 0.364000f, 0.525000f, -0.650000f,
- 0.650000f, 0.525000f, -0.364000f,
- 0.364000f, 0.450000f, -0.650000f,
- 0.650000f, 0.450000f, -0.364000f,
- 0.000000f, -0.750000f, -0.000000f,
- 0.750000f, -0.675000f, -0.000000f,
- 0.750000f, -0.675000f, -0.420000f,
- 0.420000f, -0.675000f, -0.750000f,
- 0.000000f, -0.675000f, -0.750000f,
- 0.750000f, -0.712500f, -0.000000f,
- 0.750000f, -0.712500f, -0.420000f,
- 0.420000f, -0.712500f, -0.750000f,
- 0.000000f, -0.712500f, -0.750000f,
- 0.712500f, -0.750000f, -0.000000f,
- 0.712500f, -0.750000f, -0.399000f,
- 0.399000f, -0.750000f, -0.712500f,
- 0.000000f, -0.750000f, -0.712500f,
- -0.420000f, -0.675000f, -0.750000f,
- -0.750000f, -0.675000f, -0.420000f,
- -0.750000f, -0.675000f, -0.000000f,
- -0.420000f, -0.712500f, -0.750000f,
- -0.750000f, -0.712500f, -0.420000f,
- -0.750000f, -0.712500f, -0.000000f,
- -0.399000f, -0.750000f, -0.712500f,
- -0.712500f, -0.750000f, -0.399000f,
- -0.712500f, -0.750000f, -0.000000f,
- -0.750000f, -0.675000f, 0.420000f,
- -0.420000f, -0.675000f, 0.750000f,
- 0.000000f, -0.675000f, 0.750000f,
- -0.750000f, -0.712500f, 0.420000f,
- -0.420000f, -0.712500f, 0.750000f,
- 0.000000f, -0.712500f, 0.750000f,
- -0.712500f, -0.750000f, 0.399000f,
- -0.399000f, -0.750000f, 0.712500f,
- 0.000000f, -0.750000f, 0.712500f,
- 0.420000f, -0.675000f, 0.750000f,
- 0.750000f, -0.675000f, 0.420000f,
- 0.420000f, -0.712500f, 0.750000f,
- 0.750000f, -0.712500f, 0.420000f,
- 0.399000f, -0.750000f, 0.712500f,
- 0.712500f, -0.750000f, 0.399000f
-};
-
-static ushort const teapotPatchData[] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 3, 16, 17, 18, 7, 19, 20, 21, 11, 22, 23, 24, 15, 25, 26, 27,
- 18, 28, 29, 30, 21, 31, 32, 33, 24, 34, 35, 36, 27, 37, 38, 39,
- 30, 40, 41, 0, 33, 42, 43, 4, 36, 44, 45, 8, 39, 46, 47, 12,
- 12, 13, 14, 15, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 15, 25, 26, 27, 51, 60, 61, 62, 55, 63, 64, 65, 59, 66, 67, 68,
- 27, 37, 38, 39, 62, 69, 70, 71, 65, 72, 73, 74, 68, 75, 76, 77,
- 39, 46, 47, 12, 71, 78, 79, 48, 74, 80, 81, 52, 77, 82, 83, 56,
- 56, 57, 58, 59, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 59, 66, 67, 68, 87, 96, 97, 98, 91, 99, 100, 101, 95, 102, 103, 104,
- 68, 75, 76, 77, 98, 105, 106, 107, 101, 108, 109, 110, 104, 111, 112, 113,
- 77, 82, 83, 56, 107, 114, 115, 84, 110, 116, 117, 88, 113, 118, 119, 92,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 123, 136, 137, 120, 127, 138, 139, 124, 131, 140, 141, 128, 135, 142, 143, 132,
- 132, 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 151, 68, 152, 153, 154,
- 135, 142, 143, 132, 147, 155, 156, 144, 151, 157, 158, 148, 154, 159, 160, 68,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 164, 177, 178, 161, 168, 179, 180, 165, 172, 181, 182, 169, 176, 183, 184, 173,
- 173, 174, 175, 176, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 176, 183, 184, 173, 188, 197, 198, 185, 192, 199, 200, 189, 196, 201, 202, 193,
- 203, 203, 203, 203, 206, 207, 208, 209, 210, 210, 210, 210, 211, 212, 213, 214,
- 203, 203, 203, 203, 209, 216, 217, 218, 210, 210, 210, 210, 214, 219, 220, 221,
- 203, 203, 203, 203, 218, 223, 224, 225, 210, 210, 210, 210, 221, 226, 227, 228,
- 203, 203, 203, 203, 225, 229, 230, 206, 210, 210, 210, 210, 228, 231, 232, 211,
- 211, 212, 213, 214, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 214, 219, 220, 221, 236, 245, 246, 247, 240, 248, 249, 250, 244, 251, 252, 253,
- 221, 226, 227, 228, 247, 254, 255, 256, 250, 257, 258, 259, 253, 260, 261, 262,
- 228, 231, 232, 211, 256, 263, 264, 233, 259, 265, 266, 237, 262, 267, 268, 241,
- 269, 269, 269, 269, 278, 279, 280, 281, 274, 275, 276, 277, 270, 271, 272, 273,
- 269, 269, 269, 269, 281, 288, 289, 290, 277, 285, 286, 287, 273, 282, 283, 284,
- 269, 269, 269, 269, 290, 297, 298, 299, 287, 294, 295, 296, 284, 291, 292, 293,
- 269, 269, 269, 269, 299, 304, 305, 278, 296, 302, 303, 274, 293, 300, 301, 270
-};
-
-#endif
diff --git a/src/gui/extern/Qt3D/geometry/qlogicalvertex.cpp b/src/gui/extern/Qt3D/geometry/qlogicalvertex.cpp
deleted file mode 100644
index 7b77f868d05997e43633ba9a51a757f918f1aae8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qlogicalvertex.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qlogicalvertex.h"
-#include "qvector_utils_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QLogicalVertex
- \brief The QLogicalVertex class references QGeometryData at a single vertex.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::geometry
-
- QLogicalVertex instances are a convenience class for use with
- QGeometryData. A QLogicalVertex simply references through to the data
- in a QGeometryData for a particular vertex, providing accessors to fetch
- position, texture coordinates, and other values.
-
- Create a QLogicalVertex referring to a particular QGeometryData instance:
- \code
- QGeometryData data;
- data.appendVertex(QVector3D(1, 2, 3));
-
- // construct a QLogicalVertex referring to the first vertex in data
- // the QGeometryData is implicitly shared with lv
- QLogicalVertex lv(data, 0);
- // lv.vertex() == QVector3D(1, 2, 3)
- \endcode
- This is inexpensive and no new storage is allocated for the actual data,
- just the reference and index.
-
- With logical vertices instances referencing large QGeometryData instances,
- avoid modifying the instance:
- \code
- // careful - assigning to a QLogicalVertex which refers to an external
- // QGeometryData will result in a possibly expensive copy-on-write
- lv.setVertex(3, 2, 1);
- \endcode
-
- Create a QLogicalVertex with its own QGeometryData internally:
- \code
- QLogicalVertex lv;
- // no copy on write here - internal QGeometryData is not shared
- lv.setVertex(1, 2, 3);
- \endcode
-
- Assign an instance of QLogicalVertex:
- \code
- QLogicalVertex lv2;
- lv2 = data.logicalVertexAt(0);
- \endcode
- Although lv2 gets its own internal QGeometryData which is then immediately
- thrown away by the assignment, because of lazy initialization in
- QGeometryData the cost is negligible.
-
- Use the fields() and hasField() functions to determine if a particular
- field is present in the vertex. Accessing non-existent data will cause
- an assert in debug mode (from the underlying QArray), and give
- undefined behaviour in release mode.
-
- \sa QGeometryData, QGLBuilder
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex()
- Constructs a new invalid QLogicalVertex which has no data.
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex(QGeometryData data, int index)
- Constructs a new QLogicalVertex referencing the \a data at \a index.
- Note that if this QLogicalVertex is modified, by calling vertex() or
- setNormal() for example, then a copy-on-write for \a data will be
- triggered.
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex(const QVector3D &a)
- Constructs a new QLogicalVertex with a vertex set to \a a.
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex(const QVector3D &a, const QVector3D &n);
- Constructs a new QLogicalVertex with a vertex set to \a a, and normal set to \a n.
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex(const QVector3D &a, const QVector3D &n, const QVector2D &t)
- Constructs a new QLogicalVertex with its vertex value set to \a a, normal set
- to \a n, and texture set to \a t. By default \a n is the null QVector3D,
- and \a t is the InvalidTexCoord. If \a n is null then hasType(QLogicalVertex::Normal)
- will return false. Likewise if \a t is the InvalidTexCoord then
- hasType(QLogicalVertex::Texture) will return false.
-*/
-
-/*!
- \fn QLogicalVertex::QLogicalVertex(const QVector3D &a, QColor4ub color)
- Constructs a new QLogicalVertex with its vertex value set to \a a,
- color value set to \a color.
-*/
-
-/*!
- \fn QLogicalVertex::~QLogicalVertex()
- Destroys this QLogicalVertex reclaiming any resources.
-*/
-
-/*!
- \fn const QVector3D &QLogicalVertex::vertex() const
- Returns a const reference to the vertex value for this vertex.
-*/
-
-/*!
- \fn void QLogicalVertex::setVertex(const QVector3D &v)
- Sets the vertex value for this vertex to \a v.
-*/
-
-/*!
- \fn QVector3D &QLogicalVertex::vertex()
- Returns a modifiable reference to the vertex value.
-*/
-
-/*!
- \fn QLogicalVertex::operator QVector3D ()
- Returns a copy of the vertex value, by casting as a QVector3D. This
- allows passing of a QLogicalVertex to functions that expect a QVector3D.
-*/
-
-/*!
- \fn QVariant QLogicalVertex::attribute(QGL::VertexAttribute field) const
- Returns the attribute value for \a field. The \a field defaults
- to QGL::CustomVertex0.
-*/
-
-/*!
- \fn void QLogicalVertex::setAttribute(float value, QGL::VertexAttribute field)
- Sets the float attribute \a value at \a field. The \a field
- defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn void QLogicalVertex::setAttribute(const QVector2D &v, QGL::VertexAttribute field)
- Sets the QVector2D attribute \a v at \a field. The \a field
- defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn void QLogicalVertex::setAttribute(const QVector3D &v, QGL::VertexAttribute field)
- Sets the QVector3D attribute \a v at \a field. The \a field
- defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn float &QLogicalVertex::floatAttribute(QGL::VertexAttribute field)
- Returns a modifiable reference to the attribute at \a field, which
- must be a float. The \a field defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn QVector2D &QLogicalVertex::vector2DAttribute(QGL::VertexAttribute field)
- Returns a modifiable reference to the attribute at \a field, which
- must be a QVector2D. The \a field defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn QVector3D &QLogicalVertex::vector3DAttribute(QGL::VertexAttribute field = QGL::CustomVertex0);
- Returns a modifiable reference to the attribute at \a field, which
- must be a QVector3D. The \a field defaults to QGL::CustomVertex0.
-*/
-
-/*!
- \fn float QLogicalVertex::floatAttribute(QGL::VertexAttribute field) const
- Returns the attribute at \a field. The \a field defaults to QGL::CustomVertex0.
- The attribute must be a float value.
-*/
-
-/*!
- \fn QVector2D QLogicalVertex::vector2DAttribute(QGL::VertexAttribute field) const
- Returns the attribute at \a field. The \a field defaults to QGL::CustomVertex0.
- The attribute must be a QVector2D value.
-*/
-
-/*!
- \fn QVector3D QLogicalVertex::vector3DAttribute(QGL::VertexAttribute field) const
- Returns the attribute at \a field. The \a field defaults to QGL::CustomVertex0.
- The attribute must be a QVector3D value.
-*/
-
-/*!
- \fn QCustomDataArray::ElementType QLogicalVertex::attributeType(QGL::VertexAttribute field)
- Returns the element type for the attribute \a field.
-*/
-
-/*!
- \fn const QVector3D &QLogicalVertex::normal() const
- Returns a const reference to the normal value for this vertex.
-*/
-
-/*!
- \fn void QLogicalVertex::setNormal(const QVector3D &n)
- Sets the normal value for this vertex to \a n.
-*/
-
-/*!
- \fn QVector3D &QLogicalVertex::normal()
- Returns a modifiable reference to the normal value for this vertex.
-*/
-
-/*!
- \fn QVector2D QLogicalVertex::texCoord(QGL::VertexAttribute field) const
- Returns a copy of the texture coordinate value at \a field for this vertex.
- The \a field defaults to QGL::TextureCoord0.
-*/
-
-/*!
- \fn void QLogicalVertex::setTexCoord(const QVector2D &t, QGL::VertexAttribute field)
- Sets the texture coordinate at \a field for this vertex to \a t.
- The \a field defaults to QGL::TextureCoord0.
-*/
-
-/*!
- \fn QVector2D &QLogicalVertex::texCoordRef(QGL::VertexAttribute field)
- Returns a modifiable reference to the texture coordinate for this vertex.
- The \a field defaults to QGL::TextureCoord0.
-*/
-
-/*!
- \fn QColor4ub QLogicalVertex::color() const
- Returns a const reference to the color value for this vertex.
-*/
-
-/*!
- \fn void QLogicalVertex::setColor(const QColor4ub &c)
- Sets the color value for this vertex to \a c.
-*/
-
-/*!
- \fn QColor4ub &QLogicalVertex::colorRef()
- Returns a modifiable reference to the color value for this vertex.
-*/
-
-/*!
- \fn bool QLogicalVertex::hasField(QGL::VertexAttribute type) const
- Returns true if this vertex has data field \a type, and false otherwise.
-
- In general check to see if a logical vertex has a particular field
- type before attempting to access it. In debug mode accessing a
- non-existent field will cause an assert; but in release mode the
- behaviour is undefined.
-*/
-
-/*!
- \fn quint32 QLogicalVertex::fields() const
- Returns a bit-mask of the fields in this logical vertex. Test the
- fields like this:
- \code
- if (vertex.fields() & QGL::fieldMask(QGL::TextureCoord0))
- tex = vertex.texCoord();
- \endcode
-
- \sa QGeometryData::fields()
-*/
-
-/*!
- \fn int QLogicalVertex::index() const
- Returns the index at which this logical vertex's data is located in
- its associated QGeometryData; or -1 if this vertex is null.
-*/
-
-/*!
- \fn QGeometryData QLogicalVertex::data() const
- Returns a copy of the QGeometryData underlying this vertex. Note that
- the copy is not expensive in terms of performance due to implicit sharing
- unless the copy is modified (causing a copy-on-write).
-
- \sa QLogicalVertex::index()
-*/
-
-/*!
- \fn QGeometryData data() const
- Returns a copy of the QGeometryData associated with this vertex. Note
- that as long as the copy is not modified, this method is not expensive.
-*/
-
-/*!
- \fn bool QLogicalVertex::isNull() const
- Returns true if this vertex is null.
-
- \sa QLogicalVertex()
-*/
-
-/*!
- Returns true if \a rhs has exactly the same fields as this logical
- vertex, and each of those are equal to the corresponding field of the \a rhs.
-
- If either are null, then false is returned.
-*/
-bool QLogicalVertex::operator==(const QLogicalVertex &rhs) const
-{
- if (isNull() || rhs.isNull())
- return false;
- if (this == &rhs)
- return true;
- if (m_data.fields() != rhs.fields())
- return false;
- const quint32 mask = 0x01;
- quint32 fields = m_data.fields();
- for (int field = 0; fields; ++field, fields >>= 1)
- {
- if (mask & fields)
- {
- QGL::VertexAttribute attr = static_cast<QGL::VertexAttribute>(field);
- if (attr < QGL::TextureCoord0)
- {
- if (attr == QGL::Position)
- {
- if (!qFskCompare(vertex(), rhs.vertex()))
- return false;
- }
- else if (attr == QGL::Normal)
- {
- if (!qFskCompare(normal(), rhs.normal()))
- return false;
- }
- else
- {
- if (color() != rhs.color())
- return false;
- }
- }
- else if (attr < QGL::CustomVertex0)
- {
- if (!qFskCompare(texCoord(attr), rhs.texCoord(attr)))
- return false;
- }
- else
- {
- if (attribute(attr) != rhs.attribute(attr))
- return false;
- }
- }
- }
- return true;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QLogicalVertex &lv)
-{
- dbg.nospace();
- dbg << "QLogicalVertex(";
- if (lv.isNull())
- {
- dbg << " NULL";
- }
- else
- {
- if (lv.hasField(QGL::Position))
- dbg << "V:" << QVector3D(lv.vertex());
- else
- dbg << " (No Vertex)";
- if (lv.hasField(QGL::Normal))
- dbg << "N:" << QVector3D(lv.normal());
- else
- dbg << " (No Normal)";
- if (lv.hasField(QGL::TextureCoord0))
- dbg << "T:" << QVector2D(lv.texCoord());
- else
- dbg << " (No Texture)";
- if (lv.hasField(QGL::Color))
- dbg << "C:" << QColor4ub(lv.color());
- else
- dbg << " (No Color)";
- }
- dbg << " )";
- return dbg.space();
-}
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/geometry/qlogicalvertex.h b/src/gui/extern/Qt3D/geometry/qlogicalvertex.h
deleted file mode 100644
index ca37c62861ec8239f9f7151fcecace16367e7cab..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qlogicalvertex.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QLOGICALVERTEX_H
-#define QLOGICALVERTEX_H
-
-#include "qgeometrydata.h"
-#include "qcustomdataarray.h"
-
-QT_BEGIN_NAMESPACE
-
-// uncomment this to perform heavy checking of QLogicalVertex
-// #define QT3D_DEBUG_QLOGICALVERTEX 1
-
-class QLogicalVertex
-{
-public:
- inline QLogicalVertex();
- inline QLogicalVertex(QGeometryData data, int index);
- inline QLogicalVertex(const QVector3D &a);
- inline QLogicalVertex(const QVector3D &a, const QVector3D &n);
- inline QLogicalVertex(const QVector3D &a, const QVector3D &n, const QVector2D &t);
- inline QLogicalVertex(const QVector3D &a, QColor4ub color);
- ~QLogicalVertex() {}
-
- inline const QVector3D &vertex() const;
- inline void setVertex(const QVector3D &v);
- inline QVector3D &vertex();
-
- operator QVector3D () { return vertex(); }
-
- inline QVariant attribute(QGL::VertexAttribute field = QGL::CustomVertex0) const;
- inline void setAttribute(float value, QGL::VertexAttribute attr);
- inline void setAttribute(const QVector2D &v, QGL::VertexAttribute field = QGL::CustomVertex0);
- inline void setAttribute(const QVector3D &v, QGL::VertexAttribute field = QGL::CustomVertex0);
- inline float &floatAttribute(QGL::VertexAttribute field = QGL::CustomVertex0);
- inline QVector2D &vector2DAttribute(QGL::VertexAttribute field = QGL::CustomVertex0);
- inline QVector3D &vector3DAttribute(QGL::VertexAttribute field = QGL::CustomVertex0);
- inline float floatAttribute(QGL::VertexAttribute field = QGL::CustomVertex0) const;
- inline QVector2D vector2DAttribute(QGL::VertexAttribute field = QGL::CustomVertex0) const;
- inline QVector3D vector3DAttribute(QGL::VertexAttribute field = QGL::CustomVertex0) const;
- inline QCustomDataArray::ElementType attributeType(QGL::VertexAttribute field = QGL::CustomVertex0);
-
- inline const QVector3D &normal() const;
- inline void setNormal(const QVector3D &n);
- inline QVector3D &normal();
-
- inline const QColor4ub &color() const;
- inline void setColor(const QColor4ub &c);
- inline QColor4ub &colorRef();
-
- inline const QVector2D &texCoord(QGL::VertexAttribute attr = QGL::TextureCoord0) const;
- inline void setTexCoord(const QVector2D &t, QGL::VertexAttribute attr = QGL::TextureCoord0);
- inline QVector2D &texCoordRef(QGL::VertexAttribute attr = QGL::TextureCoord0);
-
- inline bool hasField(QGL::VertexAttribute type) const;
- inline quint32 fields() const;
- inline int index() const;
- inline QGeometryData data() const;
- inline bool isNull() const;
-
- bool operator==(const QLogicalVertex &rhs) const;
-
-private:
- QGeometryData m_data;
- int m_index;
-};
-
-inline QLogicalVertex::QLogicalVertex()
- : m_index(-1)
-{
-}
-
-inline QLogicalVertex::QLogicalVertex(QGeometryData data, int index)
- : m_data(data)
- , m_index(index)
-{
- Q_ASSERT(index < data.count());
-#ifdef QT3D_DEBUG_QLOGICALVERTEX
- data.check();
-#endif
-}
-
-inline QLogicalVertex::QLogicalVertex(const QVector3D &a)
- : m_index(0)
-{
- m_data.appendVertex(a);
-}
-
-inline QLogicalVertex::QLogicalVertex(const QVector3D &a, const QVector3D &n)
- : m_index(0)
-{
- m_data.appendVertex(a);
- m_data.appendNormal(n);
-}
-
-inline QLogicalVertex::QLogicalVertex(const QVector3D &a, const QVector3D &n, const QVector2D &t)
- : m_index(0)
-{
- m_data.appendVertex(a);
- m_data.appendNormal(n);
- m_data.appendTexCoord(t);
-}
-
-inline QLogicalVertex::QLogicalVertex(const QVector3D &a, QColor4ub color)
- : m_index(0)
-{
- m_data.appendVertex(a);
- m_data.appendColor(color);
-}
-
-inline const QVector3D &QLogicalVertex::vertex() const
-{
- return m_data.vertexAt(m_index);
-}
-
-inline void QLogicalVertex::setVertex(const QVector3D &v)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(QGL::Position))
- m_data.appendVertex(v);
- else
- m_data.vertex(m_index) = v;
-}
-
-inline QVector3D &QLogicalVertex::vertex()
-{
- return m_data.vertex(m_index);
-}
-
-inline QVariant QLogicalVertex::attribute(QGL::VertexAttribute attr) const
-{
- return m_data.attributes(attr).at(m_index);
-}
-
-inline void QLogicalVertex::setAttribute(float v, QGL::VertexAttribute attr)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(attr))
- m_data.appendAttribute(v, attr);
- else
- m_data.floatAttribute(m_index, attr) = v;
-}
-
-inline void QLogicalVertex::setAttribute(const QVector2D &v, QGL::VertexAttribute attr)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(attr))
- m_data.appendAttribute(v, attr);
- else
- m_data.vector2DAttribute(m_index, attr) = v;
-}
-
-inline void QLogicalVertex::setAttribute(const QVector3D &v, QGL::VertexAttribute attr)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(attr))
- m_data.appendAttribute(v, attr);
- else
- m_data.vector3DAttribute(m_index, attr) = v;
-}
-
-inline float &QLogicalVertex::floatAttribute(QGL::VertexAttribute field)
-{
- return m_data.floatAttribute(m_index, field);
-}
-
-inline QVector2D &QLogicalVertex::vector2DAttribute(QGL::VertexAttribute field)
-{
- return m_data.vector2DAttribute(m_index, field);
-}
-
-inline QVector3D &QLogicalVertex::vector3DAttribute(QGL::VertexAttribute field)
-{
-
- return m_data.vector3DAttribute(m_index, field);
-}
-
-inline float QLogicalVertex::floatAttribute(QGL::VertexAttribute field) const
-{
- return m_data.floatAttributeAt(m_index, field);
-}
-
-inline QVector2D QLogicalVertex::vector2DAttribute(QGL::VertexAttribute field) const
-{
- return m_data.vector2DAttributeAt(m_index, field);
-}
-
-inline QVector3D QLogicalVertex::vector3DAttribute(QGL::VertexAttribute field) const
-{
- return m_data.vector3DAttributeAt(m_index, field);
-}
-
-inline QCustomDataArray::ElementType QLogicalVertex::attributeType(QGL::VertexAttribute field)
-{
- return m_data.attributes(field).elementType();
-}
-
-inline const QVector3D &QLogicalVertex::normal() const
-{
- return m_data.normalAt(m_index);
-}
-
-inline void QLogicalVertex::setNormal(const QVector3D &n)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(QGL::Normal))
- m_data.appendNormal(n);
- else
- m_data.normal(m_index) = n;
-}
-
-inline QVector3D &QLogicalVertex::normal()
-{
- return m_data.normal(m_index);
-}
-
-inline const QVector2D &QLogicalVertex::texCoord(QGL::VertexAttribute attr) const
-{
- return m_data.texCoordAt(m_index, attr);
-}
-
-inline void QLogicalVertex::setTexCoord(const QVector2D &t, QGL::VertexAttribute attr)
-{
- Q_ASSERT(attr >= QGL::TextureCoord0 && attr <= QGL::TextureCoord2);
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(attr))
- m_data.appendTexCoord(t, attr);
- else
- m_data.texCoord(m_index, attr) = t;
-}
-
-inline QVector2D &QLogicalVertex::texCoordRef(QGL::VertexAttribute attr)
-{
- return m_data.texCoord(m_index, attr);
-}
-
-inline const QColor4ub &QLogicalVertex::color() const
-{
- return m_data.colorAt(m_index);
-}
-
-inline void QLogicalVertex::setColor(const QColor4ub &c)
-{
- if (m_index == -1)
- m_index = 0;
- if (m_index == m_data.count(QGL::Color))
- m_data.appendColor(c);
- else
- m_data.color(m_index) = c;
-}
-
-inline QColor4ub &QLogicalVertex::colorRef()
-{
- return m_data.color(m_index);
-}
-
-inline bool QLogicalVertex::hasField(QGL::VertexAttribute attr) const
-{
- return m_data.hasField(attr);
-}
-
-inline quint32 QLogicalVertex::fields() const
-{
- return m_data.fields();
-}
-
-inline int QLogicalVertex::index() const
-{
- return m_index;
-}
-
-inline bool QLogicalVertex::isNull() const
-{
- return (m_index == -1);
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QLogicalVertex §ion);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QLOGICALVERTEX_H
diff --git a/src/gui/extern/Qt3D/geometry/qvector_utils_p.h b/src/gui/extern/Qt3D/geometry/qvector_utils_p.h
deleted file mode 100644
index 546a042ae5d5edbddc49e1278a174ea7e6e934dc..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/geometry/qvector_utils_p.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QVECTOR_UTILS_P_H
-#define QVECTOR_UTILS_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector2d.h>
-
-// Replacement for qFuzzyCompare(QVector3D, QVector3D) and friends,
-// for a specific case where the results are going to be rendered
-// by the GPU onto a display.
-//
-// The accuracy of this comparison should not change. Especially it
-// should not change when you go from doubles to floats or when
-// you get close to zero. If two verts or lighting normals are
-// the same to within 5 places of floating point accuracy then they
-// will dislay as being on top of each other.
-//
-// Also this avoids doing 3 floating point multiplications every time
-// since the normal qFuzzyIsNull does a mul to scale the epsilon when
-// close to zero.
-
-inline bool qFskIsNull(double d)
-{
- return qAbs(d) <= 0.00001;
-}
-
-inline bool qFskIsNull(float f)
-{
- return qAbs(f) <= 0.00001f;
-}
-
-inline bool qFskCompare(float a, float b)
-{
- return qFskIsNull(a - b);
-}
-
-inline bool qFskCompare(double a, double b)
-{
- return qFskIsNull(a - b);
-}
-
-inline bool qFskCompare(const QVector3D &a, const QVector3D &b)
-{
- return (
- qFskIsNull(a.x() - b.x()) &&
- qFskIsNull(a.y() - b.y()) &&
- qFskIsNull(a.z() - b.z())
- );
-}
-
-inline bool qFskCompare(const QVector2D &a, const QVector2D &b)
-{
- return (
- qFskIsNull(a.x() - b.x()) &&
- qFskIsNull(a.y() - b.y())
- );
-}
-
-#endif // QVECTOR_UTILS_P_H
diff --git a/src/gui/extern/Qt3D/global/CMakeLists.txt b/src/gui/extern/Qt3D/global/CMakeLists.txt
deleted file mode 100644
index 306a98397e299f921c07ac785c3311c41664d3f5..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/global/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-target_sources( gui
- PRIVATE
- qglnamespace.cpp
- qglnamespace.h
- qt3dglobal.h
- )
diff --git a/src/gui/extern/Qt3D/global/qglnamespace.cpp b/src/gui/extern/Qt3D/global/qglnamespace.cpp
deleted file mode 100644
index afa01d5358efa0afa5c90f64625a95e59083a32d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/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 (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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/gui/extern/Qt3D/global/qglnamespace.h b/src/gui/extern/Qt3D/global/qglnamespace.h
deleted file mode 100644
index 682b0ab1f8db9da7b32a48541a2779e7584c020b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/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 (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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/gui/extern/Qt3D/global/qt3dglobal.h b/src/gui/extern/Qt3D/global/qt3dglobal.h
deleted file mode 100644
index f593854249114908cc359e5200e0f34c110242f9..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/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 (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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
diff --git a/src/gui/extern/Qt3D/graphicsview/CMakeLists.txt b/src/gui/extern/Qt3D/graphicsview/CMakeLists.txt
deleted file mode 100644
index 8841b70916198c0f786757a97bfd49397c0ad9cb..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-target_sources( gui
- PRIVATE
- qglgraphicsviewportitem.h
- qgraphicsrotation3d.cpp
- qgraphicstranslation3d.cpp
- qgraphicstranslation3d.h
- qgraphicsbillboardtransform.h
- qgraphicsembedscene.h
- qgraphicsscale3d.cpp
- qgraphicsrotation3d.h
- qglgraphicsviewportitem.cpp
- qgraphicsscale3d.h
- qgraphicstransform3d.cpp
- qgraphicsembedscene.cpp
- qgraphicstransform3d.h
- qgraphicsbillboardtransform.cpp
- )
diff --git a/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.cpp b/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.cpp
deleted file mode 100644
index b497c13e29e1a904aa58fd431a79cbaa8d81ad6e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglgraphicsviewportitem.h"
-#include "qglpainter.h"
-#include "qglsubsurface.h"
-#include <QtGui/qpainter.h>
-#include <QtGui/qgraphicsscene.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLGraphicsViewportItem
- \brief The QGLGraphicsViewportItem class provides a rectangular viewport for arbitrary OpenGL painting.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-*/
-
-class QGLGraphicsViewportItemPrivate : public QObject
-{
- Q_OBJECT
-public:
- QGLGraphicsViewportItemPrivate(QGLGraphicsViewportItem *item)
- : q(item)
- {
- defaultCamera = camera = new QGLCamera(this);
- connect(camera, SIGNAL(projectionChanged()),
- this, SLOT(cameraChanged()));
- connect(camera, SIGNAL(viewChanged()),
- this, SLOT(cameraChanged()));
- }
-
- void changeCamera(QGLCamera *c);
- void setDefaults(QGLPainter *painter);
-
- QGLGraphicsViewportItem *q;
- QRectF rect;
- QGLCamera *camera;
- QGLCamera *defaultCamera;
- QColor backgroundColor;
-
-private Q_SLOTS:
- void cameraChanged();
-};
-
-void QGLGraphicsViewportItemPrivate::changeCamera(QGLCamera *c)
-{
- disconnect(camera, SIGNAL(projectionChanged()),
- this, SLOT(cameraChanged()));
- disconnect(camera, SIGNAL(viewChanged()),
- this, SLOT(cameraChanged()));
- camera = c;
- connect(camera, SIGNAL(projectionChanged()),
- this, SLOT(cameraChanged()));
- connect(camera, SIGNAL(viewChanged()),
- this, SLOT(cameraChanged()));
-}
-
-void QGLGraphicsViewportItemPrivate::cameraChanged()
-{
- q->update();
-}
-
-void QGLGraphicsViewportItemPrivate::setDefaults(QGLPainter *painter)
-{
- // Set the default depth buffer options.
- glDepthFunc(GL_LESS);
- glDepthMask(GL_TRUE);
-#if defined(QT_OPENGL_ES)
- glDepthRangef(0.0f, 1.0f);
-#else
- glDepthRange(0.0f, 1.0f);
-#endif
-
- // Set the default blend options.
- glDisable(GL_BLEND);
- if (painter->hasOpenGLFeature(QOpenGLFunctions::BlendColor))
- painter->glBlendColor(0, 0, 0, 0);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- if (painter->hasOpenGLFeature(QOpenGLFunctions::BlendEquation))
- painter->glBlendEquation(GL_FUNC_ADD);
- else if (painter->hasOpenGLFeature(QOpenGLFunctions::BlendEquationSeparate))
- painter->glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
-}
-
-/*!
- Constructs a new GL graphics viewport and attaches it to \a parent.
-*/
-QGLGraphicsViewportItem::QGLGraphicsViewportItem(QGraphicsItem *parent)
- : QGraphicsItem(parent), d_ptr(new QGLGraphicsViewportItemPrivate(this))
-{
-}
-
-/*!
- Constructs a new GL graphics viewport and attaches it to \a parent.
- The boundingRect() is initially set to \a rect.
-*/
-QGLGraphicsViewportItem::QGLGraphicsViewportItem(const QRectF& rect, QGraphicsItem *parent)
- : QGraphicsItem(parent), d_ptr(new QGLGraphicsViewportItemPrivate(this))
-{
- d_ptr->rect = rect;
-}
-
-/*!
- Constructs a new GL graphics viewport and attaches it to \a parent.
- The boundingRect() is initially set to (\a x, \a y, \a w, \a h).
-*/
-QGLGraphicsViewportItem::QGLGraphicsViewportItem
- (qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent)
- : QGraphicsItem(parent), d_ptr(new QGLGraphicsViewportItemPrivate(this))
-{
- d_ptr->rect = QRectF(x, y, w, h);
-}
-
-/*!
- Destroys this GL graphics viewport.
-*/
-QGLGraphicsViewportItem::~QGLGraphicsViewportItem()
-{
-}
-
-/*!
- Returns the rectangular area of the view that is occupied by
- this GL graphics viewport.
-
- \sa setRect(), boundingRect()
-*/
-QRectF QGLGraphicsViewportItem::rect() const
-{
- Q_D(const QGLGraphicsViewportItem);
- return d->rect;
-}
-
-/*!
- Sets the rectangular area of the view that is occupied by
- this GL graphics viewport to \a rect.
-
- \sa rect(), boundingRect()
-*/
-void QGLGraphicsViewportItem::setRect(const QRectF &rect)
-{
- Q_D(QGLGraphicsViewportItem);
- if (d->rect == rect)
- return;
- prepareGeometryChange();
- d->rect = rect;
- update();
-}
-
-/*!
- \fn void QGLGraphicsViewportItem::setRect(qreal x, qreal y, qreal w, qreal h)
- \overload
-
- Sets the rectangular area of the view that is occupied by
- this GL graphics viewport to (\a x, \a y, \a w, \a h).
-
- \sa rect(), boundingRect()
-*/
-
-/*!
- Returns the bounding rectangle for this GL graphics viewport,
- which is the same as rect().
-
- \sa rect()
-*/
-QRectF QGLGraphicsViewportItem::boundingRect() const
-{
- Q_D(const QGLGraphicsViewportItem);
- return d->rect;
-}
-
-/*!
- Returns the camera parameters. The camera defines the projection
- to apply to convert eye co-ordinates into window co-ordinates,
- and the position and orientation of the viewer's eye.
-
- This item will be updated whenever the camera's parameters change.
-
- \sa setCamera()
-*/
-QGLCamera *QGLGraphicsViewportItem::camera() const
-{
- Q_D(const QGLGraphicsViewportItem);
- return d->camera;
-}
-
-/*!
- Sets the camera parameters to \a camera. The camera defines the
- projection to apply to convert eye co-ordinates into window
- co-ordinates, and the position and orientation of the viewer's eye.
-
- If \a camera is null, then the default camera object will be used.
-
- This function will call update() to force the viewport to update
- with the new camera parameters upon the next event loop. Afterwards,
- this item will be updated whenever the camera's parameters change.
-
- \sa camera()
-*/
-void QGLGraphicsViewportItem::setCamera(QGLCamera *camera)
-{
- Q_D(QGLGraphicsViewportItem);
- if (!camera)
- camera = d->defaultCamera;
- if (d->camera != camera) {
- d->changeCamera(camera);
- update();
- }
-}
-
-/*!
- Returns the background color, which is used to clear the viewport
- before calling paintGL(). The default value is an invalid QColor,
- which indicates that the viewport should not be cleared.
-
- \sa setBackgroundColor()
-*/
-QColor QGLGraphicsViewportItem::backgroundColor() const
-{
- Q_D(const QGLGraphicsViewportItem);
- return d->backgroundColor;
-}
-
-/*!
- Sets the background \a color, which is used to clear the viewport
- before calling paintGL().
-
- \sa backgroundColor()
-*/
-void QGLGraphicsViewportItem::setBackgroundColor(const QColor& color)
-{
- Q_D(QGLGraphicsViewportItem);
- d->backgroundColor = color;
-}
-
-/*!
- Paints this GL graphics viewport onto \a painter, with the specified
- \a option and \a widget parameters.
-
- This override creates a QGLPainter for \a painter and passes
- it to paintGL().
-
- \sa paintGL()
-*/
-void QGLGraphicsViewportItem::paint
- (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
- Q_D(QGLGraphicsViewportItem);
-
- Q_UNUSED(option);
- Q_UNUSED(widget);
-
- if (d->rect.isEmpty())
- return;
-
- // Initialize a QGLPainter for the surface and bail out if not active.
- QGLPainter glpainter;
- if (!glpainter.begin(painter)) {
- qWarning("GL graphics system is not active; cannot use 3D items");
- return;
- }
-
- // Set up the GL viewport to limit drawing to the bounds of this item.
- QRect viewport = painter->deviceTransform().mapRect(rect()).toRect();
- QGLSubsurface surface(glpainter.currentSurface(), viewport);
- glpainter.pushSurface(&surface);
-
- // Set up the desired drawing options.
- glDisable(GL_CULL_FACE);
- d->setDefaults(&glpainter);
- if (d->backgroundColor.isValid()) {
- // We clear the background by drawing a triangle fan so
- // that the background color will blend with the underlying
- // screen content if it has an alpha component.
- glDisable(GL_DEPTH_TEST);
- if (d->backgroundColor.alpha() != 255)
- glEnable(GL_BLEND);
- else
- glDisable(GL_BLEND);
- QVector2DArray array;
- array.append(-1, -1);
- array.append(1, -1);
- array.append(1, 1);
- array.append(-1, 1);
- glpainter.projectionMatrix().setToIdentity();
- glpainter.modelViewMatrix().setToIdentity();
- glpainter.setStandardEffect(QGL::FlatColor);
- glpainter.setColor(d->backgroundColor);
- glpainter.setVertexAttribute(QGL::Position, array);
- glpainter.draw(QGL::TriangleFan, 4);
- }
- glClear(GL_DEPTH_BUFFER_BIT);
- glEnable(GL_DEPTH_TEST);
- glDisable(GL_BLEND);
-
- // Apply the camera.
- glpainter.setEye(QGL::NoEye);
- glpainter.setCamera(d->camera);
-
- // Paint the GL contents.
- paintGL(&glpainter);
-
- // Disable the current drawing effect so that QGLPainter will
- // forcibly update the GL context the next time QGLPainter is used.
- glpainter.disableEffect();
-
- // Try to restore the GL state to something paint-engine compatible.
- glDisable(GL_CULL_FACE);
- d->setDefaults(&glpainter);
- glDisable(GL_DEPTH_TEST);
-
- glpainter.popSurface();
-}
-
-/*!
- \fn void QGLGraphicsViewportItem::paintGL(QGLPainter *painter)
-
- Paints this GL graphics viewport onto \a painter. This function is called
- from paint().
-
- \sa paint()
-*/
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.h b/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.h
deleted file mode 100644
index b707848d0cbc483cc1b2fa28ae5d479b0fb226de..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qglgraphicsviewportitem.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLGRAPHICSVIEWPORTITEM_H
-#define QGLGRAPHICSVIEWPORTITEM_H
-
-#include "qglnamespace.h"
-#include <QtGui/qgraphicsitem.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLGraphicsViewportItemPrivate;
-class QGLPainter;
-class QGLCamera;
-
-class Q_QT3D_EXPORT QGLGraphicsViewportItem : public QGraphicsItem
-{
-public:
- QGLGraphicsViewportItem(QGraphicsItem *parent = 0);
- QGLGraphicsViewportItem(const QRectF& rect, QGraphicsItem *parent = 0);
- QGLGraphicsViewportItem(qreal x, qreal y, qreal w, qreal h,
- QGraphicsItem *parent = 0);
- ~QGLGraphicsViewportItem();
-
- QRectF rect() const;
- void setRect(const QRectF &rect);
- inline void setRect(qreal x, qreal y, qreal w, qreal h);
-
- QRectF boundingRect() const;
-
- QGLCamera *camera() const;
- void setCamera(QGLCamera *camera);
-
- QColor backgroundColor() const;
- void setBackgroundColor(const QColor& color);
-
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-
-protected:
- virtual void paintGL(QGLPainter *painter) = 0;
-
-private:
- QScopedPointer<QGLGraphicsViewportItemPrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLGraphicsViewportItem)
- Q_DISABLE_COPY(QGLGraphicsViewportItem)
-};
-
-void QGLGraphicsViewportItem::setRect(qreal x, qreal y, qreal w, qreal h)
-{
- setRect(QRectF(x, y, w, h));
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.cpp
deleted file mode 100644
index 1742e597c6668e3bec0d0d86d981a197ea1059e5..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicsbillboardtransform.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsBillboardTransform
- \brief The QGraphicsBillboardTransform class implements a transformation that causes objects to face the camera.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- Sometimes it can be useful to make an object face towards the camera
- no matter what orientation the scene is in. The common name for
- this technique is "billboarding".
-
- When applied as a transformation, this class will replace the top-left
- 3x3 part of the transformation matrix with the identity. This has the
- effect of removing the rotation and scale components from the current
- world co-ordinate orientation.
-*/
-
-/*!
- \qmlclass BillboardTransform QGraphicsBillboardTransform
- \brief The BillboardTransform item implements a transformation that causes objects to face the camera.
- \since 4.8
- \ingroup qt3d::qml3d
-
- Sometimes it can be useful to make an object face towards the camera
- no matter what orientation the scene is in. The common name for
- this technique is "billboarding".
-
- When applied as a transformation, this class will replace the top-left
- 3x3 part of the transformation matrix with the identity. This has the
- effect of removing the rotation and scale components from the current
- world co-ordinate orientation. In QML, this can be used as follows
- to orient a pane to point towards the viewer:
-
- \code
- Item3D {
- mesh: Mesh { source: "pane.obj" }
- position: Qt.vector3d(2, 0, -20)
- transform: BillboardTransform {}
- effect: Effect { texture: "picture.jpg" }
- }
- \endcode
-
- Because the billboard transformation will strip any further
- alterations to the matrix, it will usually be the last element
- in the \c transform list (transformations are applied to the matrix in
- reverse order of their appearance in \c transform):
-
- \code
- Item3D {
- mesh: Mesh { source: "pane.obj" }
- position: Qt.vector3d(2, 0, -20)
- transform: [
- Scale3D { scale: 0.5 },
- Rotation3D { angle: 30 },
- BillboardTransform {}
- ]
- effect: Effect { texture: "picture.jpg" }
- }
- \endcode
-
- The \c scale property is applied to the matrix after \c transform has
- performed the billboard transformation, so the above can also be written
- as follows:
-
- \code
- Item3D {
- mesh: Mesh { source: "pane.obj" }
- position: Qt.vector3d(2, 0, -20)
- scale: 0.5
- transform: [
- Rotation3D { angle: 30 },
- BillboardTransform {}
- ]
- effect: Effect { texture: "picture.jpg" }
- }
- \endcode
-
- By default the billboard transform will cause the object to
- face directly at the camera no matter how the world co-ordinate
- system is rotated. Sometimes the billboard needs to stay at right
- angles to the "ground plane" even if the user's viewpoint is
- elevated. This behavior can be enabled using the preserveUpVector
- property:
-
- \code
- Pane {
- position: Qt.vector3d(2, 0, -20)
- transform: BillboardTransform { preserveUpVector: true }
- effect: Effect { texture: "picture.jpg" }
- }
- \endcode
-*/
-
-class QGraphicsBillboardTransformPrivate
-{
-public:
- QGraphicsBillboardTransformPrivate() : preserveUpVector(false) {}
-
- bool preserveUpVector;
-};
-
-/*!
- Construct a billboard transform and attach it to \a parent.
-*/
-QGraphicsBillboardTransform::QGraphicsBillboardTransform(QObject *parent)
- : QGraphicsTransform3D(parent), d_ptr(new QGraphicsBillboardTransformPrivate)
-{
-}
-
-/*!
- Destroy this billboard transform.
-*/
-QGraphicsBillboardTransform::~QGraphicsBillboardTransform()
-{
-}
-
-/*!
- \property QGraphicsBillboardTransform::preserveUpVector
- \brief true to preserve the up orientation.
-
- The default value for this property is false, which indicates that
- the object being transformed should always face directly to the camera
- This is also known as a "spherical billboard".
-
- If the value for this property is true, then the object will have
- its up orientation preserved. This is also known as a "cylindrical
- billboard".
-*/
-
-/*!
- \qmlproperty bool BillboardTransform::preserveUpVector
-
- This property specifies whether the billboard transform should
- preserve the "up vector" so that objects stay at right angles
- to the ground plane in the scene.
-
- The default value for this property is false, which indicates that
- the object being transformed should always face directly to the camera
- This is also known as a "spherical billboard".
-
- If the value for this property is true, then the object will have
- its up orientation preserved. This is also known as a "cylindrical
- billboard".
-*/
-
-bool QGraphicsBillboardTransform::preserveUpVector() const
-{
- Q_D(const QGraphicsBillboardTransform);
- return d->preserveUpVector;
-}
-
-void QGraphicsBillboardTransform::setPreserveUpVector(bool value)
-{
- Q_D(QGraphicsBillboardTransform);
- if (d->preserveUpVector != value) {
- d->preserveUpVector = value;
- emit transformChanged();
- emit preserveUpVectorChanged();
- }
-}
-
-/*!
- \internal
-*/
-void QGraphicsBillboardTransform::applyTo(QMatrix4x4 *matrix) const
-{
- Q_D(const QGraphicsBillboardTransform);
- if (!d->preserveUpVector) {
- // Replace the top-left 3x3 of the matrix with the identity.
- // The technique is "Cheating Spherical Billboards", described here:
- // http://www.lighthouse3d.com/opengl/billboarding/index.php?billCheat
- (*matrix)(0, 0) = 1.0f;
- (*matrix)(0, 1) = 0.0f;
- (*matrix)(0, 2) = 0.0f;
- (*matrix)(1, 0) = 0.0f;
- (*matrix)(1, 1) = 1.0f;
- (*matrix)(1, 2) = 0.0f;
- (*matrix)(2, 0) = 0.0f;
- (*matrix)(2, 1) = 0.0f;
- (*matrix)(2, 2) = 1.0f;
- } else {
- // Replace some of the top-left 3x3 of the matrix with the identity,
- // but leave the up vector component in the second column as-is.
- // The technique is "Cheating Cylindrical Billboards", described here:
- // http://www.lighthouse3d.com/opengl/billboarding/index.php?billCheat1
- (*matrix)(0, 0) = 1.0f;
- (*matrix)(0, 2) = 0.0f;
- (*matrix)(1, 0) = 0.0f;
- (*matrix)(1, 2) = 0.0f;
- (*matrix)(2, 0) = 0.0f;
- (*matrix)(2, 2) = 1.0f;
- }
- matrix->optimize();
-}
-
-/*!
- \internal
-*/
-QGraphicsTransform3D *QGraphicsBillboardTransform::clone(QObject *parent) const
-{
- Q_D(const QGraphicsBillboardTransform);
- QGraphicsBillboardTransform *copy = new QGraphicsBillboardTransform(parent);
- copy->setPreserveUpVector(d->preserveUpVector);
- return copy;
-}
-
-/*!
- \fn void QGraphicsBillboardTransform::preserveUpVectorChanged()
-
- Signal that is emitted when preserveUpVector() changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.h b/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.h
deleted file mode 100644
index 1f1f788a5fdc51809745759171ffdd8ccac87506..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsbillboardtransform.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSBILLBOARDTRANSFORM_H
-#define QGRAPHICSBILLBOARDTRANSFORM_H
-
-#include "qgraphicstransform3d.h"
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsBillboardTransformPrivate;
-
-class Q_QT3D_EXPORT QGraphicsBillboardTransform : public QGraphicsTransform3D
-{
- Q_OBJECT
- Q_PROPERTY(bool preserveUpVector READ preserveUpVector WRITE setPreserveUpVector NOTIFY preserveUpVectorChanged)
-public:
- QGraphicsBillboardTransform(QObject *parent = 0);
- ~QGraphicsBillboardTransform();
-
- bool preserveUpVector() const;
- void setPreserveUpVector(bool value);
-
- void applyTo(QMatrix4x4 *matrix) const;
- QGraphicsTransform3D *clone(QObject *parent) const;
-
-Q_SIGNALS:
- void preserveUpVectorChanged();
-
-private:
- QScopedPointer<QGraphicsBillboardTransformPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGraphicsBillboardTransform)
- Q_DECLARE_PRIVATE(QGraphicsBillboardTransform)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.cpp
deleted file mode 100644
index 7cb59832ec5fc80ec828917757c8b265d4b9ab32..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicsembedscene.h"
-#include "qglnamespace.h"
-#include <QtOpenGL/qglframebufferobject.h>
-#include <QtGui/qapplication.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qevent.h>
-#include <QtGui/qgraphicssceneevent.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsEmbedScene
- \brief The QGraphicsEmbedScene class provides a method to render a QGraphicsScene into a texture.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- \section1 Rendering the scene into a texture
-
- Embedded scenes are rendered into textures with renderToTexture()
- before the main 3D scene painting with QGLPainter starts. The following
- example shows the sequence of operations for a QGLWidget:
-
- \code
- void MyGLWidget::paintGL()
- {
- GLuint textureId = scene.renderToTexture();
-
- QGLPainter painter(this);
- painter.glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, textureId);
- ... // draw the 3D object
- painter.glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, 0);
- }
- \endcode
-
- When using QGLView, override the QGLWidget::paintGL() function
- explicitly to render scenes into textures before QGLView::paintGL()
- is called:
-
- \code
- void MyGLView::paintGL()
- {
- textureId = scene.renderToTexture();
- QGLView::paintGL();
- }
-
- void MyGLView::paintGL(QGLPainter *painter)
- {
- painter->glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, textureId);
- ... // draw the 3D object
- painter->glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, 0);
- }
- \endcode
-
- The texture is oriented so that (0, 0) corresponds to the bottom-left
- of the scene, and (1, 1) corresponds to the top-right of the scene.
- The texture may be scaled up to a power of two in size for better
- performance.
-
- \section1 Delivering mouse and keyboard events
-
- Mouse and keyboard events originate with the widget that is
- displaying the 3D scene. The application needs to intercept
- these events and decide which 3D object in the scene should
- get the event.
-
- The application then performs an intersection between the 3D
- object and a line in 3D space (usually a QRay3D) to determine
- the texture co-ordinate of where the user clicked on the object.
- How the intersection is determined is application-specific; different
- algorithms are needed based on the type of object (cube, sphere,
- parameterized mesh, etc).
-
- Once the texture co-ordinate has been determined, the application
- passes the widget event and the texture co-ordinate to deliverEvent().
- QGraphicsEmbedScene will then route the event to the appropriate
- graphics item in the embedded scene.
-
- Keyboard, focus in/out, and other non-mouse events do not need a
- texture co-ordinate. Pass (0, 0) as the texture co-ordinate for
- those event types.
-
- \section1 Updating the 3D scene
-
- The application will probably want to perform an update() whenever
- something changes in the embedded scene. The application should
- listen for the QGraphicsScene::changed() and
- QGraphicsScene::sceneRectChanged() signals.
-
- \section1 Performance notes
-
- QGraphicsEmbedScene renders the scene into a framebuffer object,
- which will involve GL state switching. The scene will be
- effectively triple-buffered: render into the fbo, then render
- the fbo into the GL window's back buffer, and finally copy to the
- GL window's front buffer.
-
- If the scene is showing a video item or something else that is
- highly animated, then it may be better to render the source into a
- texture some other way.
-
- If the embedded scene is itself a 3D scene drawn with GL, then use
- QGLPainter::pushSurface() and a QGLFramebufferObjectSurface instead
- of QGraphicsEmbedScene.
-
- \section1 Limitations
-
- When rendered into a texture, the scene does not have a QGraphicsView
- or a viewport QWidget associated with it. Graphics items that require a
- widget rendering surface will not work correctly.
-*/
-
-class QGraphicsEmbedScenePrivate : public QObject
-{
- Q_OBJECT
-public:
- QGraphicsEmbedScenePrivate(QGraphicsScene *scene, QObject *parent = 0)
- : QObject(parent)
- , dirty(true)
- , fbo(0)
- {
- format.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-
- connect(scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(update()));
- connect(scene, SIGNAL(sceneRectChanged(QRectF)), this, SLOT(update()));
- }
- ~QGraphicsEmbedScenePrivate()
- {
- delete fbo;
- }
-
- bool dirty;
- QGLFramebufferObject *fbo;
- QGLFramebufferObjectFormat format;
- QPoint pressedPos;
-
-public Q_SLOTS:
- void update() { dirty = true; }
-};
-
-/*!
- Constructs an embedded graphics scene and attaches it to \a parent.
-*/
-QGraphicsEmbedScene::QGraphicsEmbedScene(QObject *parent)
- : QGraphicsScene(parent)
- , d_ptr(new QGraphicsEmbedScenePrivate(this))
-{
-}
-
-/*!
- Constructs an embedded graphics scene, using \a sceneRect for its
- scene rectangle, and attaches it to \a parent.
-*/
-QGraphicsEmbedScene::QGraphicsEmbedScene(const QRectF &sceneRect, QObject *parent)
- : QGraphicsScene(sceneRect, parent)
- , d_ptr(new QGraphicsEmbedScenePrivate(this))
-{
-}
-
-/*!
- Constructs an embedded graphics scene, using (\a x, \a y, \a width,
- \a height) for its scene rectangle, and attaches it to \a parent.
-*/
-QGraphicsEmbedScene::QGraphicsEmbedScene(qreal x, qreal y, qreal width, qreal height, QObject *parent)
- : QGraphicsScene(x, y, width, height, parent)
- , d_ptr(new QGraphicsEmbedScenePrivate(this))
-{
-}
-
-/*!
- Destroys this embedded graphics scene.
-*/
-QGraphicsEmbedScene::~QGraphicsEmbedScene()
-{
-}
-
-/*!
- Returns the framebuffer object format to use when renderToTexture()
- is called. The default is a framebuffer format with depth and
- stencil buffers, RGBA format, and no multisampling.
-
- \sa setFormat()
-*/
-QGLFramebufferObjectFormat QGraphicsEmbedScene::format() const
-{
- Q_D(const QGraphicsEmbedScene);
- return d->format;
-}
-
-/*!
- Sets the framebuffer object \a format to use when renderToTexture()
- is called.
-
- \sa format()
-*/
-void QGraphicsEmbedScene::setFormat(const QGLFramebufferObjectFormat &format)
-{
- Q_D(QGraphicsEmbedScene);
- d->format = format;
-}
-
-/*!
- Renders this scene to a GL texture and returns the texture identifier.
- If the scene has not changed since the last call, then the same
- texture identifier will be returned without repainting the scene.
-
- The \a levelOfDetail is a hint that allows some control over the
- texture size. The default value of 1 indicates that the texture size
- should be the same or similar to the size of the scene. A value of 2
- would indicate that the texture size should have twice the width and
- height. A value of 0.5 would indicate half the size.
-
- The primary use for \a levelOfDetail is to render the scene with a
- greater level of detail when the 3D object showing the texture is
- larger on-screen than the scene's natural size. The parameter can
- also be used to reduce the level of detail in the texture when the
- 3D object is very small.
-
- It is assumed that a QGLContext is bound when this function is
- called. Usually this is the QGLContext that is bound by a QPainter
- for 2D painting into a GL surface. Note however that a QGLPainter must
- not be active on the QGLContext when this function is called.
-
- \sa format()
-*/
-GLuint QGraphicsEmbedScene::renderToTexture(qreal levelOfDetail)
-{
- Q_D(QGraphicsEmbedScene);
-
- // Determine the fbo size we will need.
- QSize size = (sceneRect().size() * levelOfDetail).toSize();
- QSize fboSize = QGL::nextPowerOfTwo(size);
- if (fboSize.isEmpty())
- fboSize = QSize(16, 16);
-
- // Create or re-create the fbo.
- if (!d->fbo || d->fbo->size() != fboSize) {
- delete d->fbo;
- d->fbo = new QGLFramebufferObject(fboSize, d->format);
- if (!d->fbo->isValid()) {
- delete d->fbo;
- d->fbo = 0;
- return 0;
- }
- d->dirty = true;
- }
-
- // Return the previous texture contents if the scene hasn't changed.
- if (!d->dirty && d->fbo)
- return d->fbo->texture();
-
- // Render the scene into the fbo, scaling the QPainter's view
- // transform up to the power-of-two fbo size.
- QPainter painter(d->fbo);
- painter.setWindow(0, 0, size.width(), size.height());
- painter.setViewport(0, 0, fboSize.width(), fboSize.height());
- render(&painter);
- painter.end();
- d->dirty = false;
- return d->fbo->texture();
-}
-
-/*!
- Delivers \a event to this scene. If \a event is a mouse event, then
- \a texCoord indicates the texture co-ordinate on the side of the
- 3D object where the user clicked. This \a texCoord is used to determine
- the actual scene co-ordinate to deliver: (0, 0) corresponds to the
- bottom-left corner of the scene and (1, 1) corresponds to the
- top-right corner of the scene.
-
- The \a event normally originates from a QWidget or QGraphicsItem that
- contains the 3D object. The caller performs a ray intersection in
- 3D space on the position within \a event to determine the \a texCoord
- and then passes \a event on to deliverEvent() for further processing.
-*/
-void QGraphicsEmbedScene::deliverEvent(QEvent *event, const QPointF &texCoord)
-{
- Q_D(QGraphicsEmbedScene);
-
- // Map the texture co-ordinate into "screen" co-ordinates.
- // Mouse move and release events can extend beyond the boundaries
- // of the scene, for "click and drag off-screen" operations.
- // Mouse press and double-click events need to be constrained.
- QRectF bounds = sceneRect();
- int screenX = qRound(texCoord.x() * bounds.width());
- int screenY = qRound((1.0f - texCoord.y()) * bounds.height());
- switch (event->type()) {
- case QEvent::GraphicsSceneMousePress:
- case QEvent::GraphicsSceneMouseDoubleClick:
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonDblClick:
- if (screenX < 0)
- screenX = 0;
- else if (screenX >= bounds.width())
- screenX = qRound(bounds.width() - 1);
- if (screenY < 0)
- screenY = 0;
- else if (screenY >= bounds.height())
- screenY = qRound(bounds.height() - 1);
- d->pressedPos = QPoint(screenX, screenY);
- break;
- default: break;
- }
-
- // Convert the event and deliver it to the scene.
- switch (event->type()) {
- case QEvent::GraphicsSceneMouseMove:
- case QEvent::GraphicsSceneMousePress:
- case QEvent::GraphicsSceneMouseRelease:
- case QEvent::GraphicsSceneMouseDoubleClick: {
- QGraphicsSceneMouseEvent *ev =
- static_cast<QGraphicsSceneMouseEvent *>(event);
- QGraphicsSceneMouseEvent e(ev->type());
- e.setPos(QPointF(screenX, screenY));
- e.setScenePos(QPointF(screenX + bounds.x(), screenY + bounds.y()));
- e.setScreenPos(QPoint(screenX, screenY));
- e.setButtonDownScreenPos(ev->button(), d->pressedPos);
- e.setButtonDownScenePos
- (ev->button(), QPointF(d->pressedPos.x() + bounds.x(),
- d->pressedPos.y() + bounds.y()));
- e.setButtons(ev->buttons());
- e.setButton(ev->button());
- e.setModifiers(ev->modifiers());
- e.setAccepted(false);
- QApplication::sendEvent(this, &e);
- }
- break;
-
-#ifndef QT_NO_WHEELEVENT
- case QEvent::GraphicsSceneWheel: {
- QGraphicsSceneWheelEvent *ev =
- static_cast<QGraphicsSceneWheelEvent *>(event);
- QGraphicsSceneWheelEvent e(QEvent::GraphicsSceneWheel);
- e.setPos(QPointF(screenX, screenY));
- e.setScenePos(QPointF(screenX + bounds.x(), screenY + bounds.y()));
- e.setScreenPos(QPoint(screenX, screenY));
- e.setButtons(ev->buttons());
- e.setModifiers(ev->modifiers());
- e.setDelta(ev->delta());
- e.setOrientation(ev->orientation());
- e.setAccepted(false);
- QApplication::sendEvent(this, &e);
- }
- break;
-#endif
-
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::MouseButtonDblClick:
- case QEvent::MouseMove: {
- QMouseEvent *ev = static_cast<QMouseEvent *>(event);
- QEvent::Type type;
- if (ev->type() == QEvent::MouseButtonPress)
- type = QEvent::GraphicsSceneMousePress;
- else if (ev->type() == QEvent::MouseButtonRelease)
- type = QEvent::GraphicsSceneMouseRelease;
- else if (ev->type() == QEvent::MouseButtonDblClick)
- type = QEvent::GraphicsSceneMouseDoubleClick;
- else
- type = QEvent::GraphicsSceneMouseMove;
- QGraphicsSceneMouseEvent e(type);
- e.setPos(QPointF(screenX, screenY));
- e.setScenePos(QPointF(screenX + bounds.x(), screenY + bounds.y()));
- e.setScreenPos(QPoint(screenX, screenY));
- e.setButtonDownScreenPos(ev->button(), d->pressedPos);
- e.setButtonDownScenePos
- (ev->button(), QPointF(d->pressedPos.x() + bounds.x(),
- d->pressedPos.y() + bounds.y()));
- e.setButtons(ev->buttons());
- e.setButton(ev->button());
- e.setModifiers(ev->modifiers());
- e.setAccepted(false);
- QApplication::sendEvent(this, &e);
- }
- break;
-
-#ifndef QT_NO_WHEELEVENT
- case QEvent::Wheel: {
- QWheelEvent *ev = static_cast<QWheelEvent *>(event);
- QGraphicsSceneWheelEvent e(QEvent::GraphicsSceneWheel);
- e.setPos(QPointF(screenX, screenY));
- e.setScenePos(QPointF(screenX + bounds.x(), screenY + bounds.y()));
- e.setScreenPos(QPoint(screenX, screenY));
- e.setButtons(ev->buttons());
- e.setModifiers(ev->modifiers());
- e.setDelta(ev->delta());
- e.setOrientation(ev->orientation());
- e.setAccepted(false);
- QApplication::sendEvent(this, &e);
- }
- break;
-#endif
-
- default: {
- // Send the event directly without any conversion.
- // Typically used for keyboard, focus, and enter/leave events.
- QApplication::sendEvent(this, event);
- }
- break;
-
- }
-}
-
-/*!
- \internal
-*/
-void QGraphicsEmbedScene::drawBackground(QPainter *painter, const QRectF &rect)
-{
- if (backgroundBrush().style() == Qt::NoBrush) {
- // Fill the fbo with the transparent color as there won't
- // be a window or graphics item drawing a previous background.
- painter->save();
- painter->setCompositionMode(QPainter::CompositionMode_Source);
- painter->fillRect(rect, Qt::transparent);
- painter->restore();
- } else {
- QGraphicsScene::drawBackground(painter, rect);
- }
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.h b/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.h
deleted file mode 100644
index 6c60e34786c1ad1925b2f44a3fea31a7ae30a3c3..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsembedscene.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSEMBEDSCENE_H
-#define QGRAPHICSEMBEDSCENE_H
-
-#include "qglnamespace.h"
-#include <QtGui/qgraphicsscene.h>
-#include <QtOpenGL/qgl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGraphicsEmbedScenePrivate;
-class QGLFramebufferObjectFormat;
-
-class Q_QT3D_EXPORT QGraphicsEmbedScene : public QGraphicsScene
-{
- Q_OBJECT
-public:
- QGraphicsEmbedScene(QObject *parent = 0);
- QGraphicsEmbedScene(const QRectF &sceneRect, QObject *parent = 0);
- QGraphicsEmbedScene(qreal x, qreal y, qreal width, qreal height, QObject *parent = 0);
- virtual ~QGraphicsEmbedScene();
-
- QGLFramebufferObjectFormat format() const;
- void setFormat(const QGLFramebufferObjectFormat &format);
-
- GLuint renderToTexture(qreal levelOfDetail = 1.0f);
-
- void deliverEvent(QEvent *event, const QPointF &texCoord);
-
-protected:
- void drawBackground(QPainter *painter, const QRectF &rect);
-
-private:
- QScopedPointer<QGraphicsEmbedScenePrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGraphicsEmbedScene)
- Q_DISABLE_COPY(QGraphicsEmbedScene)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.cpp
deleted file mode 100644
index 122af52aba3e66cafe182cedc7fba8b989ff7a5b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicsrotation3d.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsRotation3D
- \brief The QGraphicsRotation3D class supports arbitrary rotation around an axis in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- \sa QGraphicsTranslation3D, QGraphicsScale3D
-*/
-
-/*!
- \qmlclass Rotation3D QGraphicsRotation3D
- \brief The Rotation3D item supports arbitrary rotation around an axis in 3D space.
- \since 4.8
- \ingroup qt3d::qml3d
-
- Frequently a user will create and item in the 3d world and immediately
- wish to apply a rotation to that item before it is displayed, or,
- optionally, perform an animation on that rotation parameter based on
- user inputs, or other events. Such an rotation can easily be defined
- in QML using the following code:
-
- \code
- Item3D {
- id: helicoptor
- mesh: Mesh {source: "monkey.3ds"}
- effect: Effect {}
- cullFaces: "CullBackFaces"
-
- transform: [
- Rotation3D {
- id: rotate1
- angle: 5
- axis: Qt.vector3d(1, 0, 0)
- },
- Rotation3D {
- id: rotate2
- angle: 5
- axis: Qt.vector3d(0, 1, 0)
- },
- Rotation3D {
- id: rotate3
- angle: 45
- axis: Qt.vector3d(0, 0, 1)
- }
- ]
-
- SequentialAnimation {
- NumberAnimation {target: rotate1; property: "angle"; to : 360.0; duration: 3000; easing.type:easeOutQuad }
- }
- }
- \endcode
-
- Notice here that we create a list of rotations for the \c transform
- property of the container item. By doing this we allow rotations
- around each of the axes individually in a manner which is conducive
- to animation and interaction.
-
- Each of the rotations has an \c axis property which is a QVector3D.
- This vector contains a value for each of the three components
- corresponding to x, y, and z. In the above example, we first
- rotate by 5 degrees about the x axis, then 5 degrees about the y
- axis, and finally by 45 degrees about the z axis.
-
- By giving each rotation a unique \c id users can then refer to these
- rotations in the QML source in order to perform rotational animations.
-
- \sa Translation3D, Scale3D
-*/
-
-class QGraphicsRotation3DPrivate
-{
-public:
- QGraphicsRotation3DPrivate() : axis(0, 0, 1), angle(0) {}
-
- QVector3D origin;
- QVector3D axis;
- qreal angle;
-};
-
-/*!
- Create a 3D rotation transformation and attach it to \a parent.
-*/
-QGraphicsRotation3D::QGraphicsRotation3D(QObject *parent)
- : QGraphicsTransform3D(parent)
- , d_ptr(new QGraphicsRotation3DPrivate)
-{
-}
-
-/*!
- Destroy this 3D rotation transformation.
-*/
-QGraphicsRotation3D::~QGraphicsRotation3D()
-{
-}
-
-/*!
- \property QGraphicsRotation3D::origin
- \brief the origin about which to rotate.
-
- The default value for this property is (0, 0, 0).
-*/
-
-/*!
- \qmlproperty vector3D Rotation3D::origin
-
- The origin about which to rotate. The default value for this
- property is (0, 0, 0).
-*/
-
-QVector3D QGraphicsRotation3D::origin() const
-{
- Q_D(const QGraphicsRotation3D);
- return d->origin;
-}
-
-void QGraphicsRotation3D::setOrigin(const QVector3D &value)
-{
- Q_D(QGraphicsRotation3D);
- if (d->origin != value) {
- d->origin = value;
- emit transformChanged();
- emit originChanged();
- }
-}
-
-/*!
- \property QGraphicsRotation3D::angle
- \brief the angle to rotate around the axis, in degrees anti-clockwise.
-
- The default value for this property is 0.
-*/
-
-/*!
- \qmlproperty real Rotation3D::angle
-
- The angle to rotate around the axis, in degrees anti-clockwise.
- The default value for this property is 0.
-*/
-
-qreal QGraphicsRotation3D::angle() const
-{
- Q_D(const QGraphicsRotation3D);
- return d->angle;
-}
-
-void QGraphicsRotation3D::setAngle(qreal value)
-{
- Q_D(QGraphicsRotation3D);
- if (d->angle != value) {
- d->angle = value;
- emit transformChanged();
- emit angleChanged();
- }
-}
-
-/*!
- \property QGraphicsRotation3D::axis
- \brief the axis to rotate around.
-
- The default value for this property is (0, 0, 1); i.e. the z-axis.
-*/
-
-/*!
- \qmlproperty vector3D Rotation3D::axis
-
- The axis to rotate around. The default value for this property
- is (0, 0, 1); i.e. the z-axis.
-*/
-
-QVector3D QGraphicsRotation3D::axis() const
-{
- Q_D(const QGraphicsRotation3D);
- return d->axis;
-}
-
-void QGraphicsRotation3D::setAxis(const QVector3D &value)
-{
- Q_D(QGraphicsRotation3D);
- if (d->axis != value) {
- d->axis = value;
- emit transformChanged();
- emit axisChanged();
- }
-}
-
-/*!
- \internal
-*/
-void QGraphicsRotation3D::applyTo(QMatrix4x4 *matrix) const
-{
- Q_D(const QGraphicsRotation3D);
- matrix->translate(d->origin);
- matrix->rotate(d->angle, d->axis.x(), d->axis.y(), d->axis.z());
- matrix->translate(-d->origin);
-}
-
-/*!
- \internal
-*/
-QGraphicsTransform3D *QGraphicsRotation3D::clone(QObject *parent) const
-{
- Q_D(const QGraphicsRotation3D);
- QGraphicsRotation3D *copy = new QGraphicsRotation3D(parent);
- copy->setOrigin(d->origin);
- copy->setAxis(d->axis);
- copy->setAngle(d->angle);
- return copy;
-}
-
-/*!
- \fn void QGraphicsRotation3D::originChanged()
-
- Signal that is emitted when origin() changes.
-*/
-
-/*!
- \fn void QGraphicsRotation3D::angleChanged()
-
- Signal that is emitted when angle() changes.
-*/
-
-/*!
- \fn void QGraphicsRotation3D::axisChanged()
-
- Signal that is emitted when axis() changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.h b/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.h
deleted file mode 100644
index 5da80a7d929eb6a713c5e1d8112d139be85f09b1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsrotation3d.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSROTATION3D_H
-#define QGRAPHICSROTATION3D_H
-
-#include "qgraphicstransform3d.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsRotation3DPrivate;
-
-class Q_QT3D_EXPORT QGraphicsRotation3D : public QGraphicsTransform3D
-{
- Q_OBJECT
- Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged)
- Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
- Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
-public:
- QGraphicsRotation3D(QObject *parent = 0);
- ~QGraphicsRotation3D();
-
- QVector3D origin() const;
- void setOrigin(const QVector3D &value);
-
- qreal angle() const;
- void setAngle(qreal value);
-
- QVector3D axis() const;
- void setAxis(const QVector3D &value);
-
- void applyTo(QMatrix4x4 *matrix) const;
- QGraphicsTransform3D *clone(QObject *parent) const;
-
-Q_SIGNALS:
- void originChanged();
- void angleChanged();
- void axisChanged();
-
-private:
- QScopedPointer<QGraphicsRotation3DPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGraphicsRotation3D)
- Q_DECLARE_PRIVATE(QGraphicsRotation3D)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.cpp
deleted file mode 100644
index 6e7bb0381f8af20c83eb78b4c7785b05fb9182c1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicsscale3d.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsScale3D
- \brief The QGraphicsScale3D class supports scaling of items in 3D.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- \sa QGraphicsRotation3D, QGraphicsTranslation3D
-*/
-
-/*!
- \qmlclass Scale3D QGraphicsScale3D
- \brief The Scale3D item supports scaling of items in 3D.
- \since 4.8
- \ingroup qt3d::qml3d
-
- 3D items in QML can have a simple scale applied directly as follows:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- scale: 0.5
- }
- \endcode
-
- An alternative is to use Scale3D to apply a transform directly
- to an item as part of a sequence of transformations:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- transform: [
- Translation3D { translate: Qt.vector3d(5, 0, 0) },
- Scale3D { scale: 0.5 }
- ]
- }
- \endcode
-
- This allows the application writer to control exactly when the
- scale occurs relative to other transformations. In the example
- above, the item is first translated by 5 units along the x-axis,
- and then the co-ordinates are scaled by half. This is distinct
- from the following example which scales the object to half its
- original size and then translates it by 5 units along the x-axis:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- transform: [
- Scale3D { scale: 0.5 },
- Translation3D { translate: Qt.vector3d(5, 0, 0) }
- ]
- }
- \endcode
-
- The scale property on the item itself is applied before
- any of the transforms. So the previous example is equivalent to:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- scale: 0.5
- transform: [
- Translation3D { translate: Qt.vector3d(5, 0, 0) }
- ]
- }
- \endcode
-
- Scale values can also affect the x, y, and z axes by different amounts
- by using a \c{vector3D} value:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- transform: [
- Scale3D { scale: Qt.vector3d(0.5, 0.2, 1.0) },
- Translation3D { translate: Qt.vector3d(5, 0, 0) }
- ]
- }
- \endcode
-
- \sa Rotation3D, Translation3D
-*/
-
-class QGraphicsScale3DPrivate
-{
-public:
- QGraphicsScale3DPrivate()
- : scale(1, 1, 1)
- , isIdentityScale(true)
- , isIdentityOrigin(true)
- {}
-
- QVector3D origin;
- QVector3D scale;
- bool isIdentityScale;
- bool isIdentityOrigin;
-};
-
-/*!
- Construct a 3D scale transform and attach it to \a parent.
-*/
-QGraphicsScale3D::QGraphicsScale3D(QObject *parent)
- : QGraphicsTransform3D(parent), d_ptr(new QGraphicsScale3DPrivate)
-{
-}
-
-/*!
- Destroy this 3D scale transform.
-*/
-QGraphicsScale3D::~QGraphicsScale3D()
-{
-}
-
-/*!
- \property QGraphicsScale3D::origin
- \brief the origin about which to scale.
-
- The default value for this property is (0, 0, 0).
-*/
-
-/*!
- \qmlproperty vector3D Scale3D::origin
-
- The origin about which to scale. The default value for this
- property is (0, 0, 0).
-*/
-
-QVector3D QGraphicsScale3D::origin() const
-{
- Q_D(const QGraphicsScale3D);
- return d->origin;
-}
-
-void QGraphicsScale3D::setOrigin(const QVector3D &value)
-{
- Q_D(QGraphicsScale3D);
-
- // Optimise for the common case of setting the origin to 0, 0, 0
- // Also minimise the number of floating point compares required
- bool changed = false;
- QVector3D v = value;
-
- // Are we about to set to 0, 0, 0 ...?
- // Normalise inbound value & record in bool to save on compares
- bool isSetToZeroOrigin = false;
- if (qFuzzyIsNull(v.x()) && qFuzzyIsNull(v.y()) && qFuzzyIsNull(v.z()))
- {
- v = QVector3D(0, 0, 0);
- isSetToZeroOrigin = true;
- }
- if (!isSetToZeroOrigin)
- {
- if (d->origin != v)
- {
- d->origin = v;
- d->isIdentityOrigin = false;
- changed = true;
- }
- }
- else
- {
- if (!d->isIdentityOrigin)
- {
- d->origin = v;
- d->isIdentityOrigin = true;
- changed = true;
- }
- }
- if (changed)
- {
- emit transformChanged();
- emit originChanged();
- }
-}
-
-/*!
- \property QGraphicsScale3D::scale
- \brief the amount with which to scale each component.
-
- The default value for this property is QVector3D(1, 1, 1).
-*/
-
-/*!
- \qmlproperty vector3D Scale3D::scale
-
- The amount with which to scale each component. The default value for
- this property is (1, 1, 1).
-
- This property can be specified as either a vector3D or a single
- floating-point value. A single floating-point value will set
- the x, y, and z scale components to the same value. In other words,
- the following two transformations are equivalent:
-
- \code
- Scale3D { scale: 2 }
- Scale3D { scale: Qt.vector3d(2, 2, 2) }
- \endcode
-*/
-
-QVector3D QGraphicsScale3D::scale() const
-{
- Q_D(const QGraphicsScale3D);
- return d->scale;
-}
-
-void QGraphicsScale3D::setScale(const QVector3D &value)
-{
- Q_D(QGraphicsScale3D);
-
- // Optimise for the common case of setting the scale to 1, 1, 1
- // Also minimise the number of floating point compares required
- bool changed = false;
- QVector3D v = value;
-
- // Are we about to set to 1, 1, 1 ...?
- // Normalise inbound value & record in bool to save on compares
- bool isSetToIdentity = false;
- if (qFuzzyIsNull(v.x() - 1.0f) && qFuzzyIsNull(v.y() - 1.0f) && qFuzzyIsNull(v.z() - 1.0f))
- {
- v = QVector3D(1, 1, 1);
- isSetToIdentity = true;
- }
- if (!isSetToIdentity)
- {
- if (d->scale != v)
- {
- d->scale = v;
- d->isIdentityScale = false;
- changed = true;
- }
- }
- else
- {
- if (!d->isIdentityScale)
- {
- d->scale = v;
- d->isIdentityScale = true;
- changed = true;
- }
- }
- if (changed)
- {
- emit transformChanged();
- emit scaleChanged();
- }
-}
-
-/*!
- \internal
-*/
-void QGraphicsScale3D::applyTo(QMatrix4x4 *matrix) const
-{
- Q_D(const QGraphicsScale3D);
- if (!d->isIdentityScale)
- {
- if (d->isIdentityOrigin)
- {
- matrix->scale(d->scale);
- }
- else
- {
- matrix->translate(d->origin);
- matrix->scale(d->scale);
- matrix->translate(-d->origin);
- }
- }
-}
-
-/*!
- \internal
-*/
-QGraphicsTransform3D *QGraphicsScale3D::clone(QObject *parent) const
-{
- Q_D(const QGraphicsScale3D);
- QGraphicsScale3D *copy = new QGraphicsScale3D(parent);
- copy->setOrigin(d->origin);
- copy->setScale(d->scale);
- return copy;
-}
-
-/*!
- \fn void QGraphicsScale3D::originChanged()
-
- Signal that is emitted when origin() changes.
-*/
-
-/*!
- \fn void QGraphicsScale3D::scaleChanged()
-
- Signal that is emitted when scale() changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.h b/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.h
deleted file mode 100644
index b406ace109231c026fb710046a689bc1a7b593e7..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicsscale3d.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSSCALE3D_H
-#define QGRAPHICSSCALE3D_H
-
-#include "qgraphicstransform3d.h"
-#include <QtCore/qscopedpointer.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsScale3DPrivate;
-
-class Q_QT3D_EXPORT QGraphicsScale3D : public QGraphicsTransform3D
-{
- Q_OBJECT
- Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged)
- Q_PROPERTY(QVector3D scale READ scale WRITE setScale NOTIFY scaleChanged)
-public:
- QGraphicsScale3D(QObject *parent = 0);
- ~QGraphicsScale3D();
-
- QVector3D origin() const;
- void setOrigin(const QVector3D &value);
-
- QVector3D scale() const;
- void setScale(const QVector3D &value);
-
- void applyTo(QMatrix4x4 *matrix) const;
- QGraphicsTransform3D *clone(QObject *parent) const;
-
-Q_SIGNALS:
- void originChanged();
- void scaleChanged();
-
-private:
- QScopedPointer<QGraphicsScale3DPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGraphicsScale3D)
- Q_DECLARE_PRIVATE(QGraphicsScale3D)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.cpp
deleted file mode 100644
index 89e98575b07dfcbe011b2fa7e1a6d24ffeffc8ed..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicstransform3d.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsTransform3D
- \brief The QGraphicsTransform3D class is an abstract base class for building 3D transformations.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- QGraphicsTransform3D lets you create and control advanced transformations
- that can be configured independently using specialized properties.
- Scene nodes have an associated list of transforms, which are applied
- in order, one at a time, to the modelview matrix. Transformations are
- computed in true 3D space using QMatrix4x4.
-
- QGraphicsTransform3D is particularly useful for animations. Whereas
- QGLPainter::modelViewMatrix() lets you assign any transform directly,
- there is no direct way to interpolate between two different
- transformations (e.g., when transitioning between two states, each for
- which the item has a different arbitrary transform assigned). Using
- QGraphicsTransform3D you can interpolate the property values of each
- independent transformation. The resulting operation is then combined into a
- single transform which is applied to the modelview matrix during drawing.
-
- If you want to create your own configurable transformation, you can create
- a subclass of QGraphicsTransform3D (or any or the existing subclasses), and
- reimplement the pure virtual applyTo() function, which takes a pointer to a
- QMatrix4x4. Each operation you would like to apply should be exposed as
- properties (e.g., customTransform->setVerticalShear(2.5)). Inside you
- reimplementation of applyTo(), you can modify the provided transform
- respectively.
-
- \sa QGraphicsScale3D, QGraphicsRotation3D, QGraphicsTranslation3D
- \sa QGraphicsBillboardTransform
-*/
-
-/*!
- \fn QGraphicsTransform3D::QGraphicsTransform3D(QObject *parent)
-
- Constructs a 3D transformation and attaches it to \a parent.
-*/
-
-/*!
- \fn QGraphicsTransform3D::~QGraphicsTransform3D()
-
- Destroys this 3D transformation.
-*/
-
-/*!
- \fn void QGraphicsTransform3D::applyTo(QMatrix4x4 *matrix) const
-
- Applies the effect of this transformation to the specified
- modelview \a matrix.
-*/
-
-/*!
- \fn QGraphicsTransform3D *QGraphicsTransform3D::clone(QObject *parent) const
-
- Clones a copy of this transformation and attaches the clone to \a parent.
-*/
-
-/*!
- \fn void QGraphicsTransform3D::transformChanged()
-
- Signal that is emitted whenever any of the transformation's
- parameters are changed.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.h b/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.h
deleted file mode 100644
index b745709502a41ffe5ffdbf6f84b33dc70db908e1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicstransform3d.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSTRANSFORM3D_H
-#define QGRAPHICSTRANSFORM3D_H
-
-#include <QtCore/qobject.h>
-#include <QtGui/qmatrix4x4.h>
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class Q_QT3D_EXPORT QGraphicsTransform3D : public QObject
-{
- Q_OBJECT
-public:
- QGraphicsTransform3D(QObject *parent = 0) : QObject(parent) {}
- ~QGraphicsTransform3D() {}
-
- virtual void applyTo(QMatrix4x4 *matrix) const = 0;
- virtual QGraphicsTransform3D *clone(QObject *parent = 0) const = 0;
-
-Q_SIGNALS:
- void transformChanged();
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.cpp b/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.cpp
deleted file mode 100644
index 8ad003adfa191766d3854b3fd419856283d4ca49..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgraphicstranslation3d.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGraphicsTranslation3D
- \brief The QGraphicsTranslation3D class supports translation of 3D items.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::graphicsview
-
- QGraphicsTranslation3D is derived directly from QGraphicsTransform, and
- provides a \l translate property to specify the 3D vector to
- apply to incoming co-ordinates.
-
- The \l progress property can be used to perform animation along a
- translation vector by varying the progress value between 0 and 1.
- Overshoot animations are also possible by setting the progress
- value to something outside this range. The default progress
- value is 1.
-
- \sa QGraphicsRotation3D, QGraphicsScale3D
-*/
-
-/*!
- \qmlclass Translation3D QGraphicsTranslation3D
- \brief The Translation3D item supports translation of items in 3D.
- \since 4.8
- \ingroup qt3d::qml3d
-
- 3D items in QML are typically positioned directly as follows:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- position: Qt.vector3d(0, 5, 10)
- }
- \endcode
-
- However, it can sometimes be useful to translate an object along a
- vector under the control of an animation. The Translate3D
- element can be used for this purpose. The following example
- translates the object along a straight-line path 5 units to
- the right of its original position, and then back again:
-
- \code
- Item3D {
- mesh: Mesh { source: "chair.3ds" }
- position: Qt.vector3d(0, 5, 10)
- transform: [
- Translation3D {
- translate: Qt.vector3d(5, 0, 0)
- SequentialAnimation on progress {
- running: true
- loops: Animation.Infinite
- NumberAnimation { to : 1.0; duration: 300 }
- NumberAnimation { to : 0.0; duration: 300 }
- }
- }
- ]
- }
- \endcode
-
- \sa Rotation3D, Scale3D
-*/
-
-class QGraphicsTranslation3DPrivate
-{
-public:
- QGraphicsTranslation3DPrivate() : progress(1.0f) {}
-
- QVector3D translate;
- qreal progress;
-};
-
-/*!
- Constructs a new translation and attaches it to \a parent.
-*/
-QGraphicsTranslation3D::QGraphicsTranslation3D(QObject *parent)
- : QGraphicsTransform3D(parent), d_ptr(new QGraphicsTranslation3DPrivate)
-{
-}
-
-/*!
- Destroys this translation.
-*/
-QGraphicsTranslation3D::~QGraphicsTranslation3D()
-{
-}
-
-/*!
- \property QGraphicsTranslation3D::translate
- \brief the translation to apply to incoming co-ordinates.
-
- The default value for this property is (0, 0, 0).
-*/
-
-/*!
- \qmlproperty vector3D Translation3D::translate
-
- The translation to apply to incoming co-ordinates. The default value
- for this property is (0, 0, 0).
-*/
-
-QVector3D QGraphicsTranslation3D::translate() const
-{
- Q_D(const QGraphicsTranslation3D);
- return d->translate;
-}
-
-void QGraphicsTranslation3D::setTranslate(const QVector3D &value)
-{
- Q_D(QGraphicsTranslation3D);
- if (d->translate != value) {
- d->translate = value;
- emit transformChanged();
- emit translateChanged();
- }
-}
-
-/*!
- \property QGraphicsTranslation3D::progress
- \brief the progress along the translation vector, from 0 to 1.
-
- The default value for this property is 1.
-
- This property can be used to perform animation along a translation
- vector by varying the progress between 0 and 1. Overshoot animations
- are also possible by setting the value to something outside this range.
-*/
-
-/*!
- \qmlproperty real Translation3D::progress
-
- The progress along the translation vector, from 0 to 1. The default
- value for this property is 1.
-
- This property can be used to perform animation along a translation
- vector by varying the progress between 0 and 1. Overshoot animations
- are also possible by setting the value to something outside this range.
-*/
-
-qreal QGraphicsTranslation3D::progress() const
-{
- Q_D(const QGraphicsTranslation3D);
- return d->progress;
-}
-
-void QGraphicsTranslation3D::setProgress(qreal value)
-{
- Q_D(QGraphicsTranslation3D);
- if (d->progress != value) {
- d->progress = value;
- emit transformChanged();
- emit progressChanged();
- }
-}
-
-/*!
- \internal
-*/
-void QGraphicsTranslation3D::applyTo(QMatrix4x4 *matrix) const
-{
- Q_D(const QGraphicsTranslation3D);
- matrix->translate(d->translate * d->progress);
-}
-
-/*!
- \internal
-*/
-QGraphicsTransform3D *QGraphicsTranslation3D::clone(QObject *parent) const
-{
- Q_D(const QGraphicsTranslation3D);
- QGraphicsTranslation3D *copy = new QGraphicsTranslation3D(parent);
- copy->setTranslate(d->translate);
- copy->setProgress(d->progress);
- return copy;
-}
-
-/*!
- \fn void QGraphicsTranslation3D::translateChanged()
-
- Signal that is emitted when translate() changes.
-*/
-
-/*!
- \fn void QGraphicsTranslation3D::progressChanged()
-
- Signal that is emitted when progress() changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.h b/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.h
deleted file mode 100644
index 2816996bac2273f908b7176bf421f51ee28e85c0..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/graphicsview/qgraphicstranslation3d.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGRAPHICSTRANSLATION3D_H
-#define QGRAPHICSTRANSLATION3D_H
-
-#include "qgraphicstransform3d.h"
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsTranslation3DPrivate;
-
-class Q_QT3D_EXPORT QGraphicsTranslation3D : public QGraphicsTransform3D
-{
- Q_OBJECT
- Q_PROPERTY(QVector3D translate READ translate WRITE setTranslate NOTIFY translateChanged)
- Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
-public:
- QGraphicsTranslation3D(QObject *parent = 0);
- ~QGraphicsTranslation3D();
-
- QVector3D translate() const;
- void setTranslate(const QVector3D &value);
-
- qreal progress() const;
- void setProgress(qreal value);
-
- void applyTo(QMatrix4x4 *matrix) const;
- QGraphicsTransform3D *clone(QObject *parent) const;
-
-Q_SIGNALS:
- void translateChanged();
- void progressChanged();
-
-private:
- QScopedPointer<QGraphicsTranslation3DPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGraphicsTranslation3D)
- Q_DECLARE_PRIVATE(QGraphicsTranslation3D)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/materials/CMakeLists.txt b/src/gui/extern/Qt3D/materials/CMakeLists.txt
deleted file mode 100644
index 769f0e6a4ff7902b2eeddb8b0a0bb033b2de13bc..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-target_sources( gui
- PRIVATE
- qglabstractmaterial.h
- qgltwosidedmaterial.cpp
- qglcolormaterial.h
- qglcolormaterial.cpp
- qgltwosidedmaterial.h
- qglmaterial.h
- qglabstractmaterial.cpp
- qglmaterial_p.h
- qglmaterial.cpp
- )
diff --git a/src/gui/extern/Qt3D/materials/qglabstractmaterial.cpp b/src/gui/extern/Qt3D/materials/qglabstractmaterial.cpp
deleted file mode 100644
index 6ce23059b76cf35dec508a08878b1bab2546f1e7..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglabstractmaterial.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglabstractmaterial.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAbstractMaterial
- \since 4.8
- \brief The QGLAbstractMaterial class provides a standard interface for rendering surface materials with GL.
- \ingroup qt3d
- \ingroup qt3d::materials
-
- Materials are the primary method to specify the surface appearance of an
- object, as distinct from the geometry for the object. Materials have an
- almost endless variety of parameters:
-
- \list
- \o Properties of the material under various lighting conditions;
- i.e., the traditional parameters for ambient, diffuse, specular, etc.
- \o Textures in multiple layers, with different combination modes;
- decal, modulate, replace, etc.
- \o Environmental conditions such as fogging.
- \o Alpha values for opacity and blending.
- \o Interpolation factors for animated surface effects.
- \o etc
- \endlist
-
- QGLAbstractMaterial is the base class for all such materials.
- It provides a very simple API to bind() a material to a QGLPainter
- when the material needs to be rendered, to release() a material
- from a QGLPainter when the material is no longer needed, and to
- prepareToDraw().
-
- Subclasses of QGLAbstractMaterial implement specific materials.
- QGLMaterial provides the traditional ambient, diffuse, specular, etc
- parameters for lighting properties.
-
- Materials are distinct from \i effects, which have the base class
- QGLAbstractEffect. Effects are typically shader programs that are
- used to render a specific type of material. The material's bind()
- function will use QGLPainter::setStandardEffect() or
- QGLPainter::setUserEffect() to select the exact effect that is
- needed to render the material.
-
- It is possible that the same material may be rendered with different
- effects depending upon the material parameters. For example, a lit
- material may select a simpler and more efficient shader program effect
- if the material has the default spotlight properties, or if the
- QGLPainter only has a single light source specified.
-
- \sa QGLMaterial, QGLAbstractEffect
-*/
-
-/*!
- Constructs a new material and attaches it to \a parent.
-*/
-QGLAbstractMaterial::QGLAbstractMaterial(QObject *parent)
- : QObject(parent)
-{
-}
-
-/*!
- Destroys this material.
-*/
-QGLAbstractMaterial::~QGLAbstractMaterial()
-{
-}
-
-/*!
- Returns the material lighting parameters for rendering the front
- faces of fragments with this abstract material. The default
- implementation returns null.
-
- This function is provided as a convenience for applications that
- wish to alter the lighting parameters or textures of a material,
- without regard to any wrapping that has been performed to add
- blending or other options.
-
- \sa back(), QGLMaterial
-*/
-QGLMaterial *QGLAbstractMaterial::front() const
-{
- return 0;
-}
-
-/*!
- Returns the material lighting parameters for rendering the back
- faces of fragments with this abstract material. The default
- implementation returns null, which indicates that front()
- is also used to render back faces.
-
- \sa front(), QGLMaterial
-*/
-QGLMaterial *QGLAbstractMaterial::back() const
-{
- return 0;
-}
-
-/*!
- \fn bool QGLAbstractMaterial::isTransparent() const
-
- Returns true if this material is transparent and will therefore
- require the \c{GL_BLEND} mode to be enabled to render the material.
- Returns false if the material is fully opaque.
-*/
-
-/*!
- \fn void QGLAbstractMaterial::bind(QGLPainter *painter)
-
- Binds resources to \a painter that are needed to render this
- material; textures, shader programs, blending modes, etc.
-
- In the following example, lit material parameters and a texture
- are bound to the \a painter, for rendering with the standard
- QGL::LitModulateTexture2D effect:
-
- \code
- void TexturedLitMaterial::bind(QGLPainter *painter)
- {
- painter->setStandardEffect(QGL::LitModulateTexture2D);
- painter->setFaceMaterial(QGL::AllFaces, material);
- painter->glActiveTexture(GL_TEXTURE0);
- texture->bind();
- }
- \endcode
-
- Normally the effect is bound to \a painter during the bind()
- function. However, some materials may need to use different
- effects depending upon which attributes are present in the
- geometry. For example, a per-vertex color effect instead of a
- uniform color effect if the geometry has the QGL::Color attribute.
- The prepareToDraw() function can be overridden to alter the
- effect once the specific set of geometry attributes are known.
-
- \sa release(), prepareToDraw()
-*/
-
-/*!
- \fn void QGLAbstractMaterial::release(QGLPainter *painter, QGLAbstractMaterial *next)
-
- Releases resources from \a painter that were used to render this
- material. The QGLPainter::effect() can be left bound to \a painter,
- but other resources such as textures and blending modes
- should be disabled.
-
- If \a next is not null, then it indicates the next material that
- will be bound to \a painter. If \a next is the same type of
- material as this material, then this function can choose not to
- release resources that would be immediately re-bound to
- \a painter in the next call to bind().
-
- In the following example, texture unit 0 is unbound if \a painter
- is about to switch to another effect that is not an instance
- of \c{TexturedLitMaterial}:
-
- \code
- void TexturedLitMaterial::release(QGLPainter *painter, QGLAbstractMaterial *next)
- {
- if (!qobject_cast<TexturedLitMaterial *>(next)) {
- painter->glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, 0);
- }
- }
- \endcode
-
- \sa bind(), prepareToDraw()
-*/
-
-/*!
- Prepares to draw geometry to \a painter that has the specified
- set of vertex \a attributes. The default implementation
- does nothing.
-
- Multiple effects may be used to render some materials depending upon
- the available vertex attributes. For example, if QGL::Color is
- present in \a attributes, then a per-vertex color should be used
- instead of a single uniform color.
-
- This function is provided for such materials to have one last
- chance during QGLPainter::draw() to alter the QGLPainter::effect()
- to something that is tuned for the specific geometry. It can
- be assumed that bind() has already been called on this material.
-
- \sa bind(), release()
-*/
-void QGLAbstractMaterial::prepareToDraw(QGLPainter *painter, const QGLAttributeSet &attributes)
-{
- Q_UNUSED(painter);
- Q_UNUSED(attributes);
-}
-
-/*!
- \fn void QGLAbstractMaterial::materialChanged()
-
- Signal that is emitted when an object that is using this material
- should be redrawn because some property on the material has changed.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/materials/qglabstractmaterial.h b/src/gui/extern/Qt3D/materials/qglabstractmaterial.h
deleted file mode 100644
index 3ed46c018e7daaa44af1a45547682c9486549cbe..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglabstractmaterial.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLABSTRACTMATERIAL_H
-#define QGLABSTRACTMATERIAL_H
-
-#include <QtCore/qobject.h>
-#include "qglattributeset.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLPainter;
-class QGLMaterial;
-
-class Q_QT3D_EXPORT QGLAbstractMaterial : public QObject
-{
- Q_OBJECT
- Q_DISABLE_COPY(QGLAbstractMaterial)
-public:
- explicit QGLAbstractMaterial(QObject *parent = 0);
- ~QGLAbstractMaterial();
-
- virtual QGLMaterial *front() const;
- virtual QGLMaterial *back() const;
-
- virtual bool isTransparent() const = 0;
-
- virtual void bind(QGLPainter *painter) = 0;
- virtual void release(QGLPainter *painter, QGLAbstractMaterial *next) = 0;
- virtual void prepareToDraw(QGLPainter *painter, const QGLAttributeSet &attributes);
-
-Q_SIGNALS:
- void materialChanged();
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/materials/qglcolormaterial.cpp b/src/gui/extern/Qt3D/materials/qglcolormaterial.cpp
deleted file mode 100644
index 15df7ce5abf7b13c049d0ebdbccd7e0c62b4adfe..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglcolormaterial.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcolormaterial.h"
-#include "qglpainter.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLColorMaterial
- \since 4.8
- \brief The QGLColorMaterial class implements flat or per-vertex color materials for 3D rendering.
- \ingroup qt3d
- \ingroup qt3d::materials
-
- When bound to a QGLPainter, QGLColorMaterial will select a flat
- color drawing effect, to render fragments with color(), ignoring
- any lights or textures that may be active on the QGLPainter state.
- If the geometry has the QGL::Color attribute, then a per-vertex
- color will be used instead and color() is ignored.
-
- \sa QGLMaterial
-*/
-
-class QGLColorMaterialPrivate
-{
-public:
- QGLColorMaterialPrivate() : color(255, 255, 255, 255) {}
-
- QColor color;
-};
-
-/*!
- Constructs a new flat color material and attaches it to \a parent.
-*/
-QGLColorMaterial::QGLColorMaterial(QObject *parent)
- : QGLAbstractMaterial(parent)
- , d_ptr(new QGLColorMaterialPrivate)
-{
-}
-
-/*!
- Destroys this flat color material.
-*/
-QGLColorMaterial::~QGLColorMaterial()
-{
-}
-
-/*!
- \property QGLColorMaterial::color
- \brief the flat color to use to render the material. The default
- color is white.
-
- If the geometry has per-vertex colors, then this property is ignored.
-
- \sa colorChanged()
-*/
-
-QColor QGLColorMaterial::color() const
-{
- Q_D(const QGLColorMaterial);
- return d->color;
-}
-
-void QGLColorMaterial::setColor(const QColor &color)
-{
- Q_D(QGLColorMaterial);
- if (d->color != color) {
- d->color = color;
- emit colorChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \reimp
-*/
-bool QGLColorMaterial::isTransparent() const
-{
- Q_D(const QGLColorMaterial);
- return d->color.alpha() != 255;
-}
-
-/*!
- \reimp
-*/
-void QGLColorMaterial::bind(QGLPainter *painter)
-{
- Q_D(const QGLColorMaterial);
- painter->setColor(d->color);
- // Effect is set during prepareToDraw().
-}
-
-/*!
- \reimp
-*/
-void QGLColorMaterial::release(QGLPainter *painter, QGLAbstractMaterial *next)
-{
- // No textures or other modes, so nothing to do here.
- Q_UNUSED(painter);
- Q_UNUSED(next);
-}
-
-/*!
- \reimp
-*/
-void QGLColorMaterial::prepareToDraw
- (QGLPainter *painter, const QGLAttributeSet &attributes)
-{
- if (attributes.contains(QGL::Color))
- painter->setStandardEffect(QGL::FlatPerVertexColor);
- else
- painter->setStandardEffect(QGL::FlatColor);
-}
-
-/*!
- \fn void QGLColorMaterial::colorChanged()
-
- Signal that is emitted when color() changes.
-
- \sa color()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/materials/qglcolormaterial.h b/src/gui/extern/Qt3D/materials/qglcolormaterial.h
deleted file mode 100644
index 3860feef2aba0d37dce837a5185f670edbbbe8f9..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglcolormaterial.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCOLORMATERIAL_H
-#define QGLCOLORMATERIAL_H
-
-#include "qglabstractmaterial.h"
-#include <QtGui/qcolor.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLColorMaterialPrivate;
-
-class Q_QT3D_EXPORT QGLColorMaterial : public QGLAbstractMaterial
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLColorMaterial)
- Q_DISABLE_COPY(QGLColorMaterial)
- Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-public:
- explicit QGLColorMaterial(QObject *parent = 0);
- ~QGLColorMaterial();
-
- QColor color() const;
- void setColor(const QColor &color);
-
- bool isTransparent() const;
- void bind(QGLPainter *painter);
- void release(QGLPainter *painter, QGLAbstractMaterial *next);
- void prepareToDraw(QGLPainter *painter, const QGLAttributeSet &attributes);
-
-Q_SIGNALS:
- void colorChanged();
-
-private:
- QScopedPointer<QGLColorMaterialPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/materials/qglmaterial.cpp b/src/gui/extern/Qt3D/materials/qglmaterial.cpp
deleted file mode 100644
index 88145a40d227487887d56826899568ee3471ee90..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglmaterial.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglmaterial.h"
-#include "qglmaterial_p.h"
-#include "qglpainter.h"
-#include "qgltexture2d.h"
-#include "qglmaterialcollection.h"
-#include "qgllightmodel.h"
-#include "qfileinfo.h"
-
-#include <QtCore/qurl.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLMaterial
- \brief The QGLMaterial class describes one-sided material properties for rendering fragments.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::materials
-
- \sa QGLTwoSidedMaterial
-*/
-
-/*!
- \qmlclass Material QGLMaterial
- \brief The Material item describes material properties for OpenGL drawing.
- \since 4.8
- \ingroup qt3d::qml3d
-*/
-
-QGLMaterialPrivate::QGLMaterialPrivate()
- : specularColor(0, 0, 0, 255),
- emittedLight(0, 0, 0, 255),
- shininess(0),
- collection(0),
- index(-1),
- used(false)
-{
- ambientColor.setRgbF(0.2f, 0.2f, 0.2f, 1.0f);
- diffuseColor.setRgbF(0.8f, 0.8f, 0.8f, 1.0f);
-}
-
-/*!
- Constructs a QGLMaterial object with its default values,
- and attaches it to \a parent.
-*/
-QGLMaterial::QGLMaterial(QObject *parent)
- : QGLAbstractMaterial(parent)
- , d_ptr(new QGLMaterialPrivate)
-{
-}
-
-/*!
- Destroys this QGLMaterial object.
-*/
-QGLMaterial::~QGLMaterial()
-{
-}
-
-/*!
- \property QGLMaterial::ambientColor
- \brief the ambient color of the material. The default value
- is (0.2, 0.2, 0.2, 1.0).
-
- \sa diffuseColor(), specularColor(), ambientColorChanged()
-*/
-
-/*!
- \qmlproperty color Material::ambientColor
- The ambient color of the material. The default value
- is (0.2, 0.2, 0.2, 1.0).
-
- \sa diffuseColor, specularColor
-*/
-
-QColor QGLMaterial::ambientColor() const
-{
- Q_D(const QGLMaterial);
- return d->ambientColor;
-}
-
-void QGLMaterial::setAmbientColor(const QColor& value)
-{
- Q_D(QGLMaterial);
- if (d->ambientColor != value) {
- d->ambientColor = value;
- emit ambientColorChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLMaterial::diffuseColor
- \brief the diffuse color of the material. The default value
- is (0.8, 0.8, 0.8, 1.0).
-
- \sa ambientColor(), specularColor(), diffuseColorChanged()
-*/
-
-/*!
- \qmlproperty color Material::diffuseColor
- The diffuse color of the material. The default value
- is (0.8, 0.8, 0.8, 1.0).
-
- \sa ambientColor, specularColor
-*/
-
-QColor QGLMaterial::diffuseColor() const
-{
- Q_D(const QGLMaterial);
- return d->diffuseColor;
-}
-
-void QGLMaterial::setDiffuseColor(const QColor& value)
-{
- Q_D(QGLMaterial);
- if (d->diffuseColor != value) {
- d->diffuseColor = value;
- emit diffuseColorChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLMaterial::specularColor
- \brief the specular color of the material. The default value
- is (0, 0, 0, 1).
-
- \sa ambientColor(), diffuseColor(), specularColorChanged()
-*/
-
-/*!
- \qmlproperty color Material::specularColor
- The specular color of the material. The default value
- is (0, 0, 0, 1).
-
- \sa ambientColor, diffuseColor
-*/
-
-QColor QGLMaterial::specularColor() const
-{
- Q_D(const QGLMaterial);
- return d->specularColor;
-}
-
-void QGLMaterial::setSpecularColor(const QColor& value)
-{
- Q_D(QGLMaterial);
- if (d->specularColor != value) {
- d->specularColor = value;
- emit specularColorChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLMaterial::emittedLight
- \brief the emitted light intensity of the material.
- The default value is (0.0, 0.0, 0.0, 1.0), which indicates
- that the material does not emit any light.
-
- \sa emittedLightChanged()
-*/
-
-/*!
- \qmlproperty color Material::emittedLight
- The emitted light intensity of the material.
- The default value is (0.0, 0.0, 0.0, 1.0), which indicates
- that the material does not emit any light.
-*/
-
-QColor QGLMaterial::emittedLight() const
-{
- Q_D(const QGLMaterial);
- return d->emittedLight;
-}
-
-void QGLMaterial::setEmittedLight(const QColor& value)
-{
- Q_D(QGLMaterial);
- if (d->emittedLight != value) {
- d->emittedLight = value;
- emit emittedLightChanged();
- emit materialChanged();
- }
-}
-
-/*!
- Sets ambientColor() to 20% of \a value, and diffuseColor() to 80% of
- \a value. This is a convenience function for quickly setting ambient
- and diffuse lighting colors based on a flat color.
-
- \sa ambientColor(), diffuseColor()
-*/
-void QGLMaterial::setColor(const QColor& value)
-{
- Q_D(QGLMaterial);
- d->ambientColor.setRgbF
- (value.redF() * 0.2f, value.greenF() * 0.2f,
- value.blueF() * 0.2f, value.alphaF());
- d->diffuseColor.setRgbF
- (value.redF() * 0.8f, value.greenF() * 0.8f,
- value.blueF() * 0.8f, value.alphaF());
- emit ambientColorChanged();
- emit diffuseColorChanged();
- emit materialChanged();
-}
-
-/*!
- \property QGLMaterial::shininess
- \brief the specular exponent of the material, or how shiny it is.
- Must be between 0 and 128. The default value is 0. A value outside
- this range will be clamped to the range when the property is set.
-
- \sa shininessChanged()
-*/
-
-/*!
- \qmlproperty real Material::shininess
- The specular exponent of the material, or how shiny it is.
- Must be between 0 and 128. The default value is 0. A value outside
- this range will be clamped to the range when the property is set.
-*/
-
-qreal QGLMaterial::shininess() const
-{
- Q_D(const QGLMaterial);
- return d->shininess;
-}
-
-void QGLMaterial::setShininess(qreal value)
-{
- Q_D(QGLMaterial);
- if (value < 0)
- value = 0;
- else if (value > 128)
- value = 128;
- if (d->shininess != value) {
- d->shininess = value;
- emit shininessChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLMaterial::texture
- \brief the 2D texture associated with \a layer on this material;
- null if no texture.
-
- Layer 0 is normally the primary texture associated with the material.
- Multiple texture layers may be specified for materials with special
- blending effects or to specify ambient, diffuse, or specular colors
- pixel-by-pixel.
-
- \sa texturesChanged()
-*/
-QGLTexture2D *QGLMaterial::texture(int layer) const
-{
- Q_D(const QGLMaterial);
- return d->textures.value(layer, 0);
-}
-
-void QGLMaterial::setTexture(QGLTexture2D *value, int layer)
-{
- Q_ASSERT(layer >= 0);
- Q_D(QGLMaterial);
- QGLTexture2D *prev = d->textures.value(layer, 0);
- if (prev != value) {
- delete prev;
- d->textures[layer] = value;
- connect(value, SIGNAL(textureUpdated()), this, SIGNAL(texturesChanged()));
- connect(value, SIGNAL(textureUpdated()), this, SIGNAL(materialChanged()));
- emit texturesChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLMaterial::textureUrl
- \brief URL of the 2D texture associated with \a layer on this material.
-
- By default \a layer is 0, the primary texture.
-
- If the URL has not been specified, then this property is a null QUrl.
-
- Setting this property to a non-empty URL will replace any existing texture
- with a new texture based on the image at the given \a url. If that
- image is not a valid texture then the new texture will be a null texture.
-
- If an empty url is set, this has the same effect as \c{setTexture(0)}.
-
- \sa texture(), setTexture()
-*/
-QUrl QGLMaterial::textureUrl(int layer) const
-{
- Q_D(const QGLMaterial);
- QGLTexture2D *tex = d->textures.value(layer, 0);
- if (tex)
- return tex->url();
- else
- return QUrl();
-}
-
-void QGLMaterial::setTextureUrl(const QUrl &url, int layer)
-{
- Q_ASSERT(layer >= 0);
- if (textureUrl(layer) != url)
- {
- QGLTexture2D *tex = 0;
- if (!url.isEmpty())
- {
- tex = new QGLTexture2D(this);
- connect(tex, SIGNAL(textureUpdated()), this, SIGNAL(texturesChanged()));
- connect(tex, SIGNAL(textureUpdated()), this, SIGNAL(materialChanged()));
- tex->setUrl(url);
- }
- setTexture(tex, layer);
- }
-}
-
-/*!
- \enum QGLMaterial::TextureCombineMode
- This enum defines the mode to use when combining a texture with
- the material colors on a QGLMaterial object.
-
- \value Modulate Modulate the texture with the lighting
- conditions to produce a lit texture.
- \value Decal Combine the texture with the lighting conditions
- to produce a decal effect.
- \value Replace Replace with the contents of the texture,
- ignoring colors and lighting conditions.
-*/
-
-/*!
- \property QGLMaterial::textureCombineMode
- \brief the texture combine mode associated with \a layer on this material.
- The default value is \l Modulate.
-
- \sa texturesChanged()
-*/
-
-QGLMaterial::TextureCombineMode QGLMaterial::textureCombineMode(int layer) const
-{
- Q_D(const QGLMaterial);
- return d->textureModes.value(layer, Modulate);
-}
-
-void QGLMaterial::setTextureCombineMode(QGLMaterial::TextureCombineMode mode, int layer)
-{
- Q_D(QGLMaterial);
- if (d->textureModes.value(layer, Modulate) != mode) {
- d->textureModes[layer] = mode;
- emit texturesChanged();
- emit materialChanged();
- }
-}
-
-/*!
- Returns the number of texture layers associated with this material.
-
- The return value may be larger than the number of actual texture
- layers if some of the intermediate layers are null. For example,
- setting layers 0 and 2 will report textureLayerCount() as 3.
- The main use of this value is to iterate over all layers.
-
- \sa texture()
-*/
-int QGLMaterial::textureLayerCount() const
-{
- Q_D(const QGLMaterial);
- int maxLayer = -1;
- if (!d->textures.isEmpty())
- maxLayer = qMax(maxLayer, (d->textures.end() - 1).key());
- return maxLayer + 1;
-}
-
-/*!
- \reimp
- Returns this material.
-*/
-QGLMaterial *QGLMaterial::front() const
-{
- return const_cast<QGLMaterial *>(this);
-}
-
-/*!
- \reimp
-*/
-bool QGLMaterial::isTransparent() const
-{
- Q_D(const QGLMaterial);
- bool transparent = (d->diffuseColor.alpha() != 255);
- QMap<int, QGLTexture2D *>::ConstIterator it;
- for (it = d->textures.begin(); it != d->textures.end(); ++it) {
- TextureCombineMode mode = d->textureModes.value(it.key(), Modulate);
- if (mode == Modulate) {
- // Texture alpha adds to the current alpha.
- if (it.value() && it.value()->hasAlphaChannel())
- transparent = true;
- } else if (mode == Replace) {
- // Replace the current alpha with the texture's alpha.
- if (it.value())
- transparent = it.value()->hasAlphaChannel();
- }
- }
- return transparent;
-}
-
-/*!
- \reimp
-*/
-void QGLMaterial::bind(QGLPainter *painter)
-{
- painter->setFaceMaterial(QGL::AllFaces, this);
- const_cast<QGLLightModel *>(painter->lightModel())
- ->setModel(QGLLightModel::OneSided); // FIXME
- bindTextures(painter);
-}
-
-/*!
- \internal
-*/
-void QGLMaterial::bindTextures(QGLPainter *painter)
-{
- Q_D(const QGLMaterial);
- QMap<int, QGLTexture2D *>::ConstIterator it;
- for (it = d->textures.begin(); it != d->textures.end(); ++it) {
- QGLTexture2D *tex = it.value();
- painter->glActiveTexture(GL_TEXTURE0 + it.key());
- if (tex)
- tex->bind();
- else
- glBindTexture(GL_TEXTURE_2D, 0);
- }
-}
-
-/*!
- \reimp
-*/
-void QGLMaterial::release(QGLPainter *painter, QGLAbstractMaterial *next)
-{
- Q_UNUSED(next);
- Q_D(const QGLMaterial);
- QMap<int, QGLTexture2D *>::ConstIterator it;
- for (it = d->textures.begin(); it != d->textures.end(); ++it) {
- painter->glActiveTexture(GL_TEXTURE0 + it.key());
- glBindTexture(GL_TEXTURE_2D, 0);
- }
-}
-
-/*!
- \reimp
-*/
-void QGLMaterial::prepareToDraw
- (QGLPainter *painter, const QGLAttributeSet &attributes)
-{
- bindEffect(painter, attributes, false);
-}
-
-/*!
- \internal
-*/
-void QGLMaterial::bindEffect
- (QGLPainter *painter, const QGLAttributeSet &attributes, bool twoSided)
-{
- Q_D(const QGLMaterial);
- Q_UNUSED(twoSided);
- QGL::StandardEffect effect = QGL::LitMaterial;
- if (!d->textures.isEmpty() && attributes.contains(QGL::TextureCoord0)) {
- // TODO: different combine modes for each layer.
- QGLMaterial::TextureCombineMode mode =
- d->textureModes.value(0, Modulate);
- if (mode == Replace)
- effect = QGL::FlatReplaceTexture2D;
- else if (mode == Decal)
- effect = QGL::LitDecalTexture2D;
- else
- effect = QGL::LitModulateTexture2D;
- }
- painter->setStandardEffect(effect);
-}
-
-/*!
- \fn void QGLMaterial::ambientColorChanged()
-
- This signal is emitted when ambientColor() changes.
-
- \sa ambientColor(), setAmbientColor(), materialChanged()
-*/
-
-/*!
- \fn void QGLMaterial::diffuseColorChanged()
-
- This signal is emitted when diffuseColor() changes.
-
- \sa diffuseColor(), setDiffuseColor(), materialChanged()
-*/
-
-/*!
- \fn void QGLMaterial::specularColorChanged()
-
- This signal is emitted when specularColor() changes.
-
- \sa specularColor(), setSpecularColor(), materialChanged()
-*/
-
-/*!
- \fn void QGLMaterial::emittedLightChanged()
-
- This signal is emitted when emittedLight() changes.
-
- \sa emittedLight(), setEmittedLight(), materialChanged()
-*/
-
-/*!
- \fn void QGLMaterial::shininessChanged()
-
- This signal is emitted when shininess() changes.
-
- \sa shininess(), setShininess(), materialChanged()
-*/
-
-/*!
- \fn void QGLMaterial::texturesChanged()
-
- This signal is emitted when the texture layers associated with
- this material change.
-
- \sa texture(), setTexture(), materialChanged()
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QGLMaterial &material)
-{
- dbg << &material <<
- "-- Amb:" << material.ambientColor() <<
- "-- Diff:" << material.diffuseColor() <<
- "-- Spec:" << material.specularColor() <<
- "-- Shin:" << material.shininess();
- for (int i = 0; i < material.textureLayerCount(); ++i)
- if (material.texture(i) != 0)
- dbg << "\n -- Tex" << i << ":" << material.texture(i)
- << material.texture(i)->objectName();
- dbg << "\n";
- return dbg;
-}
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/materials/qglmaterial.h b/src/gui/extern/Qt3D/materials/qglmaterial.h
deleted file mode 100644
index 9d5296e93209db598e133677511d02663604f12b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglmaterial.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLMATERIAL_H
-#define QGLMATERIAL_H
-
-#include "qglabstractmaterial.h"
-#include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
-#include <QtGui/qcolor.h>
-#include <QtCore/qurl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLMaterialPrivate;
-class QGLTexture2D;
-class QGLTextureCube;
-class QGLPainter;
-class QGLMaterialCollection;
-class QGLTwoSidedMaterial;
-
-class Q_QT3D_EXPORT QGLMaterial : public QGLAbstractMaterial
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLMaterial)
- Q_DISABLE_COPY(QGLMaterial)
- Q_ENUMS(TextureCombineMode)
- Q_PROPERTY(QColor ambientColor READ ambientColor WRITE setAmbientColor NOTIFY ambientColorChanged)
- Q_PROPERTY(QColor diffuseColor READ diffuseColor WRITE setDiffuseColor NOTIFY diffuseColorChanged)
- Q_PROPERTY(QColor specularColor READ specularColor WRITE setSpecularColor NOTIFY specularColorChanged)
- Q_PROPERTY(QColor emittedLight READ emittedLight WRITE setEmittedLight NOTIFY emittedLightChanged)
- Q_PROPERTY(qreal shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
- Q_PROPERTY(QGLTexture2D *texture READ texture WRITE setTexture NOTIFY texturesChanged)
- Q_PROPERTY(QGLMaterial::TextureCombineMode textureCombineMode READ textureCombineMode WRITE setTextureCombineMode NOTIFY texturesChanged)
- Q_PROPERTY(QUrl textureUrl READ textureUrl WRITE setTextureUrl NOTIFY texturesChanged)
-public:
- explicit QGLMaterial(QObject *parent = 0);
- ~QGLMaterial();
-
- QColor ambientColor() const;
- void setAmbientColor(const QColor& value);
-
- QColor diffuseColor() const;
- void setDiffuseColor(const QColor& value);
-
- QColor specularColor() const;
- void setSpecularColor(const QColor& value);
-
- QColor emittedLight() const;
- void setEmittedLight(const QColor& value);
-
- void setColor(const QColor& value);
-
- qreal shininess() const;
- void setShininess(qreal value);
-
- QGLTexture2D *texture(int layer = 0) const;
- void setTexture(QGLTexture2D *value, int layer = 0);
-
- QUrl textureUrl(int layer = 0) const;
- void setTextureUrl(const QUrl &url, int layer = 0);
-
- enum TextureCombineMode
- {
- Modulate,
- Decal,
- Replace
- };
-
- QGLMaterial::TextureCombineMode textureCombineMode(int layer = 0) const;
- void setTextureCombineMode(QGLMaterial::TextureCombineMode mode, int layer = 0);
-
- int textureLayerCount() const;
-
- QGLMaterial *front() const;
- bool isTransparent() const;
- void bind(QGLPainter *painter);
- void release(QGLPainter *painter, QGLAbstractMaterial *next);
- void prepareToDraw(QGLPainter *painter, const QGLAttributeSet &attributes);
-
-Q_SIGNALS:
- void ambientColorChanged();
- void diffuseColorChanged();
- void specularColorChanged();
- void emittedLightChanged();
- void shininessChanged();
- void texturesChanged();
-
-private:
- friend class QGLMaterialCollection;
- friend class QGLTwoSidedMaterial;
-
- void bindTextures(QGLPainter *painter);
- void bindEffect(QGLPainter *painter, const QGLAttributeSet &attributes, bool twoSided);
-
- QScopedPointer<QGLMaterialPrivate> d_ptr;
-};
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLMaterial &material);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/materials/qglmaterial_p.h b/src/gui/extern/Qt3D/materials/qglmaterial_p.h
deleted file mode 100644
index 53779570bf6ac00b06c288172a5e631a5d80e6ec..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qglmaterial_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLMATERIAL_P_H
-#define QGLMATERIAL_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglmaterial.h"
-#include <QtCore/qmap.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLMaterialPrivate
-{
-public:
- explicit QGLMaterialPrivate();
-
- QColor ambientColor;
- QColor diffuseColor;
- QColor specularColor;
- QColor emittedLight;
- qreal shininess;
- QMap<int, QGLTexture2D *> textures;
- QMap<int, QGLMaterial::TextureCombineMode> textureModes;
- QGLMaterialCollection *collection;
- int index;
- QString name;
- bool used;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.cpp b/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.cpp
deleted file mode 100644
index 4f434fa42f4d5de4b8acf81265042066d3cbb4a6..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgltwosidedmaterial.h"
-#include "qglpainter.h"
-#include "qgllightmodel.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLTwoSidedMaterial
- \since 4.8
- \brief The QGLTwoSidedMaterial class implemented two-sided materials for 3D rendering.
- \ingroup qt3d
- \ingroup qt3d::materials
-
- Two-sided materials consist of a front() material and a back()
- material. The specific material rendered is determined by the
- direction faced by a fragment when it is rendered. Fragments
- that point towards the viewer are rendered with front(),
- and fragments that point away from the viewer are rendered
- with back(). In both cases, any textures that are used to
- render the material are taken from front().
-
- If front() and back() are the same, then the same material
- will be used on both sides of the fragment. However, this
- is not exactly the same as using a one-sided QGLMaterial in
- place of the two-sided material. One-sided materials will
- render the back of the fragment as black because the normal
- is always pointing away from the viewer. Two-sided materials
- reverse the back-facing normal so that back() is lit as
- though it was on a front-facing face.
-
- \sa QGLMaterial
-*/
-
-class QGLTwoSidedMaterialPrivate
-{
-public:
- QGLTwoSidedMaterialPrivate() : front(0), back(0), defaultMaterial(0) {}
-
- QGLMaterial *front;
- QGLMaterial *back;
- QGLMaterial *defaultMaterial;
-};
-
-/*!
- Constructs a two-sided material object and attaches it to \a parent.
-
- \sa setFront(), setBack()
-*/
-QGLTwoSidedMaterial::QGLTwoSidedMaterial(QObject *parent)
- : QGLAbstractMaterial(parent)
- , d_ptr(new QGLTwoSidedMaterialPrivate)
-{
-}
-
-/*!
- Destroys this two-sided material object.
-*/
-QGLTwoSidedMaterial::~QGLTwoSidedMaterial()
-{
-}
-
-/*!
- \property QGLTwoSidedMaterial::front
- \brief the material for the front side of the object's fragments.
-
- The default value is null, which will result in a default QGLMaterial
- object being used when bind() is called.
-
- \sa back(), frontChanged(), materialChanged()
-*/
-
-QGLMaterial *QGLTwoSidedMaterial::front() const
-{
- Q_D(const QGLTwoSidedMaterial);
- return d->front;
-}
-
-void QGLTwoSidedMaterial::setFront(QGLMaterial *material)
-{
- Q_D(QGLTwoSidedMaterial);
- if (d->front != material) {
- if (d->front && d->front != d->back) {
- disconnect(d->front, SIGNAL(materialChanged()),
- this, SIGNAL(materialChanged()));
- }
- d->front = material;
- if (d->front && d->front != d->back) {
- connect(d->front, SIGNAL(materialChanged()),
- this, SIGNAL(materialChanged()));
- }
- emit frontChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \property QGLTwoSidedMaterial::back
- \brief the material for the back side of the object's fragments.
-
- The default value is null, which indicates that front() should
- be used on both the front and back sides of the object's fragments.
-
- Textures are taken from the front() material. Any textures that
- appear in the back() material are ignored. Only the material
- lighting parameters from back() will be used.
-
- \sa front(), backChanged(), materialChanged()
-*/
-
-QGLMaterial *QGLTwoSidedMaterial::back() const
-{
- Q_D(const QGLTwoSidedMaterial);
- return d->back;
-}
-
-void QGLTwoSidedMaterial::setBack(QGLMaterial *material)
-{
- Q_D(QGLTwoSidedMaterial);
- if (d->back != material) {
- if (d->back && d->back != d->front) {
- disconnect(d->back, SIGNAL(materialChanged()),
- this, SIGNAL(materialChanged()));
- }
- d->back = material;
- if (d->back && d->back != d->front) {
- connect(d->back, SIGNAL(materialChanged()),
- this, SIGNAL(materialChanged()));
- }
- emit backChanged();
- emit materialChanged();
- }
-}
-
-/*!
- \reimp
-*/
-bool QGLTwoSidedMaterial::isTransparent() const
-{
- Q_D(const QGLTwoSidedMaterial);
- if (d->front && d->front->isTransparent())
- return true;
- return d->back && d->back->isTransparent();
-}
-
-/*!
- \reimp
-*/
-void QGLTwoSidedMaterial::bind(QGLPainter *painter)
-{
- Q_D(QGLTwoSidedMaterial);
- QGLMaterial *front = d->front;
- if (!front) {
- // We need to have something for the front material.
- front = d->defaultMaterial;
- if (!front) {
- d->defaultMaterial = new QGLMaterial(this);
- front = d->defaultMaterial;
- }
- }
- const_cast<QGLLightModel *>(painter->lightModel())
- ->setModel(QGLLightModel::TwoSided); // FIXME
- if (d->back && d->back != front) {
- painter->setFaceMaterial(QGL::FrontFaces, front);
- painter->setFaceMaterial(QGL::BackFaces, d->back);
- } else {
- painter->setFaceMaterial(QGL::AllFaces, front);
- }
- front->bindTextures(painter);
-}
-
-/*!
- \reimp
-*/
-void QGLTwoSidedMaterial::release(QGLPainter *painter, QGLAbstractMaterial *next)
-{
- Q_D(const QGLTwoSidedMaterial);
- if (d->front)
- d->front->release(painter, next);
- else if (d->defaultMaterial)
- d->defaultMaterial->release(painter, next);
-}
-
-/*!
- \reimp
-*/
-void QGLTwoSidedMaterial::prepareToDraw
- (QGLPainter *painter, const QGLAttributeSet &attributes)
-{
- Q_D(QGLTwoSidedMaterial);
- QGLMaterial *front = d->front;
- if (!front)
- front = d->defaultMaterial;
- front->bindEffect(painter, attributes, true);
-}
-
-/*!
- \fn void QGLTwoSidedMaterial::frontChanged()
-
- Signal that is emitted when the front() material pointer changes.
-
- This signal is not emitted when a property on front() changes.
- Use materialChanged() for that purpose instead.
-
- \sa front(), backChanged()
-*/
-
-/*!
- \fn void QGLTwoSidedMaterial::backChanged()
-
- Signal that is emitted when the back() material pointer changes.
-
- This signal is not emitted when a property on back() changes.
- Use materialChanged() for that purpose instead.
-
- \sa back(), frontChanged()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.h b/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.h
deleted file mode 100644
index b135103e57371600ecd073b43053a7c82dcbad53..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/materials/qgltwosidedmaterial.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTWOSIDEDMATERIAL_H
-#define QGLTWOSIDEDMATERIAL_H
-
-#include "qglmaterial.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLTwoSidedMaterialPrivate;
-
-class Q_QT3D_EXPORT QGLTwoSidedMaterial : public QGLAbstractMaterial
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLTwoSidedMaterial)
- Q_DISABLE_COPY(QGLTwoSidedMaterial)
- Q_PROPERTY(QGLMaterial *front READ front WRITE setFront NOTIFY frontChanged)
- Q_PROPERTY(QGLMaterial *back READ back WRITE setBack NOTIFY backChanged)
-public:
- explicit QGLTwoSidedMaterial(QObject *parent = 0);
- ~QGLTwoSidedMaterial();
-
- QGLMaterial *front() const;
- void setFront(QGLMaterial *material);
-
- QGLMaterial *back() const;
- void setBack(QGLMaterial *material);
-
- bool isTransparent() const;
- void bind(QGLPainter *painter);
- void release(QGLPainter *painter, QGLAbstractMaterial *next);
- void prepareToDraw(QGLPainter *painter, const QGLAttributeSet &attributes);
-
-Q_SIGNALS:
- void frontChanged();
- void backChanged();
-
-private:
- QScopedPointer<QGLTwoSidedMaterialPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/math3d/CMakeLists.txt b/src/gui/extern/Qt3D/math3d/CMakeLists.txt
deleted file mode 100644
index c64b2a31bb0fd4f873210cc94cb85fb30e9a597f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-target_sources( gui
- PRIVATE
- qtriangle3d.cpp
- qplane3d.h
- qtriangle3d.h
- qray3d.h
- qbox3d.cpp
- qbox3d.h
- qsphere3d.h
- qray3d.cpp
- qplane3d.cpp
- qsphere3d.cpp
- )
diff --git a/src/gui/extern/Qt3D/math3d/qbox3d.cpp b/src/gui/extern/Qt3D/math3d/qbox3d.cpp
deleted file mode 100644
index 5e0588f9b702064766adfa34ae397786e42725c8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qbox3d.cpp
+++ /dev/null
@@ -1,690 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qbox3d.h"
-#include "qplane3d.h"
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qlist.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QBox3D
- \brief The QBox3D class represents an axis-aligned box in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::math
-
- QBox3D can be used to represent the bounding box of objects in a 3D
- scene so that they can be easily culled if they are out of view.
-
- The sides of the box are always aligned with the x, y, and z axes of
- the world co-ordinate system. Transforming a box with transformed()
- will result in the smallest axis-aligned bounding box that contains
- the transformed box.
-
- Boxes may be null, finite, or infinite. A null box does not occupy
- any space and does not intersect with any other box. A finite
- box consists of a minimum() and maximum() extent in 3D space.
- An infinite box encompasses all points in 3D space.
-
- The extents of a finite box are also included within the box.
- A box with minimum() and maximum() set to the same value
- contains a single point.
-*/
-
-/*!
- \fn QBox3D::QBox3D()
-
- Constructs a null box in 3D space.
-
- \sa isNull()
-*/
-
-/*!
- \fn QBox3D::QBox3D(const QVector3D& corner1, const QVector3D& corner2)
-
- Constructs a finite box in 3D space from \a corner1 to \a corner2.
- The minimum() and maximum() co-ordinates of the new box are set
- to the minimum and maximum x, y, and z values from \a corner1 and
- \a corner2. The \a corner1 and \a corner2 values can be any two
- opposite corners that define the box.
-
- \sa isFinite(), minimum(), maximum()
-*/
-
-/*!
- \fn bool QBox3D::isNull() const
-
- Returns true if this box is null; false otherwise.
-
- \sa isFinite(), isInfinite(), setToNull()
-*/
-
-/*!
- \fn bool QBox3D::isFinite() const
-
- Returns true if this box is finite in size; false otherwise.
-
- \sa isNull(), isInfinite(), setExtents()
-*/
-
-/*!
- \fn bool QBox3D::isInfinite() const
-
- Returns true if this box is infinite in size; false otherwise.
-
- \sa isNull(), isFinite(), setToInfinite()
-*/
-
-/*!
- \fn QVector3D QBox3D::minimum() const
-
- Returns the minimum corner of this box.
-
- \sa maximum(), setExtents()
-*/
-
-/*!
- \fn QVector3D QBox3D::maximum() const
-
- Returns the maximum corner of this box.
-
- \sa minimum(), setExtents()
-*/
-
-/*!
- \fn void QBox3D::setExtents(const QVector3D& corner1, const QVector3D& corner2)
-
- Sets the extents of this box to a finite region from \a corner1 to
- \a corner2. The minimum() and maximum() co-ordinates of the box are
- set to the minimum and maximum x, y, and z values from \a corner1 and
- \a corner2. The \a corner1 and \a corner2 values can be any two
- opposite corners that define the box.
-
- \sa minimum(), maximum()
-*/
-
-/*!
- \fn void QBox3D::setToNull()
-
- Sets this box to null.
-
- \sa isNull()
-*/
-
-/*!
- \fn void QBox3D::setToInfinite()
-
- Sets this box to be infinite in size.
-
- \sa isInfinite()
-*/
-
-/*!
- \fn QVector3D QBox3D::size() const
-
- Returns the finite size of this box. If this box is null or
- infinite, the returned value will be zero.
-
- \sa center(), isNull(), isInfinite()
-*/
-
-/*!
- \fn QVector3D QBox3D::center() const
-
- Returns the finite center of this box. If this box is null
- or infinite, the returned value will be zero.
-
- \sa size(), isNull(), isInfinite()
-*/
-
-/*!
- \fn bool QBox3D::contains(const QVector3D& point) const
-
- Returns true if this box contains \a point; false otherwise.
- Null boxes do not contain any points and infinite boxes contain
- all points.
-
- Containment is not a strict test: the point is contained if it
- lies on one of the faces of the box.
-
- \sa intersects()
-*/
-
-/*!
- \fn bool QBox3D::contains(const QBox3D& box) const
-
- Returns true if this box completely contains \a box. If this box
- is null, then it will not contain \a box. If this box is infinite,
- and \a box is not null, then \a box will be contained within this box.
- If \a box is infinite, then this box must also be infinite to contain it.
-
- \sa intersects()
-*/
-
-/*!
- Returns true if \a box intersects this box; false otherwise.
-
- \sa intersect(), intersected(), contains()
-*/
-bool QBox3D::intersects(const QBox3D& box) const
-{
- if (boxtype == Null)
- return false;
- else if (boxtype == Infinite)
- return box.boxtype != Null;
- else if (box.boxtype == Null)
- return false;
- else if (box.boxtype == Infinite)
- return true;
-
- if (maxcorner.x() < box.mincorner.x())
- return false;
- if (mincorner.x() > box.maxcorner.x())
- return false;
-
- if (maxcorner.y() < box.mincorner.y())
- return false;
- if (mincorner.y() > box.maxcorner.y())
- return false;
-
- if (maxcorner.z() < box.mincorner.z())
- return false;
- if (mincorner.z() > box.maxcorner.z())
- return false;
-
- return true;
-}
-
-/*!
- Returns true if \a ray intersects this box; false otherwise.
-
- \sa intersection()
-*/
-bool QBox3D::intersects(const QRay3D &ray) const
-{
- qreal minimum_t, maximum_t;
- return intersection(ray, &minimum_t, &maximum_t);
-}
-
-static inline void trackIntersectionX
- (const QBox3D &box, const QRay3D &ray, qreal t,
- qreal *minimum_t, qreal *maximum_t, bool *found)
-{
- QVector3D point = ray.point(t);
- if (point.y() < box.minimum().y() || point.y() > box.maximum().y())
- return;
- if (point.z() < box.minimum().z() || point.z() > box.maximum().z())
- return;
- if (!(*found)) {
- *minimum_t = *maximum_t = t;
- *found = true;
- } else {
- if (t < *minimum_t)
- *minimum_t = t;
- if (t > *maximum_t)
- *maximum_t = t;
- }
-}
-
-static inline void trackIntersectionY
- (const QBox3D &box, const QRay3D &ray, qreal t,
- qreal *minimum_t, qreal *maximum_t, bool *found)
-{
- QVector3D point = ray.point(t);
- if (point.x() < box.minimum().x() || point.x() > box.maximum().x())
- return;
- if (point.z() < box.minimum().z() || point.z() > box.maximum().z())
- return;
- if (!(*found)) {
- *minimum_t = *maximum_t = t;
- *found = true;
- } else {
- if (t < *minimum_t)
- *minimum_t = t;
- if (t > *maximum_t)
- *maximum_t = t;
- }
-}
-
-static inline void trackIntersectionZ
- (const QBox3D &box, const QRay3D &ray, qreal t,
- qreal *minimum_t, qreal *maximum_t, bool *found)
-{
- QVector3D point = ray.point(t);
- if (point.x() < box.minimum().x() || point.x() > box.maximum().x())
- return;
- if (point.y() < box.minimum().y() || point.y() > box.maximum().y())
- return;
- if (!(*found)) {
- *minimum_t = *maximum_t = t;
- *found = true;
- } else {
- if (t < *minimum_t)
- *minimum_t = t;
- if (t > *maximum_t)
- *maximum_t = t;
- }
-}
-
-/*!
- Finds the \a minimum_t and \a maximum_t values where \a ray intersects
- this box. Returns true if intersections were found; or false if there
- is no intersection.
-
- If \a minimum_t and \a maximum_t are set to the same value, then the
- intersection is at a corner or the volume of the box is zero.
- If the t values are negative, then the intersection occurs before the
- ray's origin point in the reverse direction of the ray.
-
- The \a minimum_t and \a maximum_t values can be passed to QRay3D::point()
- to determine the actual intersection points, as shown in the following
- example:
-
- \code
- qreal minimum_t, maximum_t;
- if (box.intersection(ray, &minimum_t, &maximum_t)) {
- qDebug() << "intersections at"
- << ray.point(minimum_t) << "and"
- << ray.point(maximum_t);
- }
- \endcode
-
- \sa intersects(), QRay3D::point()
-*/
-bool QBox3D::intersection(const QRay3D &ray, qreal *minimum_t, qreal *maximum_t) const
-{
- bool found = false;
- QVector3D origin = ray.origin();
- QVector3D direction = ray.direction();
- *minimum_t = *maximum_t = qSNaN();
- if (boxtype == Finite) {
- if (direction.x() != 0.0f) {
- trackIntersectionX
- (*this, ray, (mincorner.x() - origin.x()) / direction.x(),
- minimum_t, maximum_t, &found);
- trackIntersectionX
- (*this, ray, (maxcorner.x() - origin.x()) / direction.x(),
- minimum_t, maximum_t, &found);
- }
- if (direction.y() != 0.0f) {
- trackIntersectionY
- (*this, ray, (mincorner.y() - origin.y()) / direction.y(),
- minimum_t, maximum_t, &found);
- trackIntersectionY
- (*this, ray, (maxcorner.y() - origin.y()) / direction.y(),
- minimum_t, maximum_t, &found);
- }
- if (direction.z() != 0.0f) {
- trackIntersectionZ
- (*this, ray, (mincorner.z() - origin.z()) / direction.z(),
- minimum_t, maximum_t, &found);
- trackIntersectionZ
- (*this, ray, (maxcorner.z() - origin.z()) / direction.z(),
- minimum_t, maximum_t, &found);
- }
- }
- return found;
-}
-
-/*!
- Returns the t value at which \a ray first intersects the sides of
- this box, or not-a-number if there is no intersection.
-
- When the \a ray intersects this box, the return value is a
- parametric value that can be passed to QRay3D::point() to determine
- the actual intersection point, as shown in the following example:
-
- \code
- qreal t = box.intersection(ray);
- QVector3D pt;
- if (qIsNaN(t)) {
- qWarning("no intersection occurred");
- else
- pt = ray.point(t);
- \endcode
-
- The \a ray might intersect at two points - as the ray passes through
- the box - one on the near side, one on the far side; where near and far
- are relative to the origin point of the ray. This function only
- returns the near intersection point.
-
- Only positive values on the ray are considered. This means that if
- the origin point of the ray is inside the box, there is only one
- solution, not two. To get the other solution, simply change
- the sign of the ray's direction vector. If the origin point of
- the ray is outside the box, and the direction points away from
- the box, then there will be no intersection.
-
- When the ray does not intersect the box in the positive direction,
- or the box is not finite, then the return value is not-a-number.
-
- \sa intersects(), QRay3D::point()
-*/
-qreal QBox3D::intersection(const QRay3D &ray) const
-{
- qreal minimum_t, maximum_t;
- if (intersection(ray, &minimum_t, &maximum_t)) {
- if (minimum_t >= 0.0f)
- return minimum_t;
- else if (maximum_t >= 0.0f)
- return maximum_t;
- else
- return qSNaN();
- } else {
- return qSNaN();
- }
-}
-
-/*!
- Intersects this box with \a box.
-
- \sa intersected(), intersects(), unite()
-*/
-void QBox3D::intersect(const QBox3D& box)
-{
- // Handle the simple cases first.
- if (boxtype == Null) {
- // Null intersected with anything is null.
- return;
- } else if (boxtype == Infinite) {
- // Infinity intersected with a box is that box.
- *this = box;
- return;
- } else if (box.boxtype == Null) {
- // Anything intersected with null is null.
- setToNull();
- return;
- } else if (box.boxtype == Infinite) {
- // Box intersected with infinity is the box.
- return;
- }
-
- // Intersect two finite boxes.
- QVector3D min1 = mincorner;
- QVector3D max1 = maxcorner;
- QVector3D min2 = box.mincorner;
- QVector3D max2 = box.maxcorner;
- if (min2.x() > min1.x())
- min1.setX(min2.x());
- if (min2.y() > min1.y())
- min1.setY(min2.y());
- if (min2.z() > min1.z())
- min1.setZ(min2.z());
- if (max2.x() < max1.x())
- max1.setX(max2.x());
- if (max2.y() < max1.y())
- max1.setY(max2.y());
- if (max2.z() < max1.z())
- max1.setZ(max2.z());
- if (min1.x() > max1.x() || min1.y() > max1.y() || min1.z() > max1.z()) {
- setToNull();
- } else {
- mincorner = min1;
- maxcorner = max1;
- }
-}
-
-/*!
- Returns a new box which is the intersection of this box with \a box.
-
- \sa intersect(), intersects(), united()
-*/
-QBox3D QBox3D::intersected(const QBox3D& box) const
-{
- QBox3D result(*this);
- result.intersect(box);
- return result;
-}
-
-/*!
- Unites this box with \a point by expanding it to encompass \a point.
- If \a point is already contained within this box, then this box
- will be unchanged.
-
- \sa united(), intersect()
-*/
-void QBox3D::unite(const QVector3D& point)
-{
- if (boxtype == Finite) {
- if (point.x() < mincorner.x())
- mincorner.setX(point.x());
- else if (point.x() > maxcorner.x())
- maxcorner.setX(point.x());
- if (point.y() < mincorner.y())
- mincorner.setY(point.y());
- else if (point.y() > maxcorner.y())
- maxcorner.setY(point.y());
- if (point.z() < mincorner.z())
- mincorner.setZ(point.z());
- else if (point.z() > maxcorner.z())
- maxcorner.setZ(point.z());
- } else if (boxtype == Null) {
- boxtype = Finite;
- mincorner = point;
- maxcorner = point;
- }
-}
-
-/*!
- Unites this box with \a box by expanding this box to encompass the
- region defined by \a box. If \a box is already contained within
- this box, then this box will be unchanged.
-
- \sa united(), intersect()
-*/
-void QBox3D::unite(const QBox3D& box)
-{
- if (box.boxtype == Finite) {
- unite(box.minimum());
- unite(box.maximum());
- } else if (box.boxtype == Infinite) {
- setToInfinite();
- }
-}
-
-/*!
- Returns a new box which unites this box with \a point. The returned
- value will be the smallest box that contains both this box and \a point.
-
- \sa unite(), intersected()
-*/
-QBox3D QBox3D::united(const QVector3D& point) const
-{
- if (boxtype == Finite) {
- QBox3D result(*this);
- result.unite(point);
- return result;
- } else if (boxtype == Null) {
- return QBox3D(point, point);
- } else {
- return *this;
- }
-}
-
-/*!
- Returns a new box which unites this box with \a box. The returned value
- will be the smallest box that contains both this box and \a box.
-
- \sa unite(), intersected()
-*/
-QBox3D QBox3D::united(const QBox3D& box) const
-{
- if (boxtype == Finite) {
- QBox3D result(*this);
- result.unite(box);
- return result;
- } else if (boxtype == Null) {
- return box;
- } else {
- return *this;
- }
-}
-
-/*!
- Transforms this box according to \a matrix. Each of the 8 box
- corners are transformed and then a new box that encompasses all
- of the transformed corner values is created.
-
- \sa transformed()
-*/
-void QBox3D::transform(const QMatrix4x4& matrix)
-{
- *this = transformed(matrix);
-}
-
-/*!
- Returns this box transformed by \a matrix. Each of the 8 box
- corners are transformed and then a new box that encompasses all
- of the transformed corner values is returned.
-
- \sa transform()
-*/
-QBox3D QBox3D::transformed(const QMatrix4x4& matrix) const
-{
- if (boxtype != Finite)
- return *this;
- QBox3D result;
- result.unite(matrix * mincorner);
- result.unite(matrix * QVector3D(mincorner.x(), mincorner.y(), maxcorner.z()));
- result.unite(matrix * QVector3D(mincorner.x(), maxcorner.y(), maxcorner.z()));
- result.unite(matrix * QVector3D(mincorner.x(), maxcorner.y(), mincorner.z()));
- result.unite(matrix * QVector3D(maxcorner.x(), mincorner.y(), mincorner.z()));
- result.unite(matrix * QVector3D(maxcorner.x(), maxcorner.y(), mincorner.z()));
- result.unite(matrix * QVector3D(maxcorner.x(), mincorner.y(), maxcorner.z()));
- result.unite(matrix * maxcorner);
- return result;
-}
-
-/*!
- \fn bool QBox3D::operator==(const QBox3D& box) const
-
- Returns true if this box is identical to \a box.
-*/
-
-/*!
- \fn bool QBox3D::operator!=(const QBox3D& box) const
-
- Returns true if this box is not identical to \a box.
-*/
-
-/*!
- \fn bool qFuzzyCompare(const QBox3D& box1, const QBox3D& box2)
- \relates QBox3D
-
- Returns true if \a box1 and \a box2 are almost equal; false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QBox3D &box)
-{
- if (box.isFinite()) {
- dbg.nospace() << "QBox3D(("
- << box.minimum().x() << ", " << box.minimum().y() << ", "
- << box.minimum().z() << ") - ("
- << box.maximum().x() << ", " << box.maximum().y() << ", "
- << box.maximum().z() << "))";
- return dbg.space();
- } else if (box.isNull()) {
- dbg << "QBox3D(null)";
- return dbg;
- } else {
- dbg << "QBox3D(infinite)";
- return dbg;
- }
-}
-
-#endif
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream &operator<<(QDataStream &stream, const QBox3D &box)
- \relates QBox3D
-
- Writes the given \a box to the given \a stream and returns a
- reference to the stream.
-*/
-
-QDataStream &operator<<(QDataStream &stream, const QBox3D &box)
-{
- if (box.isNull()) {
- stream << int(0);
- } else if (box.isInfinite()) {
- stream << int(2);
- } else {
- stream << int(1);
- stream << box.minimum();
- stream << box.maximum();
- }
- return stream;
-}
-
-/*!
- \fn QDataStream &operator>>(QDataStream &stream, QBox3D &box)
- \relates QBox3D
-
- Reads a 3D box from the given \a stream into the given \a box
- and returns a reference to the stream.
-*/
-
-QDataStream &operator>>(QDataStream &stream, QBox3D &box)
-{
- int type;
- stream >> type;
- if (type == 1) {
- QVector3D minimum, maximum;
- stream >> minimum;
- stream >> maximum;
- box = QBox3D(minimum, maximum);
- } else if (type == 2) {
- box.setToInfinite();
- } else {
- box.setToNull();
- }
- return stream;
-}
-
-#endif // QT_NO_DATASTREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/math3d/qbox3d.h b/src/gui/extern/Qt3D/math3d/qbox3d.h
deleted file mode 100644
index e2c3bec5c5d655934a53617482da4bf0860fa569..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qbox3d.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QBOX3D_H
-#define QBOX3D_H
-
-#include "qt3dglobal.h"
-#include "qray3d.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QBox3D
-{
-public:
- QBox3D();
- QBox3D(const QVector3D& corner1, const QVector3D& corner2);
-
- bool isNull() const;
- bool isFinite() const;
- bool isInfinite() const;
-
- QVector3D minimum() const;
- QVector3D maximum() const;
- void setExtents(const QVector3D& corner1, const QVector3D& corner2);
-
- void setToNull();
- void setToInfinite();
-
- QVector3D size() const;
- QVector3D center() const;
-
- bool contains(const QVector3D& point) const;
- bool contains(const QBox3D& box) const;
-
- bool intersects(const QRay3D& ray) const;
- bool intersection(const QRay3D &ray, qreal *minimum_t, qreal *maximum_t) const;
- qreal intersection(const QRay3D& ray) const;
-
- bool intersects(const QBox3D& box) const;
- void intersect(const QBox3D& box);
- QBox3D intersected(const QBox3D& box) const;
-
- void unite(const QVector3D& point);
- void unite(const QBox3D& box);
-
- QBox3D united(const QVector3D& point) const;
- QBox3D united(const QBox3D& box) const;
-
- void transform(const QMatrix4x4& matrix);
- QBox3D transformed(const QMatrix4x4& matrix) const;
-
- bool operator==(const QBox3D& box) const;
- bool operator!=(const QBox3D& box) const;
-
- friend bool qFuzzyCompare(const QBox3D& box1, const QBox3D& box2);
-
-private:
- enum Type
- {
- Null,
- Finite,
- Infinite
- };
-
- QBox3D::Type boxtype;
- QVector3D mincorner, maxcorner;
-};
-
-inline QBox3D::QBox3D() : boxtype(Null), mincorner(0, 0, 0), maxcorner(0, 0, 0) {}
-
-inline QBox3D::QBox3D(const QVector3D& corner1, const QVector3D& corner2)
- : boxtype(Finite),
- mincorner(qMin(corner1.x(), corner2.x()),
- qMin(corner1.y(), corner2.y()),
- qMin(corner1.z(), corner2.z())),
- maxcorner(qMax(corner1.x(), corner2.x()),
- qMax(corner1.y(), corner2.y()),
- qMax(corner1.z(), corner2.z())) {}
-
-inline bool QBox3D::isNull() const { return (boxtype == Null); }
-inline bool QBox3D::isFinite() const { return (boxtype == Finite); }
-inline bool QBox3D::isInfinite() const { return (boxtype == Infinite); }
-
-inline QVector3D QBox3D::minimum() const { return mincorner; }
-inline QVector3D QBox3D::maximum() const { return maxcorner; }
-
-inline void QBox3D::setExtents(const QVector3D& corner1, const QVector3D& corner2)
-{
- boxtype = Finite;
- mincorner = QVector3D(qMin(corner1.x(), corner2.x()),
- qMin(corner1.y(), corner2.y()),
- qMin(corner1.z(), corner2.z()));
- maxcorner = QVector3D(qMax(corner1.x(), corner2.x()),
- qMax(corner1.y(), corner2.y()),
- qMax(corner1.z(), corner2.z()));
-}
-
-inline void QBox3D::setToNull()
-{
- boxtype = Null;
- mincorner = QVector3D(0, 0, 0);
- maxcorner = QVector3D(0, 0, 0);
-}
-
-inline void QBox3D::setToInfinite()
-{
- boxtype = Infinite;
- mincorner = QVector3D(0, 0, 0);
- maxcorner = QVector3D(0, 0, 0);
-}
-
-inline QVector3D QBox3D::size() const { return maxcorner - mincorner; }
-inline QVector3D QBox3D::center() const { return (mincorner + maxcorner) * 0.5f; }
-
-inline bool QBox3D::contains(const QVector3D& point) const
-{
- if (boxtype == Finite) {
- return (point.x() >= mincorner.x() && point.x() <= maxcorner.x() &&
- point.y() >= mincorner.y() && point.y() <= maxcorner.y() &&
- point.z() >= mincorner.z() && point.z() <= maxcorner.z());
- } else if (boxtype == Infinite) {
- return true;
- } else {
- return false;
- }
-}
-
-inline bool QBox3D::contains(const QBox3D& box) const
-{
- if (box.boxtype == Finite)
- return contains(box.mincorner) && contains(box.maxcorner);
- else if (box.boxtype == Infinite)
- return (boxtype == Infinite);
- else
- return false;
-}
-
-inline bool QBox3D::operator==(const QBox3D& box) const
-{
- return (boxtype == box.boxtype &&
- mincorner == box.mincorner &&
- maxcorner == box.maxcorner);
-}
-
-inline bool QBox3D::operator!=(const QBox3D& box) const
-{
- return (boxtype != box.boxtype ||
- mincorner != box.mincorner ||
- maxcorner != box.maxcorner);
-}
-
-inline bool qFuzzyCompare(const QBox3D& box1, const QBox3D& box2)
-{
- return box1.boxtype == box2.boxtype &&
- qFuzzyCompare(box1.mincorner, box2.mincorner) &&
- qFuzzyCompare(box1.maxcorner, box2.maxcorner);
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QBox3D &box);
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_QT3D_EXPORT QDataStream &operator<<(QDataStream &stream, const QBox3D &box);
-Q_QT3D_EXPORT QDataStream &operator>>(QDataStream &stream, QBox3D &box);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QBox3D)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/math3d/qplane3d.cpp b/src/gui/extern/Qt3D/math3d/qplane3d.cpp
deleted file mode 100644
index 3a62469be1f3c8f0b82cb95e08aabc0bea11a62a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qplane3d.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qplane3d.h"
-#include <QtCore/qmath.h>
-#include <QtCore/qnumeric.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QPlane3D
- \brief The QPlane3D class models the mathematics of planes in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::math
-
- A plane is defined by an origin() point lying on the plane, and a
- normal() vector, which is perpendicular to the surface of the plane.
- The normal() vector does not need to be normalized. QPlane3D is an
- infinite surface, from which the normal() vector points out perpendicular
- from the origin() point.
-
- \sa QRay3D
-*/
-
-/*!
- \fn QPlane3D::QPlane3D()
-
- Constructs a default plane object. The defining origin() of the plane
- is set to (0, 0, 0) and the normal() vector is to (1, 0, 0).
-*/
-
-/*!
- \fn QPlane3D::QPlane3D(const QVector3D &point, const QVector3D &normal)
-
- Constructs a new plane, where \a point lies on the plane, and \a normal
- is perpendicular to it. The \a normal does not have to be normalized.
- If \a normal is zero, the behavior of the plane is undefined.
-*/
-
-/*!
- \fn QPlane3D::QPlane3D(const QVector3D &p, const QVector3D &q, const QVector3D &r)
-
- Constructs a new plane defined by the three points \a p, \a q, and \a r.
- The point \a p is used as the plane's origin() point, and a normal()
- is constructed from the cross-product of \a q - \a p and \a r - \a q.
-*/
-
-/*!
- \fn QVector3D QPlane3D::origin() const
-
- Returns this plane's defining origin point. The default value is (0, 0, 0).
-
- \sa setOrigin(), normal()
-*/
-
-/*!
- \fn void QPlane3D::setOrigin(const QVector3D& value)
-
- Set this plane's defining origin point to \a value.
-
- \sa origin(), setNormal()
-*/
-
-/*!
- \fn QVector3D QPlane3D::normal() const
-
- Returns this plane's normal vector. The default value is (1, 0, 0).
-
- \sa setNormal(), origin()
-*/
-
-/*!
- \fn void QPlane3D::setNormal(const QVector3D& value)
-
- Set this plane's normal vector to \a value. The \a value does
- not have to be normalized. If \a value is zero, the behavior
- of the plane is undefined.
-
- \sa normal(), setOrigin()
-*/
-
-/*!
- Returns true if \a point lies in this plane; false otherwise.
-*/
-bool QPlane3D::contains(const QVector3D &point) const
-{
- return qFuzzyIsNull
- (float(QVector3D::dotProduct(m_normal, m_origin - point)));
-}
-
-/*!
- Returns true if all of the points on \a ray lie in this plane;
- false otherwise.
-*/
-bool QPlane3D::contains(const QRay3D &ray) const
-{
- return qFuzzyIsNull
- (float(QVector3D::dotProduct(m_normal, ray.direction()))) &&
- contains(ray.origin());
-}
-
-/*!
- Returns true if an intersection of \a ray with this plane exists;
- false otherwise.
-
- \sa intersection()
-*/
-bool QPlane3D::intersects(const QRay3D &ray) const
-{
- return !qFuzzyIsNull
- (float(QVector3D::dotProduct(m_normal, ray.direction())));
-}
-
-/*!
- Returns the t value at which \a ray intersects this plane, or
- not-a-number if there is no intersection.
-
- When the \a ray intersects this plane, the return value is a
- parametric value that can be passed to QRay3D::point() to determine
- the actual intersection point, as shown in the following example:
-
- \code
- qreal t = plane.intersection(ray);
- QVector3D pt;
- if (qIsNaN(t)) {
- qWarning("no intersection occurred");
- else
- pt = ray.point(t);
- \endcode
-
- If the return value is positive, then the QRay3D::origin() of
- \a ray begins below the plane and then extends through it.
- If the return value is negative, then the origin begins
- above the plane.
-
- There are two failure cases where no single intersection point exists:
-
- \list
- \o when the ray is parallel to the plane (but does not lie on it)
- \o the ray lies entirely in the plane (thus every point "intersects")
- \endlist
-
- This method does not distinguish between these two failure cases and
- simply returns not-a-number for both.
-
- \sa intersects()
-*/
-qreal QPlane3D::intersection(const QRay3D& ray) const
-{
- qreal dotLineAndPlane = QVector3D::dotProduct(m_normal, ray.direction());
- if (qFuzzyIsNull(float(dotLineAndPlane))) {
- // degenerate case - ray & plane-normal vectors are at
- // 90 degrees to each other, so either plane and ray never meet
- // or the ray lies in the plane - return failure case.
- return qSNaN();
- }
- return QVector3D::dotProduct(m_origin - ray.origin(), m_normal) /
- dotLineAndPlane;
-}
-
-/*!
- Returns the distance from this plane to \a point. The value will
- be positive if \a point is above the plane in the direction
- of normal(), and negative if \a point is below the plane.
-*/
-qreal QPlane3D::distanceTo(const QVector3D &point) const
-{
- return QVector3D::dotProduct(point - m_origin, m_normal) /
- m_normal.length();
-}
-
-/*!
- \fn void QPlane3D::transform(const QMatrix4x4 &matrix)
-
- Transforms this plane using \a matrix, replacing origin() and
- normal() with the transformed versions.
-
- \sa transformed()
-*/
-
-/*!
- \fn QPlane3D QPlane3D::transformed(const QMatrix4x4 &matrix) const
-
- Returns a new plane that is formed by transforming origin()
- and normal() using \a matrix.
-
- \sa transform()
-*/
-
-/*!
- \fn bool QPlane3D::operator==(const QPlane3D &other)
-
- Returns true if this plane is the same as \a other; false otherwise.
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QPlane3D::operator!=(const QPlane3D &other)
-
- Returns true if this plane is not the same as \a other; false otherwise.
-
- \sa operator==()
-*/
-
-/*!
- \fn bool qFuzzyCompare(const QPlane3D &plane1, const QPlane3D &plane2)
- \relates QPlane3D
-
- Returns true if \a plane1 and \a plane2 are almost equal; false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QPlane3D &plane)
-{
- dbg.nospace() << "QPlane3D(origin("
- << plane.origin().x() << ", " << plane.origin().y() << ", "
- << plane.origin().z() << ") - normal("
- << plane.normal().x() << ", " << plane.normal().y() << ", "
- << plane.normal().z() << "))";
- return dbg.space();
-}
-
-#endif
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream &operator<<(QDataStream &stream, const QPlane3D &plane)
- \relates QPlane3D
-
- Writes the given \a plane to the given \a stream and returns a
- reference to the stream.
-*/
-
-QDataStream &operator<<(QDataStream &stream, const QPlane3D &plane)
-{
- stream << plane.origin();
- stream << plane.normal();
- return stream;
-}
-
-/*!
- \fn QDataStream &operator>>(QDataStream &stream, QPlane3D &plane)
- \relates QPlane3D
-
- Reads a 3D plane from the given \a stream into the given \a plane
- and returns a reference to the stream.
-*/
-
-QDataStream &operator>>(QDataStream &stream, QPlane3D &plane)
-{
- QVector3D origin, normal;
- stream >> origin;
- stream >> normal;
- plane = QPlane3D(origin, normal);
- return stream;
-}
-
-#endif // QT_NO_DATASTREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/math3d/qplane3d.h b/src/gui/extern/Qt3D/math3d/qplane3d.h
deleted file mode 100644
index 4196925c60c42d5a5bb8faa199dcaf190e0a933b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qplane3d.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QPLANE3D_H
-#define QPLANE3D_H
-
-#include <QtGui/qvector3d.h>
-#include <QtCore/qnumeric.h>
-#include "qray3d.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QPlane3D
-{
-public:
- QPlane3D();
- QPlane3D(const QVector3D &point, const QVector3D &normal);
- QPlane3D(const QVector3D &p, const QVector3D &q, const QVector3D &r);
-
- QVector3D origin() const;
- void setOrigin(const QVector3D& value);
-
- QVector3D normal() const;
- void setNormal(const QVector3D& value);
-
- bool contains(const QVector3D &point) const;
- bool contains(const QRay3D &ray) const;
-
- bool intersects(const QRay3D &ray) const;
- qreal intersection(const QRay3D &ray) const;
-
- qreal distanceTo(const QVector3D &point) const;
-
- void transform(const QMatrix4x4 &matrix);
- QPlane3D transformed(const QMatrix4x4 &matrix) const;
-
- bool operator==(const QPlane3D &other);
- bool operator!=(const QPlane3D &other);
-
-private:
- QVector3D m_origin;
- QVector3D m_normal;
-};
-
-inline QPlane3D::QPlane3D() : m_normal(1.0f, 0.0f, 0.0f) {}
-
-inline QPlane3D::QPlane3D(const QVector3D &point, const QVector3D &normal)
- : m_origin(point), m_normal(normal)
-{
-}
-
-inline QPlane3D::QPlane3D(const QVector3D &p, const QVector3D &q, const QVector3D &r)
- : m_origin(p), m_normal(QVector3D::crossProduct(q - p, r - q))
-{
-}
-
-inline QVector3D QPlane3D::origin() const
-{
- return m_origin;
-}
-
-inline void QPlane3D::setOrigin(const QVector3D &value)
-{
- m_origin = value;
-}
-
-inline QVector3D QPlane3D::normal() const
-{
- return m_normal;
-}
-
-inline void QPlane3D::setNormal(const QVector3D& value)
-{
- m_normal = value;
-}
-
-inline void QPlane3D::transform(const QMatrix4x4 &matrix)
-{
- m_origin = matrix * m_origin;
- m_normal = matrix.mapVector(m_normal);
-}
-
-inline QPlane3D QPlane3D::transformed(const QMatrix4x4 &matrix) const
-{
- return QPlane3D(matrix * m_origin, matrix.mapVector(m_normal));
-}
-
-inline bool QPlane3D::operator==(const QPlane3D &other)
-{
- return m_origin == other.origin() && m_normal == other.normal();
-}
-
-inline bool QPlane3D::operator!=(const QPlane3D &other)
-{
- return m_origin != other.origin() || m_normal != other.normal();
-}
-
-inline bool qFuzzyCompare(const QPlane3D &plane1, const QPlane3D &plane2)
-{
- return qFuzzyCompare(plane1.origin(), plane2.origin()) &&
- qFuzzyCompare(plane1.normal(), plane2.normal());
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QPlane3D &plane);
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_QT3D_EXPORT QDataStream &operator<<(QDataStream &stream, const QPlane3D &plane);
-Q_QT3D_EXPORT QDataStream &operator>>(QDataStream &stream, QPlane3D &plane);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QPlane3D)
-
-QT_END_HEADER
-
-#endif // QPLANE3D_H
diff --git a/src/gui/extern/Qt3D/math3d/qray3d.cpp b/src/gui/extern/Qt3D/math3d/qray3d.cpp
deleted file mode 100644
index ab560cdefd83d6d3b86fbbcdafee960df473c96b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qray3d.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qray3d.h"
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QRay3D
- \brief The QRay3D class defines a directional line in 3D space extending through an origin point.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::math
-
- A ray is defined by the origin() point and the direction() vector.
- Rays are infinite in length, extending out from origin() in
- both directions. If the direction() is zero length, then the
- behavior of the class is undefined.
-
- A ray can be thought of as a one-dimensional co-ordinate system.
- If the co-ordinate is \bold t then the origin() point is at
- \bold t = 0, the point origin() + direction() is at \bold t = 1,
- and the point origin() - direction() is at \bold t = -1.
- The point() method can be used to obtain the position of a point
- within this one-dimensional co-ordinate system. The fromPoint()
- method can be used to convert a point into a value in this
- one-dimensional co-ordinate system.
-*/
-
-/*!
- \fn QRay3D::QRay3D()
-
- Construct a default ray with an origin() of (0, 0, 0) and a
- direction() of (1, 0, 0).
-*/
-
-/*!
- \fn QRay3D::QRay3D(const QVector3D &origin, const QVector3D &direction)
-
- Construct a ray given its defining \a origin and \a direction. The
- \a direction does not need to be normalized.
-
- To construct a ray that passes through two points, use the following:
-
- \code
- QRay3D thruAB(pointA, pointB - pointA);
- \endcode
-*/
-
-/*!
- \fn QVector3D QRay3D::origin() const
-
- Returns the origin of this ray. The default value is (0, 0, 0).
-
- \sa setOrigin(), direction()
-*/
-
-/*!
- \fn void QRay3D::setOrigin(const QVector3D &value)
-
- Sets the origin point of this ray to \a value.
-
- \sa origin(), setDirection()
- */
-
-/*!
- \fn QVector3D QRay3D::direction() const
-
- Returns the direction vector of this ray. The default value is (1, 0, 0).
-
- \sa setDirection(), origin()
-*/
-
-/*!
- \fn void QRay3D::setDirection(const QVector3D &direction)
-
- Sets the direction vector of this ray to \a direction.
-
- \sa direction(), setOrigin()
-*/
-
-/*!
- Returns true if \a point lies on this ray; false otherwise.
-*/
-bool QRay3D::contains(const QVector3D &point) const
-{
- QVector3D ppVec(point - m_origin);
- if (ppVec.isNull()) // point coincides with origin
- return true;
- qreal dot = QVector3D::dotProduct(ppVec, m_direction);
- if (qFuzzyIsNull(float(dot)))
- return false;
- return qFuzzyCompare(dot*dot, ppVec.lengthSquared() * m_direction.lengthSquared());
-}
-
-/*!
- Returns true if \a ray lies on this ray; false otherwise. If true,
- this implies that the two rays are the actually the same, but with
- different origin() points or an inverted direction().
-*/
-bool QRay3D::contains(const QRay3D &ray) const
-{
- qreal dot = QVector3D::dotProduct(m_direction, ray.direction());
- if (!qFuzzyCompare(dot*dot, m_direction.lengthSquared() * ray.direction().lengthSquared()))
- return false;
- return contains(ray.origin());
-}
-
-/*!
- \fn QVector3D QRay3D::point(qreal t) const
-
- Returns the point on the ray defined by moving \a t units
- along the ray in the direction of the direction() vector.
- Note that \a t may be negative in which case the point returned
- will lie behind the origin() point with respect to the
- direction() vector.
-
- The units for \a t are defined by direction(). The return value
- is precisely origin() + t * direction().
-
- \sa fromPoint(), distanceTo()
-*/
-
-/*!
- Returns the number of direction() units along the ray from origin()
- to \a point. Essentially, this function computes the value t, where
- \a point = origin() + t * direction(). If \a point is not on the ray,
- then the closest point that is on the ray will be used instead.
-
- If the return value is positive, then \a point lies in front of
- the origin() with respect to the direction() vector. If the return
- value is negative, then \a point lies behind the origin() with
- respect to the direction() vector.
-
- \sa point(), project()
-*/
-qreal QRay3D::fromPoint(const QVector3D &point) const
-{
- return QVector3D::dotProduct(point - m_origin, m_direction) /
- m_direction.lengthSquared();
-}
-
-/*!
- Returns the projection of \a vector onto this ray. In the
- following diagram, the dotted line is the ray, and V is the
- \a vector. The return value will be the vector V':
-
- \image qray3d-project.png
-
- \sa fromPoint()
-*/
-QVector3D QRay3D::project(const QVector3D &vector) const
-{
- QVector3D norm = m_direction.normalized();
- return QVector3D::dotProduct(vector, norm) * norm;
-}
-
-/*!
- Returns the minimum distance from this ray to \a point, or equivalently
- the length of a line perpendicular to this ray which passes through
- \a point. If \a point is on the ray, then this function will return zero.
-
- \sa point()
-*/
-qreal QRay3D::distanceTo(const QVector3D &point) const
-{
- qreal t = fromPoint(point);
- return (point - (m_origin + t * m_direction)).length();
-}
-
-/*!
- \fn void QRay3D::transform(const QMatrix4x4 &matrix)
-
- Transforms this ray using \a matrix, replacing origin() and
- direction() with the transformed versions.
-
- \sa transformed()
-*/
-
-/*!
- \fn QRay3D QRay3D::transformed(const QMatrix4x4 &matrix) const
-
- Returns a new ray that is formed by transforming origin()
- and direction() using \a matrix.
-
- \sa transform()
-*/
-
-/*!
- \fn bool QRay3D::operator==(const QRay3D &other)
-
- Returns true if this ray is the same as \a other; false otherwise.
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QRay3D::operator!=(const QRay3D &other)
-
- Returns true if this ray is not the same as \a other; false otherwise.
-
- \sa operator==()
-*/
-
-/*!
- \fn bool qFuzzyCompare(const QRay3D &ray1, const QRay3D &ray2)
- \relates QRay3D
-
- Returns true if \a ray1 and \a ray2 are almost equal; false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QRay3D &ray)
-{
- dbg.nospace() << "QRay3D(origin("
- << ray.origin().x() << ", " << ray.origin().y() << ", "
- << ray.origin().z() << ") - direction("
- << ray.direction().x() << ", " << ray.direction().y() << ", "
- << ray.direction().z() << "))";
- return dbg.space();
-}
-
-#endif
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream &operator<<(QDataStream &stream, const QRay3D &ray)
- \relates QRay3D
-
- Writes the given \a ray to the given \a stream and returns a
- reference to the stream.
-*/
-
-QDataStream &operator<<(QDataStream &stream, const QRay3D &ray)
-{
- stream << ray.origin();
- stream << ray.direction();
- return stream;
-}
-
-/*!
- \fn QDataStream &operator>>(QDataStream &stream, QRay3D &ray)
- \relates QRay3D
-
- Reads a 3D ray from the given \a stream into the given \a ray
- and returns a reference to the stream.
-*/
-
-QDataStream &operator>>(QDataStream &stream, QRay3D &ray)
-{
- QVector3D origin, direction;
- stream >> origin;
- stream >> direction;
- ray = QRay3D(origin, direction);
- return stream;
-}
-
-#endif // QT_NO_DATASTREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/math3d/qray3d.h b/src/gui/extern/Qt3D/math3d/qray3d.h
deleted file mode 100644
index 2ae695f491c2ce9a8036b89b26be58f6b610aeb6..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qray3d.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QRAY3D_H
-#define QRAY3D_H
-
-#include "qt3dglobal.h"
-#include <QtGui/qvector3d.h>
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QRay3D
-{
-public:
- QRay3D();
- QRay3D(const QVector3D &origin, const QVector3D &direction);
-
- QVector3D origin() const;
- void setOrigin(const QVector3D & value);
-
- QVector3D direction() const;
- void setDirection(const QVector3D & value);
-
- bool contains(const QVector3D &point) const;
- bool contains(const QRay3D &ray) const;
-
- QVector3D point(qreal t) const;
- qreal fromPoint(const QVector3D &point) const;
-
- QVector3D project(const QVector3D &vector) const;
-
- qreal distanceTo(const QVector3D &point) const;
-
- void transform(const QMatrix4x4 &matrix);
- QRay3D transformed(const QMatrix4x4 &matrix) const;
-
- bool operator==(const QRay3D &other);
- bool operator!=(const QRay3D &other);
-
-private:
- QVector3D m_origin;
- QVector3D m_direction;
-
-};
-
-inline QRay3D::QRay3D() : m_direction(1.0f, 0.0f, 0.0f) {}
-
-inline QRay3D::QRay3D(const QVector3D &origin, const QVector3D &direction)
- : m_origin(origin)
- , m_direction(direction)
-{
-}
-
-inline QVector3D QRay3D::origin() const
-{
- return m_origin;
-}
-
-inline void QRay3D::setOrigin(const QVector3D &value)
-{
- m_origin = value;
-}
-
-inline QVector3D QRay3D::direction() const
-{
- return m_direction;
-}
-
-inline void QRay3D::setDirection(const QVector3D & value)
-{
- m_direction = value;
-}
-
-inline QVector3D QRay3D::point(qreal t) const
-{
- return m_origin + t * m_direction;
-}
-
-inline void QRay3D::transform(const QMatrix4x4 &matrix)
-{
- m_origin = matrix * m_origin;
- m_direction = matrix.mapVector(m_direction);
-}
-
-inline QRay3D QRay3D::transformed(const QMatrix4x4 &matrix) const
-{
- return QRay3D(matrix * m_origin, matrix.mapVector(m_direction));
-}
-
-inline bool QRay3D::operator==(const QRay3D &other)
-{
- return m_origin == other.origin() && m_direction == other.direction();
-}
-
-inline bool QRay3D::operator!=(const QRay3D &other)
-{
- return m_origin != other.origin() || m_direction != other.direction();
-}
-
-inline bool qFuzzyCompare(const QRay3D &ray1, const QRay3D &ray2)
-{
- return qFuzzyCompare(ray1.origin(), ray2.origin()) &&
- qFuzzyCompare(ray1.direction(), ray2.direction());
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QRay3D &ray);
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_QT3D_EXPORT QDataStream &operator<<(QDataStream &stream, const QRay3D &ray);
-Q_QT3D_EXPORT QDataStream &operator>>(QDataStream &stream, QRay3D &ray);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QRay3D)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/math3d/qsphere3d.cpp b/src/gui/extern/Qt3D/math3d/qsphere3d.cpp
deleted file mode 100644
index 6aaea42695f883be1d899e140ec80a41f907a09f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qsphere3d.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qsphere3d.h"
-#include "qray3d.h"
-#include "qbox3d.h"
-#include "qplane3d.h"
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QSphere3D
- \brief The QSphere3D class represents a mathematical sphere in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::math
-
- QSphere3D can be used to represent the bounding regions of objects
- in a 3D scene so that they can be easily culled if they are out of view.
- It can also be used to assist with collision testing.
-
- \sa QBox3D
-*/
-
-/*!
- \fn QSphere3D::QSphere3D()
-
- Constructs a default sphere with a center() of (0, 0, 0)
- and radius() of 1.
-*/
-
-/*!
- \fn QSphere3D::QSphere3D(const QVector3D ¢er, qreal radius)
-
- Constructs a sphere with the specified \a center and \a radius.
-*/
-
-/*!
- \fn QVector3D QSphere3D::center() const
-
- Returns the center of this sphere.
-
- \sa setCenter(), radius()
-*/
-
-/*!
- \fn void QSphere3D::setCenter(const QVector3D ¢er)
-
- Sets the \a center of this sphere.
-
- \sa center(), setRadius()
-*/
-
-/*!
- \fn qreal QSphere3D::radius() const
-
- Returns the radius of this sphere.
-
- \sa setRadius(), center()
-*/
-
-/*!
- \fn void QSphere3D::setRadius(qreal radius)
-
- Sets the \a radius of this sphere.
-
- \sa radius(), setCenter()
-*/
-
-/*!
- \fn bool QSphere3D::contains(const QVector3D &point) const
-
- Returns true if \a point is contained within the bounds of
- this sphere; false otherwise.
-*/
-
-/*!
- Returns true if this sphere intersects \a ray; false otherwise.
-
- \sa intersection()
-*/
-bool QSphere3D::intersects(const QRay3D &ray) const
-{
- QVector3D centerToOrigin = ray.origin() - m_center;
- qreal term1 = ray.direction().lengthSquared();
- qreal term2 = 2.0f * QVector3D::dotProduct(centerToOrigin, ray.direction());
- qreal term3 = centerToOrigin.lengthSquared() - m_radius * m_radius;
- qreal det = term2 * term2 - (4.0f * term1 * term3);
- return term1 != 0.0f && det >= 0.0f;
-}
-
-/*!
- \fn bool QSphere3D::intersects(const QSphere3D &sphere) const
-
- Returns true if this sphere intersects \a sphere; false otherwise.
-
- \sa contains()
-*/
-
-/*!
- Returns true if this sphere intersects \a box; false otherwise.
-*/
-bool QSphere3D::intersects(const QBox3D &box) const
-{
- if (box.isFinite()) {
- // Use Arvo's Algorithm to determine if we have an intersection.
- qreal dist = 0.0f;
- qreal center = m_center.x();
- qreal minval = box.minimum().x();
- qreal maxval = box.maximum().x();
- if (center < minval)
- dist += (center - minval) * (center - minval);
- else if (center > maxval)
- dist += (center - maxval) * (center - maxval);
- center = m_center.y();
- minval = box.minimum().y();
- maxval = box.maximum().y();
- if (center < minval)
- dist += (center - minval) * (center - minval);
- else if (center > maxval)
- dist += (center - maxval) * (center - maxval);
- center = m_center.z();
- minval = box.minimum().z();
- maxval = box.maximum().z();
- if (center < minval)
- dist += (center - minval) * (center - minval);
- else if (center > maxval)
- dist += (center - maxval) * (center - maxval);
- return dist <= (m_radius * m_radius);
- } else {
- return box.isInfinite();
- }
-}
-
-/*!
- Returns true if this sphere intersects \a plane; false otherwise.
-*/
-bool QSphere3D::intersects(const QPlane3D &plane) const
-{
- return qAbs(plane.distanceTo(m_center)) <= m_radius;
-}
-
-/*!
- Finds the \a minimum_t and \a maximum_t values where \a ray intersects
- this sphere. Returns true if intersections were found; or false if there
- is no intersection.
-
- If \a minimum_t and \a maximum_t are set to the same value, then \a ray
- touches the surface of the sphere at a single point. If the t values are
- negative, then the intersection occurs before the ray's origin point
- in the reverse direction of the ray.
-
- The \a minimum_t and \a maximum_t values can be passed to QRay3D::point()
- to determine the actual intersection points, as shown in the following
- example:
-
- \code
- qreal minimum_t, maximum_t;
- if (sphere.intersection(ray, &minimum_t, &maximum_t)) {
- qDebug() << "intersections at"
- << ray.point(minimum_t) << "and"
- << ray.point(maximum_t);
- }
- \endcode
-
- \sa intersects(), QRay3D::point()
-*/
-bool QSphere3D::intersection(const QRay3D &ray, qreal *minimum_t, qreal *maximum_t) const
-{
- QVector3D centerToOrigin = ray.origin() - m_center;
- qreal term1 = ray.direction().lengthSquared();
- qreal term2 = 2.0f * QVector3D::dotProduct(centerToOrigin, ray.direction());
- qreal term3 = centerToOrigin.lengthSquared() - m_radius * m_radius;
- qreal det = term2 * term2 - (4.0f * term1 * term3);
- if (term1 == 0.0f || det < 0.0f) {
- *minimum_t = qSNaN();
- *maximum_t = qSNaN();
- return false;
- } else if (det == 0.0f) {
- *minimum_t = *maximum_t = -term2 / (2.0f * term1);
- } else {
- qreal sqrtDet = qSqrt(det);
- qreal t1 = (-term2 - sqrtDet) / (2.0f * term1);
- qreal t2 = (-term2 + sqrtDet) / (2.0f * term1);
- if (t1 < t2) {
- *minimum_t = t1;
- *maximum_t = t2;
- } else {
- *minimum_t = t2;
- *maximum_t = t1;
- }
- }
- return true;
-}
-
-/*!
- Returns the t value at which \a ray first intersects the surface of
- this sphere, or not-a-number if there is no intersection.
-
- When the \a ray intersects this sphere, the return value is a
- parametric value that can be passed to QRay3D::point() to determine
- the actual intersection point, as shown in the following example:
-
- \code
- qreal t = sphere.intersection(ray);
- QVector3D pt;
- if (qIsNaN(t)) {
- qWarning("no intersection occurred");
- else
- pt = ray.point(t);
- \endcode
-
- The \a ray might intersect at two points - as the ray passes through
- the sphere - one on the near side, one on the far side; where near and far
- are relative to the origin point of the ray. This function only
- returns the near intersection point.
-
- Only positive values on the ray are considered. This means that if
- the origin point of the ray is inside the sphere, there is only one
- solution, not two. To get the other solution, simply change
- the sign of the ray's direction vector. If the origin point of
- the ray is outside the sphere, and the direction points away from
- the sphere, then there will be no intersection.
-
- When the ray does not intersect the sphere in the positive direction,
- then the return value is not-a-number.
-
- \sa intersects(), QRay3D::point()
-*/
-qreal QSphere3D::intersection(const QRay3D &ray) const
-{
- qreal minimum_t, maximum_t;
- if (intersection(ray, &minimum_t, &maximum_t)) {
- if (minimum_t >= 0.0f)
- return minimum_t;
- else if (maximum_t >= 0.0f)
- return maximum_t;
- else
- return qSNaN();
- } else {
- return qSNaN();
- }
-}
-
-/*!
- \fn void QSphere3D::transform(const QMatrix4x4 &matrix)
-
- Transforms this sphere's center() and radius() according to \a matrix.
-
- It is assumed that \a matrix contains a uniform scale factor in the
- x, y, and z directions. Otherwise the radius() in the result is undefined.
-
- \sa transformed()
-*/
-
-/*!
- Returns the result of transforming this sphere's center() and radius()
- according to \a matrix.
-
- It is assumed that \a matrix contains a uniform scale factor in the
- x, y, and z directions. Otherwise the radius() in the result is undefined.
-
- \sa transform()
-*/
-QSphere3D QSphere3D::transformed(const QMatrix4x4 &matrix) const
-{
- return QSphere3D(matrix * m_center,
- matrix.mapVector(QVector3D(m_radius, 0, 0)).length());
-}
-
-/*!
- \fn bool QSphere3D::operator==(const QSphere3D &sphere) const
-
- Returns true if this sphere is the same as \a sphere; false otherwise.
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QSphere3D::operator!=(const QSphere3D &sphere) const
-
- Returns true if this sphere is not the same as \a sphere; false otherwise.
-
- \sa operator==()
-*/
-
-/*!
- \fn bool qFuzzyCompare(const QSphere3D &sphere1, const QSphere3D &sphere2)
- \relates QSphere3D
-
- Returns true if \a sphere1 and \a sphere2 are almost equal;
- false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QSphere3D &sphere)
-{
- dbg.nospace() << "QSphere3D(center=("
- << sphere.center().x() << ", " << sphere.center().y() << ", "
- << sphere.center().z() << "), radius=" << sphere.radius() << ')';
- return dbg.space();
-}
-
-#endif
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream &operator<<(QDataStream &stream, const QSphere3D &sphere)
- \relates QSphere3D
-
- Writes the given \a sphere to the given \a stream and returns a
- reference to the stream.
-*/
-
-QDataStream &operator<<(QDataStream &stream, const QSphere3D &sphere)
-{
- stream << sphere.center();
- stream << double(sphere.radius());
- return stream;
-}
-
-/*!
- \fn QDataStream &operator>>(QDataStream &stream, QSphere3D &sphere)
- \relates QSphere3D
-
- Reads a 3D sphere from the given \a stream into the given \a sphere
- and returns a reference to the stream.
-*/
-
-QDataStream &operator>>(QDataStream &stream, QSphere3D &sphere)
-{
- QVector3D center;
- double radius;
- stream >> center;
- stream >> radius;
- sphere.setCenter(center);
- sphere.setRadius(qreal(radius));
- return stream;
-}
-
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/math3d/qsphere3d.h b/src/gui/extern/Qt3D/math3d/qsphere3d.h
deleted file mode 100644
index 0ca5a65e0cc9011d3785e1b2ba582824a440ce3f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qsphere3d.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QSPHERE3D_H
-#define QSPHERE3D_H
-
-#include "qt3dglobal.h"
-#include <QtGui/qvector3d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-class QRay3D;
-class QBox3D;
-class QPlane3D;
-
-class Q_QT3D_EXPORT QSphere3D
-{
-public:
- QSphere3D();
- QSphere3D(const QVector3D ¢er, qreal radius);
-
- QVector3D center() const;
- void setCenter(const QVector3D ¢er);
-
- qreal radius() const;
- void setRadius(qreal radius);
-
- bool contains(const QVector3D &point) const;
-
- bool intersects(const QRay3D &ray) const;
- bool intersects(const QSphere3D &sphere) const;
- bool intersects(const QBox3D &box) const;
- bool intersects(const QPlane3D &plane) const;
-
- bool intersection(const QRay3D &ray, qreal *minimum_t, qreal *maximum_t) const;
- qreal intersection(const QRay3D &ray) const;
-
- void transform(const QMatrix4x4 &matrix);
- QSphere3D transformed(const QMatrix4x4 &matrix) const;
-
- bool operator==(const QSphere3D &sphere) const;
- bool operator!=(const QSphere3D &sphere) const;
-
-private:
- QVector3D m_center;
- qreal m_radius;
-};
-
-inline QSphere3D::QSphere3D() : m_radius(1.0f) {}
-
-inline QSphere3D::QSphere3D(const QVector3D ¢er, qreal radius)
- : m_center(center), m_radius(radius) {}
-
-inline QVector3D QSphere3D::center() const
-{
- return m_center;
-}
-
-inline void QSphere3D::setCenter(const QVector3D ¢er)
-{
- m_center = center;
-}
-
-inline qreal QSphere3D::radius() const
-{
- return m_radius;
-}
-
-inline void QSphere3D::setRadius(qreal radius)
-{
- m_radius = radius;
-}
-
-inline bool QSphere3D::contains(const QVector3D &point) const
-{
- return (point - m_center).lengthSquared() <= (m_radius * m_radius);
-}
-
-inline bool QSphere3D::intersects(const QSphere3D &sphere) const
-{
- qreal radsum = sphere.radius() + m_radius;
- return (sphere.center() - m_center).lengthSquared() <= (radsum * radsum);
-}
-
-inline void QSphere3D::transform(const QMatrix4x4 &matrix)
-{
- *this = transformed(matrix);
-}
-
-inline bool QSphere3D::operator==(const QSphere3D &sphere) const
-{
- return m_center == sphere.m_center && m_radius == sphere.m_radius;
-}
-
-inline bool QSphere3D::operator!=(const QSphere3D &sphere) const
-{
- return m_center != sphere.m_center || m_radius != sphere.m_radius;
-}
-
-inline bool qFuzzyCompare(const QSphere3D &sphere1, const QSphere3D &sphere2)
-{
- return qFuzzyCompare(sphere1.center(), sphere2.center()) &&
- qFuzzyCompare(sphere1.radius(), sphere2.radius());
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QSphere3D &sphere);
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_QT3D_EXPORT QDataStream &operator<<(QDataStream &stream, const QSphere3D &sphere);
-Q_QT3D_EXPORT QDataStream &operator>>(QDataStream &stream, QSphere3D &sphere);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QSphere3D)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/math3d/qtriangle3d.cpp b/src/gui/extern/Qt3D/math3d/qtriangle3d.cpp
deleted file mode 100644
index c28abc1250b5c04f4716a993267c0e120dc88923..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qtriangle3d.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qtriangle3d.h"
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qnumeric.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QTriangle3D
- \brief The QTriangle3D class represents a triangle as three points in 3D space.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::math
-
- A triangle is defined by 3 points in 3D space. Since any 3 points define
- a plane, the triangle can be thought of as defining a plane, and forming a
- geometric region in that plane.
-
- If you need a simple plane, with no particular geometry, then
- QPlane3D is a more compact and mathematically sufficient class.
-
- The three points are labelled p(), q() and r() for consistency with
- textbook treatments. It is recommended that the points be supplied
- in counter-clockwise order for correct orientation of the
- triangle's plane().
-
- \sa QPlane3D
-*/
-
-/*!
- \fn QTriangle3D::QTriangle3D()
-
- Constructs a default triangle which lies in the x-z plane,
- with the three vertices (0, 0, 0), (1, 0, 0), and (0, 1, 0).
-*/
-
-/*!
- \fn QTriangle3D::QTriangle3D(const QVector3D &p, const QVector3D &q, const QVector3D &r)
-
- Constructs a triangle with the supplied \a p, \a q and \a r vertices.
-*/
-
-/*!
- \fn QVector3D QTriangle3D::p() const
-
- Returns the value of the P vertex on the triangle.
-
- \sa q(), r(), setP()
-*/
-
-/*!
- \fn void QTriangle3D::setP(const QVector3D &point)
-
- Sets the value of the P vertex on the triangle to \a point.
-
- \sa setQ(), setR(), p()
-*/
-
-/*!
- \fn QVector3D QTriangle3D::q() const
-
- Returns the value of the Q vertex on the triangle.
-
- \sa p(), r(), setQ()
-*/
-
-/*!
- \fn void QTriangle3D::setQ(const QVector3D &point)
-
- Sets the value of the Q vertex on the triangle \a point.
-
- \sa setP(), setR(), q()
-*/
-
-
-/*!
- \fn QVector3D QTriangle3D::r() const
-
- Returns the value of the R vertex on the triangle.
-
- \sa p(), q(), setR()
-*/
-
-/*!
- \fn void QTriangle3D::setR(const QVector3D &point)
-
- Sets the value of the R vertex on the triangle \a point.
-
- \sa setP(), setQ(), r()
-*/
-
-/*!
- \fn QPlane3D QTriangle3D::plane() const
-
- Returns the plane in which the triangle lies.
-
- \sa QPlane3D
-*/
-
-/*!
- \fn QVector3D QTriangle3D::center() const
-
- Returns the center of the triangle, which is the geometric average of the
- three vertices.
-*/
-
-/*!
- \fn QVector3D QTriangle3D::faceNormal() const
-
- Returns the vector normal to this triangle, computed from the
- cross-product of P-Q and Q-R. The result is not normalized.
-*/
-
-/*!
- Returns true if this triangle contains \a point; false otherwise.
- To contain the \a point means that:
- \list
- \o the point lies on the same plane as the triangle, and
- \o the point
- \list
- \o lies either wholly within the triangle, or
- \o lies on one of the sides, or
- \o coincides with one of the 3 vertices
- \endlist
- \endlist
-
- \sa intersects()
-*/
-bool QTriangle3D::contains(const QVector3D &point) const
-{
- // Check if the point is on the triangle's plane first.
- QVector3D normal = QVector3D::crossProduct(m_q - m_p, m_r - m_q);
- if (!qFuzzyIsNull(float(QVector3D::dotProduct(normal, m_p - point))))
- return false;
-
- // Compute the barycentric co-ordinates and use them to determine
- // if the point is within the triangle.
- QVector2D c = uv(point);
- if (c.x() < 0.0f || c.x() > 1.0f)
- return false;
- if (c.y() < 0.0f || c.y() > 1.0f)
- return false;
- if ((c.x() + c.y()) > 1.0f)
- return false;
- return true;
-}
-
-/*!
- Returns true if the \a ray intersects this triangle; false otherwise.
-
- This function will return false if the triangle is degenerate.
-
- \sa contains(), intersection()
-*/
-bool QTriangle3D::intersects(const QRay3D &ray) const
-{
- qreal t = plane().intersection(ray);
- if (qIsNaN(t))
- return false;
- return contains(ray.point(t));
-}
-
-/*!
- Returns the t value at which \a ray intersects this triangle, or
- not-a-number if there is no intersection.
-
- When the \a ray intersects this triangle, the return value is a
- parametric value that can be passed to QRay3D::point() to determine
- the actual intersection point, as shown in the following example:
-
- \code
- qreal t = triangle.intersection(ray);
- QVector3D pt;
- if (qIsNaN(t)) {
- qWarning("no intersection occurred");
- else
- pt = ray.point(t);
- \endcode
-
- \sa intersects(), contains(), QRay3D::point()
- */
-qreal QTriangle3D::intersection(const QRay3D &ray) const
-{
- qreal t = plane().intersection(ray);
- if (qIsNaN(t) || contains(ray.point(t)))
- return t;
- return qSNaN();
-}
-
-/*!
- Transforms the points of this triangle according to \a matrix.
-
- \sa transformed()
-*/
-void QTriangle3D::transform(const QMatrix4x4 &matrix)
-{
- m_p = matrix * m_p;
- m_q = matrix * m_q;
- m_r = matrix * m_r;
-}
-
-/*!
- Returns a new triangle that results from transforming this
- one using \a matrix.
-
- \sa transform()
-*/
-QTriangle3D QTriangle3D::transformed(const QMatrix4x4 &matrix) const
-{
- return QTriangle3D(matrix * m_p, matrix * m_q, matrix * m_r);
-}
-
-/*!
- Returns the (u, v) barycentric co-ordinates of \a point within
- this triangle.
-
- The returned barycentric co-ordinates will be (1, 0) at p(),
- (0, 1) at q(), and (0, 0) at r(). Technically, barycentric
- co-ordinates have three components with the corners at
- (1, 0, 0), (0, 1, 0), and (0, 0, 1). However, the third
- component is always equal to (1 - u - v) so we do not return it.
-
- The typical use case for this function is to convert an intersection
- point on a triangle into the texture co-ordinate corresponding to
- that point. If \c p, \c q, and \c r are the points on the triangle,
- with corresponding texture co-ordinates \c tp, \c tq, and \c tr,
- then the texture co-ordinate \c tc of \a point can be determined
- by the following code:
-
- \code
- QTriangle3D triangle(p, q, r);
- QVector2D uv = triangle.uv(point);
- QVector2D tc = uv.x() * tp + uv.y() * tq + (1 - uv.x() - uv.y()) * tr;
- \endcode
-
- \sa contains(), intersection()
-*/
-QVector2D QTriangle3D::uv(const QVector3D &point) const
-{
- // Algorithm from: http://www.blackpawn.com/texts/pointinpoly/default.html
- // More: http://en.wikipedia.org/wiki/Barycentric_coordinates_(mathematics)
- QVector3D rq = m_q - m_r;
- QVector3D rp = m_p - m_r;
- QVector3D pp = point - m_r;
- qreal dot_rq_rq = QVector3D::dotProduct(rq, rq);
- qreal dot_rq_rp = QVector3D::dotProduct(rq, rp);
- qreal dot_rq_pp = QVector3D::dotProduct(rq, pp);
- qreal dot_rp_rp = QVector3D::dotProduct(rp, rp);
- qreal dot_rp_pp = QVector3D::dotProduct(rp, pp);
- qreal det = dot_rq_rq * dot_rp_rp - dot_rq_rp * dot_rq_rp;
- if (qFuzzyIsNull(float(det))) {
- // The point is probably not in the triangle, or the triangle
- // is degenerate. Return an out of range value for (u, v) so
- // that contains() will fail when this case happens.
- return QVector2D(-1.0f, -1.0f);
- }
- return QVector2D((dot_rq_rq * dot_rp_pp - dot_rq_rp * dot_rq_pp) / det,
- (dot_rp_rp * dot_rq_pp - dot_rq_rp * dot_rp_pp) / det);
-}
-
-/*!
- \fn bool QTriangle3D::operator==(const QTriangle3D &other)
-
- Returns true if this triangle is the same as \a other; false otherwise.
-
- \sa operator!=()
-*/
-
-/*!
- \fn bool QTriangle3D::operator!=(const QTriangle3D &other)
-
- Returns true if this triangle is not the same as \a other; false otherwise.
-
- \sa operator==()
-*/
-
-/*!
- \fn bool qFuzzyCompare(const QTriangle3D &triangle1, const QTriangle3D &triangle2)
- \relates QTriangle3D
-
- Returns true if \a triangle1 and \a triangle2 are almost equal;
- false otherwise.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-
-QDebug operator<<(QDebug dbg, const QTriangle3D &triangle)
-{
- dbg.nospace() << "QTriangle3D(("
- << triangle.p().x() << ", " << triangle.p().y() << ", "
- << triangle.p().z() << "), ("
- << triangle.q().x() << ", " << triangle.q().y() << ", "
- << triangle.q().z() << "), ("
- << triangle.r().x() << ", " << triangle.r().y() << ", "
- << triangle.r().z() << "))";
- return dbg.space();
-}
-
-#endif
-
-#ifndef QT_NO_DATASTREAM
-
-/*!
- \fn QDataStream &operator<<(QDataStream &stream, const QTriangle3D &triangle)
- \relates QTriangle3D
-
- Writes the given \a triangle to the given \a stream and returns a
- reference to the stream.
-*/
-
-QDataStream &operator<<(QDataStream &stream, const QTriangle3D &triangle)
-{
- stream << triangle.p();
- stream << triangle.q();
- stream << triangle.r();
- return stream;
-}
-
-/*!
- \fn QDataStream &operator>>(QDataStream &stream, QTriangle3D &triangle)
- \relates QTriangle3D
-
- Reads a 3D triangle from the given \a stream into the given \a triangle
- and returns a reference to the stream.
-*/
-
-QDataStream &operator>>(QDataStream &stream, QTriangle3D &triangle)
-{
- QVector3D p, q, r;
- stream >> p;
- stream >> q;
- stream >> r;
- triangle = QTriangle3D(p, q, r);
- return stream;
-}
-
-#endif // QT_NO_DATASTREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/math3d/qtriangle3d.h b/src/gui/extern/Qt3D/math3d/qtriangle3d.h
deleted file mode 100644
index a8e6519a46387ddc6782bbf7660fcb2201d2c216..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/math3d/qtriangle3d.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QTRIANGLE3D_H
-#define QTRIANGLE3D_H
-
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector2d.h>
-#include "qray3d.h"
-#include "qplane3d.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QTriangle3D
-{
-public:
- QTriangle3D();
- QTriangle3D(const QVector3D &p, const QVector3D &q, const QVector3D &r);
-
- QVector3D p() const;
- void setP(const QVector3D & point);
-
- QVector3D q() const;
- void setQ(const QVector3D & point);
-
- QVector3D r() const;
- void setR(const QVector3D & point);
-
- QPlane3D plane() const;
- QVector3D center() const;
- QVector3D faceNormal() const;
-
- bool contains(const QVector3D &point) const;
-
- bool intersects(const QRay3D &ray) const;
- qreal intersection(const QRay3D &ray) const;
-
- void transform(const QMatrix4x4 &matrix);
- QTriangle3D transformed(const QMatrix4x4 &matrix) const;
-
- QVector2D uv(const QVector3D &point) const;
-
- bool operator==(const QTriangle3D &other);
- bool operator!=(const QTriangle3D &other);
-
-private:
- QVector3D m_p, m_q, m_r;
-};
-
-inline QTriangle3D::QTriangle3D()
- : m_p(0.0f, 0.0f, 0.0f)
- , m_q(1.0f, 0.0f, 0.0f)
- , m_r(0.0f, 1.0f, 0.0f) {}
-
-inline QTriangle3D::QTriangle3D(const QVector3D &p, const QVector3D &q, const QVector3D &r)
- : m_p(p)
- , m_q(q)
- , m_r(r) {}
-
-inline QVector3D QTriangle3D::p() const
-{
- return m_p;
-}
-
-inline void QTriangle3D::setP(const QVector3D &point)
-{
- m_p = point;
-}
-
-inline QVector3D QTriangle3D::q() const
-{
- return m_q;
-}
-
-inline void QTriangle3D::setQ(const QVector3D &point)
-{
- m_q = point;
-}
-
-inline QVector3D QTriangle3D::r() const
-{
- return m_r;
-}
-
-inline void QTriangle3D::setR(const QVector3D &point)
-{
- m_r = point;
-}
-
-inline QPlane3D QTriangle3D::plane() const
-{
- return QPlane3D(m_p, m_q, m_r);
-}
-
-inline QVector3D QTriangle3D::center() const
-{
- return (m_p + m_q + m_r) / 3.0f;
-}
-
-inline QVector3D QTriangle3D::faceNormal() const
-{
- return QVector3D::crossProduct(m_q - m_p, m_r - m_q);
-}
-
-inline bool QTriangle3D::operator==(const QTriangle3D &other)
-{
- return m_p == other.m_p && m_q == other.m_q && m_r == other.m_r;
-}
-
-inline bool QTriangle3D::operator!=(const QTriangle3D &other)
-{
- return m_p != other.m_p || m_q != other.m_q || m_r != other.m_r;
-}
-
-inline bool qFuzzyCompare
- (const QTriangle3D &triangle1, const QTriangle3D &triangle2)
-{
- return qFuzzyCompare(triangle1.p(), triangle2.p()) &&
- qFuzzyCompare(triangle1.q(), triangle2.q()) &&
- qFuzzyCompare(triangle1.r(), triangle2.r());
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QTriangle3D &triangle);
-#endif
-
-#ifndef QT_NO_DATASTREAM
-Q_QT3D_EXPORT QDataStream &operator<<(QDataStream &stream, const QTriangle3D &triangle);
-Q_QT3D_EXPORT QDataStream &operator>>(QDataStream &stream, QTriangle3D &triangle);
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QTriangle3D)
-
-QT_END_HEADER
-
-#endif // QTRIANGLE3D_H
diff --git a/src/gui/extern/Qt3D/painting/CMakeLists.txt b/src/gui/extern/Qt3D/painting/CMakeLists.txt
deleted file mode 100644
index 187d98cfd53a01c9861da59fb1c0ecbbf5d3daec..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-target_sources( gui
- PRIVATE
- qmatrix4x4stack.h
- qglabstracteffect.h
- qgllightmodel.cpp
- qmatrix4x4stack.cpp
- qglpainter_p.h
- qmatrix4x4stack_p.h
- qglpickcolors.cpp
- qglabstracteffect.cpp
- qgllightmodel.h
- qglabstracteffect_p.h
- qglpickcolors_p.h
- qglext_p.h
- qgllightparameters.cpp
- qgllightparameters.h
- qglpainter.h
- qglext.cpp
- qglpainter.cpp
- )
diff --git a/src/gui/extern/Qt3D/painting/qglabstracteffect.cpp b/src/gui/extern/Qt3D/painting/qglabstracteffect.cpp
deleted file mode 100644
index dfc2c9a1871755d3376159f772640ba32b1627a2..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglabstracteffect.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglabstracteffect.h"
-#include "qglpainter_p.h"
-#include <QtOpenGL/qglshaderprogram.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAbstractEffect
- \since 4.8
- \brief The QGLAbstractEffect class provides a standard interface for rendering surface material effects with GL.
- \ingroup qt3d
- \ingroup qt3d::painting
-
- \section1 Vertex attributes
-
- Vertex attributes for the effect are specified using
- QGLPainter::setVertexAttribute() and QGLPainter::setVertexBundle(),
- and may be independent of the effect itself. Those functions
- will bind standard attributes to specific indexes within the
- GL state. For example, the QGL::Position will be bound
- to index 0, QGL::TextureCoord0 will be bound to index 3, etc.
-
- Effect subclasses that use vertex shaders should bind their attributes
- to these indexes using QGLShaderProgram::bindAttributeLocation()
- just before the program is linked. For example:
-
- \code
- QGLShaderProgram *program = new QGLShaderProgram();
- program->addShaderFromSourceCode(QGLShader::Vertex, vshaderSource);
- program->addShaderFromSourceCode(QGLShader::Fragment, fshaderSource);
- program->bindAttributeLocation("vertex", QGL::Position);
- program->bindAttributeLocation("normal", QGL::Normal);
- program->bindAttributeLocation("texcoord", QGL::TextureCoord0);
- program->link();
- \endcode
-
- The QGLShaderProgramEffect class can assist with writing
- shader-based effects. It will automatically bind special
- variable names, such as \c{qt_Vertex}, \c{qt_MultiTexCoord0}, etc,
- to the standard indexes. This alleviates the need for the
- application to bind the names itself.
-*/
-
-/*!
- Constructs a new effect object.
-*/
-QGLAbstractEffect::QGLAbstractEffect()
-{
-}
-
-/*!
- Destroys this effect object.
-*/
-QGLAbstractEffect::~QGLAbstractEffect()
-{
-}
-
-/*!
- Returns true if this effect supports object picking; false otherwise.
- The default implementation returns false, which causes QGLPainter
- to use the effect associated with QGL::FlatColor to perform
- object picking.
-
- Effects that support object picking render fragments with
- QGLPainter::pickColor() when QGLPainter::isPicking() returns true.
- By default, only the effect associated with QGL::FlatColor does this,
- rendering the entire fragment with the flat pick color.
-
- In some cases, rendering the entire fragment with the pick color
- may not be appropriate. An alpha-blended icon texture that is
- drawn to the screen as a quad may have an irregular shape smaller
- than the quad. For picking, the application may not want the
- entire quad to be "active" for object selection as it would appear
- to allow the user to click off the icon to select it.
-
- This situation can be handled by implementing an icon rendering
- effect that draws the icon normally when QGLPainter::isPicking()
- is false, and draws a mask texture defining the outline of the icon
- with QGLPainter::pickColor() when QGLPainter::isPicking() is true.
-
- \sa QGLPainter::setPicking()
-*/
-bool QGLAbstractEffect::supportsPicking() const
-{
- return false;
-}
-
-/*!
- \fn void QGLAbstractEffect::setActive(QGLPainter *painter, bool flag)
-
- Activates or deactivates this effect on \a painter,
- according to \a flag, on the current GL context by selecting
- shader programs, setting lighting and material parameters, etc.
-
- \sa update()
-*/
-
-/*!
- \fn void QGLAbstractEffect::update(QGLPainter *painter, QGLPainter::Updates updates)
-
- Updates the current GL context with information from \a painter
- just prior to the drawing of triangles, quads, etc.
-
- The \a updates parameter specifies the properties on \a painter
- that have changed since the last call to update() or setActive().
-
- \sa setActive()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qglabstracteffect.h b/src/gui/extern/Qt3D/painting/qglabstracteffect.h
deleted file mode 100644
index b968fc7b0ea3742dfe7277f1a47162cbd6593a7c..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglabstracteffect.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLABSTRACTEFFECT_H
-#define QGLABSTRACTEFFECT_H
-
-#include "qglpainter.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLAbstractEffect
-{
-public:
- QGLAbstractEffect();
- virtual ~QGLAbstractEffect();
-
- virtual bool supportsPicking() const;
- virtual void setActive(QGLPainter *painter, bool flag) = 0;
- virtual void update(QGLPainter *painter, QGLPainter::Updates updates) = 0;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qglabstracteffect_p.h b/src/gui/extern/Qt3D/painting/qglabstracteffect_p.h
deleted file mode 100644
index 946cf6a8c3eb1072747a554c2cb9cbcb411e01a2..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglabstracteffect_p.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLABSTRACTEFFECT_P_H
-#define QGLABSTRACTEFFECT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstracteffect.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-#if defined(QT_OPENGL_ES_2)
-#define QGL_SHADERS_ONLY 1
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qglext.cpp b/src/gui/extern/Qt3D/painting/qglext.cpp
deleted file mode 100644
index c75e74838d39ac6741b72a23ae86013d7221ed7e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglext.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglext_p.h"
-#include "qopenglfunctions.h"
-
-// copied private header
-#include "qglextensions_p.h"
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(QT_OPENGL_ES)
-
-typedef void (QT3D_GLF_APIENTRYP q_PFNGLCLIENTACTIVETEXTUREPROC) (GLenum);
-
-class QGLMultiTextureExtensions
-{
-public:
- QGLMultiTextureExtensions(const QGLContext * = 0)
- {
- clientActiveTexture = 0;
- multiTextureResolved = false;
- }
-
- q_PFNGLCLIENTACTIVETEXTUREPROC clientActiveTexture;
- bool multiTextureResolved;
-};
-
-Q_GLOBAL_STATIC(QGLResource<QGLMultiTextureExtensions>, qt_multitexture_funcs)
-
-static QGLMultiTextureExtensions *resolveMultiTextureExtensions
- (const QGLContext *ctx)
-{
- QGLMultiTextureExtensions *extn = qt_multitexture_funcs()->value(ctx);
- if (!(extn->multiTextureResolved)) {
- extn->multiTextureResolved = true;
- if (!extn->clientActiveTexture) {
- extn->clientActiveTexture = (q_PFNGLCLIENTACTIVETEXTUREPROC)
- ctx->getProcAddress(QLatin1String("glClientActiveTexture"));
- }
- if (!extn->clientActiveTexture) {
- extn->clientActiveTexture = (q_PFNGLCLIENTACTIVETEXTUREPROC)
- ctx->getProcAddress(QLatin1String("glClientActiveTextureARB"));
- }
- }
- return extn;
-}
-
-void qt_gl_ClientActiveTexture(GLenum texture)
-{
- const QGLContext *ctx = QGLContext::currentContext();
- if (!ctx)
- return;
- QGLMultiTextureExtensions *extn = resolveMultiTextureExtensions(ctx);
- if (extn->clientActiveTexture)
- extn->clientActiveTexture(texture);
-}
-
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qglext_p.h b/src/gui/extern/Qt3D/painting/qglext_p.h
deleted file mode 100644
index eab5930466c5bf14dc91f129f5097ddd95fab415..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglext_p.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLEXT_P_H
-#define QGLEXT_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtOpenGL/qgl.h>
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-// Provide some useful OpenGL extension definitions.
-
-#if !defined(QT_OPENGL_ES)
-
-extern void Q_QT3D_EXPORT qt_gl_ClientActiveTexture(GLenum texture);
-
-#elif !defined(QT_OPENGL_ES_2)
-
-#define qt_gl_ClientActiveTexture glClientActiveTexture
-
-#endif
-
-class QGLExtensionChecker
-{
-public:
- QGLExtensionChecker(const char *str)
- : gl_extensions(str), gl_extensions_length(qstrlen(str))
- {}
-
- bool match(const char *str) {
- int str_length = qstrlen(str);
- const char *extensions = gl_extensions;
- int extensions_length = gl_extensions_length;
-
- while (1) {
- // the total length that needs to be matched is the str_length +
- // the space character that terminates the extension name
- if (extensions_length < str_length + 1)
- return false;
- if (qstrncmp(extensions, str, str_length) == 0 && extensions[str_length] == ' ')
- return true;
-
- int split_pos = 0;
- while (split_pos < extensions_length && extensions[split_pos] != ' ')
- ++split_pos;
- ++split_pos; // added for the terminating space character
- extensions += split_pos;
- extensions_length -= split_pos;
- }
- return false;
- }
-
-private:
- const char *gl_extensions;
- int gl_extensions_length;
-};
-
-// Copy of some definitions from <QtOpenGL/private/qgl_p.h> so that
-// we can avoid a direct dependency upon private headers in Qt.
-
-#if QT_VERSION >= 0x040800
-
-class QGLContextGroup;
-
-#if !defined(QGL_P_H)
-
-class Q_OPENGL_EXPORT QGLContextGroupResourceBase
-{
-public:
- QGLContextGroupResourceBase();
- virtual ~QGLContextGroupResourceBase();
- void insert(const QGLContext *context, void *value);
- void *value(const QGLContext *context);
- void cleanup(const QGLContext *context, void *value);
- virtual void freeResource(void *value) = 0;
- virtual void contextDeleted(const QGLContext *) {}
-
-protected:
- QList<QGLContextGroup *> m_groups;
-
-private:
- QAtomicInt active;
-};
-
-#endif
-
-template <class T>
-class QGLResource : public QGLContextGroupResourceBase
-{
-public:
- T *value(const QGLContext *context) {
- T *resource = reinterpret_cast<T *>(QGLContextGroupResourceBase::value(context));
- if (!resource) {
- resource = new T(context);
- insert(context, resource);
- }
- return resource;
- }
-
-protected:
- void freeResource(void *resource) {
- delete reinterpret_cast<T *>(resource);
- }
-};
-
-#else
-
-#if !defined(QGL_P_H)
-
-class Q_OPENGL_EXPORT QGLContextResource
-{
-public:
- typedef void (*FreeFunc)(void *);
- QGLContextResource(FreeFunc f);
- ~QGLContextResource();
- void insert(const QGLContext *key, void *value);
- void *value(const QGLContext *key);
- void cleanup(const QGLContext *ctx, void *value);
-private:
- FreeFunc free;
- QAtomicInt active;
-};
-
-#endif
-
-template <class T>
-class QGLResource : public QGLContextResource
-{
-public:
- static void freeResource(void *resource) {
- delete reinterpret_cast<T *>(resource);
- }
-
- QGLResource() : QGLContextResource(freeResource) {}
-
- T *value(const QGLContext *context) {
- T *resource = reinterpret_cast<T *>(QGLContextResource::value(context));
- if (!resource) {
- resource = new T(context);
- insert(context, resource);
- }
- return resource;
- }
-};
-
-#endif
-
-#if !defined(QGL_P_H) && !defined(Q_MOC_RUN)
-
-class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
-{
-
-public:
- QGLSignalProxy() : QObject() {}
- void emitAboutToDestroyContext(const QGLContext *context) {
- emit aboutToDestroyContext(context);
- }
- static QGLSignalProxy *instance();
-Q_SIGNALS:
- void aboutToDestroyContext(const QGLContext *context);
-};
-
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qgllightmodel.cpp b/src/gui/extern/Qt3D/painting/qgllightmodel.cpp
deleted file mode 100644
index 4b7fb89e24685d044d2287bd4a8e4b5ff8da1077..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qgllightmodel.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgllightmodel.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLLightModel
- \brief The QGLLightModel class defines the lighting model to use for the scene.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-*/
-
-/*!
- \qmlclass LightModel QGLLightModel
- \brief The LightModel item defines the lighting model to use for the scene.
- \since 4.8
- \ingroup qt3d::qml3d
-
- \sa Light
-*/
-
-/*!
- \enum QGLLightModel::Model
- This enum defines the type of lighting model to use: one-sided or two-sided.
-
- \value OneSided One-sided lighting, with the front face material used for both front and back faces.
- \value TwoSided Two-sided lighting, with separate front and back face materials.
-*/
-
-/*!
- \enum QGLLightModel::ColorControl
- This enum controls the number of colors to be generated by the lighting computation.
-
- \value SingleColor A single color is generated by the lighting computation.
- \value SeparateSpecularColor A separate specular color computation is
- performed and then summed into the pixel color after texture mapping.
-*/
-
-/*!
- \enum QGLLightModel::ViewerPosition
- This enum defines the position of the viewer for the purposes of lighting calculations.
-
- \value ViewerAtInfinity The viewer is at infinity along the -z axis.
- \value LocalViewer The viewer is at the local origin in eye coordinates.
-*/
-
-class QGLLightModelPrivate
-{
-public:
- QGLLightModelPrivate()
- : model(QGLLightModel::OneSided),
- colorControl(QGLLightModel::SingleColor),
- viewerPosition(QGLLightModel::ViewerAtInfinity)
- {
- ambientSceneColor.setRgbF(0.2, 0.2, 0.2, 1.0);
- }
-
- QGLLightModel::Model model;
- QGLLightModel::ColorControl colorControl;
- QGLLightModel::ViewerPosition viewerPosition;
- QColor ambientSceneColor;
-};
-
-/*!
- Constructs a light model object with default values and attach
- it to \a parent.
-*/
-QGLLightModel::QGLLightModel(QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLLightModelPrivate)
-{
-}
-
-/*!
- Destroys this light model.
-*/
-QGLLightModel::~QGLLightModel()
-{
-}
-
-/*!
- \property QGLLightModel::model
- \brief the lighting model to use, either OneSided or TwoSided.
- The default is OneSided.
-
- \sa modelChanged()
-*/
-
-/*!
- \qmlproperty enumeration LightModel::model
- The lighting model to use, either OneSided or TwoSided.
- The default is OneSided.
-*/
-
-QGLLightModel::Model QGLLightModel::model() const
-{
- Q_D(const QGLLightModel);
- return d->model;
-}
-
-void QGLLightModel::setModel(QGLLightModel::Model value)
-{
- Q_D(QGLLightModel);
- if (d->model != value) {
- d->model = value;
- emit modelChanged();
- emit lightModelChanged();
- }
-}
-
-/*!
- \property QGLLightModel::colorControl
- \brief the color control mode, either SingleColor or
- SeparateSpecularColor. The default value is SingleColor.
-
- If SingleColor is specified, then a single color is calculated
- by the lighting computation for a vertex. If SeparateSpecularColor
- is specified, then a separate specular color computation is
- performed and then summed into the pixel color after texture mapping.
-
- \sa colorControlChanged()
-*/
-
-/*!
- \qmlproperty enumeration LightModel::colorControl
- The color control mode, either SingleColor or
- SeparateSpecularColor. The default value is SingleColor.
-
- If SingleColor is specified, then a single color is calculated
- by the lighting computation for a vertex. If SeparateSpecularColor
- is specified, then a separate specular color computation is
- performed and then summed into the pixel color after texture mapping.
-*/
-
-QGLLightModel::ColorControl QGLLightModel::colorControl() const
-{
- Q_D(const QGLLightModel);
- return d->colorControl;
-}
-
-void QGLLightModel::setColorControl(QGLLightModel::ColorControl value)
-{
- Q_D(QGLLightModel);
- if (d->colorControl != value) {
- d->colorControl = value;
- emit colorControlChanged();
- emit lightModelChanged();
- }
-}
-
-/*!
- \property QGLLightModel::viewerPosition
- \brief the viewer position, either ViewerAtInfinity or LocalViewer.
- The default value is ViewerAtInfinity.
-
- \sa viewerPositionChanged()
-*/
-
-/*!
- \qmlproperty enumeration LightModel::viewerPosition
- The viewer position, either ViewerAtInfinity or LocalViewer.
- The default value is ViewerAtInfinity.
-*/
-
-QGLLightModel::ViewerPosition QGLLightModel::viewerPosition() const
-{
- Q_D(const QGLLightModel);
- return d->viewerPosition;
-}
-
-void QGLLightModel::setViewerPosition(QGLLightModel::ViewerPosition value)
-{
- Q_D(QGLLightModel);
- if (d->viewerPosition != value) {
- d->viewerPosition = value;
- emit viewerPositionChanged();
- emit lightModelChanged();
- }
-}
-
-/*!
- \property QGLLightModel::ambientSceneColor
- \brief the ambient color of the entire scene. The default value
- is (0.2, 0.2, 0.2, 1.0).
-
- \sa ambientSceneColorChanged()
-*/
-
-/*!
- \qmlproperty color LightModel::ambientSceneColor
- The ambient color of the entire scene. The default value
- is (0.2, 0.2, 0.2, 1.0).
-*/
-
-QColor QGLLightModel::ambientSceneColor() const
-{
- Q_D(const QGLLightModel);
- return d->ambientSceneColor;
-}
-
-void QGLLightModel::setAmbientSceneColor(const QColor& value)
-{
- Q_D(QGLLightModel);
- if (d->ambientSceneColor != value) {
- d->ambientSceneColor = value;
- emit ambientSceneColorChanged();
- emit lightModelChanged();
- }
-}
-
-/*!
- \fn void QGLLightModel::modelChanged()
-
- This signal is emitted when model() changes.
-
- \sa model(), lightModelChanged()
-*/
-
-/*!
- \fn void QGLLightModel::colorControlChanged()
-
- This signal is emitted when colorControl() changes.
-
- \sa colorControl(), lightModelChanged()
-*/
-
-/*!
- \fn void QGLLightModel::viewerPositionChanged()
-
- This signal is emitted when viewerPosition() changes.
-
- \sa viewerPosition(), lightModelChanged()
-*/
-
-/*!
- \fn void QGLLightModel::ambientSceneColorChanged()
-
- This signal is emitted when ambientSceneColor() changes.
-
- \sa ambientSceneColor(), lightModelChanged()
-*/
-
-/*!
- \fn void QGLLightModel::lightModelChanged()
-
- This signal is emitted when one of model(), colorControl(),
- viewerPosition(), or ambientSceneColor() changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qgllightmodel.h b/src/gui/extern/Qt3D/painting/qgllightmodel.h
deleted file mode 100644
index e591d1b0c109ff58df806c5f78001c11369daa2e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qgllightmodel.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLLIGHTMODEL_H
-#define QGLLIGHTMODEL_H
-
-#include "qt3dglobal.h"
-#include <QtCore/qobject.h>
-#include <QtGui/qcolor.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLLightModelPrivate;
-
-class Q_QT3D_EXPORT QGLLightModel : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLLightModel)
- Q_ENUMS(Model)
- Q_ENUMS(ColorControl)
- Q_ENUMS(ViewerPosition)
- Q_PROPERTY(Model model READ model WRITE setModel NOTIFY modelChanged)
- Q_PROPERTY(ColorControl colorControl READ colorControl WRITE setColorControl NOTIFY colorControlChanged)
- Q_PROPERTY(ViewerPosition viewerPosition READ viewerPosition WRITE setViewerPosition NOTIFY viewerPositionChanged)
- Q_PROPERTY(QColor ambientSceneColor READ ambientSceneColor WRITE setAmbientSceneColor NOTIFY ambientSceneColorChanged)
-public:
- explicit QGLLightModel(QObject *parent = 0);
- ~QGLLightModel();
-
- enum Model
- {
- OneSided,
- TwoSided
- };
-
- enum ColorControl
- {
- SingleColor,
- SeparateSpecularColor
- };
-
- enum ViewerPosition
- {
- ViewerAtInfinity,
- LocalViewer
- };
-
- QGLLightModel::Model model() const;
- void setModel(QGLLightModel::Model value);
-
- QGLLightModel::ColorControl colorControl() const;
- void setColorControl(QGLLightModel::ColorControl value);
-
- QGLLightModel::ViewerPosition viewerPosition() const;
- void setViewerPosition(QGLLightModel::ViewerPosition value);
-
- QColor ambientSceneColor() const;
- void setAmbientSceneColor(const QColor& value);
-
-Q_SIGNALS:
- void modelChanged();
- void colorControlChanged();
- void viewerPositionChanged();
- void ambientSceneColorChanged();
- void lightModelChanged();
-
-private:
- Q_DISABLE_COPY(QGLLightModel)
-
- QScopedPointer<QGLLightModelPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qgllightparameters.cpp b/src/gui/extern/Qt3D/painting/qgllightparameters.cpp
deleted file mode 100644
index 500b7ed2d358ce22f6825a176d782be6bf7578ca..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qgllightparameters.cpp
+++ /dev/null
@@ -1,828 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgllightparameters.h"
-#include <QtCore/qmath.h>
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLLightParameters
- \brief The QGLLightParameters class represents the parameters of a light in a 3D scene.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-
- The functions in this class are a convenience wrapper for the OpenGL enumerations
- which control each light source in a 3D scene. For the general ambient light in a
- scene, not from a source refer to QGLLightModel.
-
- The ambient, diffuse and specular components of the light can be controlled for by
- colour, and are set by the following functions:
- \list
- \o setAmbientColor()
- \o setDiffuseColor()
- \o setSpecularColor()
- \endlist
- Other than changing intensity by using darker color values, see below for how to
- change the intensity of the light with distance from the lit object.
-
- Light sources are of two types, directional and positional, described by the
- enumeration QGLLightParameters::LightType. By default a light source is directional.
-
- A directional light source is infinitely distant, such that its rays are all
- parallel, to a direction \bold vector. This vector is set by the setDirection()
- function. If the light source is not directional when setDirection() is called, its
- type is changed to Directional. Directional light sources model real world light
- sources like the sun. Such light sources are not located at any particular point
- and affect the scene evenly.
-
- In the OpenGL model-view, a directional light is represented by a 4d vector, with
- the 4th value, \c w, set to 0.0f. This means that the spatial data of the light
- is not changed during certain transformations, for example translation.
- See \l {3D Math Basis} for a fuller explanation of this.
-
- Calling the setPosition() function defines the light source to be located at a given
- \bold point, a finite distance from the lit object. If the light source is not
- positional when this function is called its type is changed to Positional.
-
- A positional light source models a real world lamp, such as a light-bulb or
- car headlight. Since it is a finite distance from the lit object the rays diverge
- and lighting calculations are thus more complex.
-
- In OpenGL the light has its spatial data \c w value set to 1.0f, resulting in the
- lights position being changed along with other objects in the scene by transformations
- such as translation. See \l {3D Math Basis} for more.
-
- Positional lights are by default point sources, like the light-bulb where light
- radiates in all directions. Calling the spotAngle() function sets an angle to
- restrict the light from a positional source to a cone like the car headlight. This
- makes the light behave like a spotlight, where objects outside of the cone of the
- light do not receive any light from that source.
-
- The spotlight may be further specified by its spotExponent() which dictates the
- behaviour of the cutoff at the lighting cone; and by the attenuation functions
- which are the terms in the following equation:
- \image attenuation.png
- here \c d is the distance of the light from the lit object, and A is the attenuation
- factor which is a multiplier of the light source, determining its intensity at the
- lit object. The terms in the denominator are:
- \list
- \o constantAttenuation() - default 1.0
- \raw HTML
- k<sub>c</sub>
- \endraw
- \o linearAttenuation() - default 0.0
- \raw HTML
- k<sub>l</sub>
- \endraw
- \o quadraticAttenuation() - default 0.0
- \raw HTML
- k<sub>q</sub>
- \endraw
- \endlist
- When these terms are large the light contributed by the source becomes much weaker
- with distance from the object.
-*/
-
-/*!
- \qmlclass Light QGLLightParameters
- \brief The Light item represents the parameters of a light in a 3D scene.
- \since 4.8
- \ingroup qt3d::qml3d
-
- \sa LightModel
-*/
-
-class QGLLightParametersPrivate
-{
-public:
- QGLLightParametersPrivate() :
- type(QGLLightParameters::Directional),
- position(0.0f, 0.0f, 1.0f),
- ambientColor(0, 0, 0, 255),
- diffuseColor(255, 255, 255, 255),
- specularColor(255, 255, 255, 255),
- spotDirection(0.0f, 0.0f, -1.0f),
- spotExponent(0.0f),
- spotAngle(180.0f),
- spotCosAngle(-1.0f),
- constantAttenuation(1.0f),
- linearAttenuation(0.0f),
- quadraticAttenuation(0.0f)
- {
- }
-
- QGLLightParameters::LightType type;
- QVector3D position;
- QColor ambientColor;
- QColor diffuseColor;
- QColor specularColor;
- QVector3D spotDirection;
- qreal spotExponent;
- qreal spotAngle;
- qreal spotCosAngle;
- qreal constantAttenuation;
- qreal linearAttenuation;
- qreal quadraticAttenuation;
-};
-
-
-/*!
- \enum QGLLightParameters::LightType
- This enum defines the possible types of light.
-
- \value Directional The default. Directional lights are infinitely
- distant from the lit object, and its rays are parallel to a
- direction vector. Use setDirection() to make a light Directional.
- \value Positional Positional lights are a finite distance from the
- lit object. Complex lighting with spot-lights, and attenuation
- are enabled with Positional lighting. Use setPosition() to
- make a light Positional.
-*/
-
-/*!
- Constructs a new light parameters object with default values
- and attaches it to \a parent.
-*/
-QGLLightParameters::QGLLightParameters(QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLLightParametersPrivate)
-{
-}
-
-/*!
- Destroys this light parameters object.
-*/
-QGLLightParameters::~QGLLightParameters()
-{
-}
-
-/*!
- \property QGLLightParameters::type
- \brief the type of this light; Positional or Directional.
-
- \sa position(), direction()
-*/
-
-/*!
- \qmlproperty enumeration Light::type
- The type of this light; Positional or Directional. The default
- is Directional.
-
- \sa position, direction
-*/
-
-QGLLightParameters::LightType QGLLightParameters::type() const
-{
- Q_D(const QGLLightParameters);
- return d->type;
-}
-
-/*!
- \property QGLLightParameters::position
- \brief the position of this light if it is Positional; or a null
- QVector3D if it is Directional. By default, the light is Directional.
-
- For a Positional light, the return value is the location in model space
- of the light, at some finite distance from the origin. The value is
- transformed by the model-view transformation when the light
- parameters are applied.
-
- When the light is Positional OpenGL will obey other parameters relating
- to the light's position, such as attenuation and spot angle.
-
- Setting the position converts the light from Directional to Positional.
-
- \sa direction(), type(), positionChanged()
-*/
-
-/*!
- \qmlproperty vector3D Light::position
- The position of this light if it is Positional; or a zero vector
- if it is Directional. By default, the light is Directional.
-
- For a Positional light, the return value is the location in model space
- of the light, at some finite distance from the origin. The value is
- transformed by the model-view transformation when the light
- parameters are applied.
-
- When the light is Positional OpenGL will obey other parameters relating
- to the light's position, such as attenuation and spot angle.
-
- Setting the position converts the light from Directional to Positional.
-
- \sa direction, type
-*/
-
-QVector3D QGLLightParameters::position() const
-{
- Q_D(const QGLLightParameters);
- if (d->type == Positional)
- return d->position;
- else
- return QVector3D();
-}
-
-void QGLLightParameters::setPosition(const QVector3D& point)
-{
- Q_D(QGLLightParameters);
- if (d->type == Positional) {
- if (d->position != point) {
- // Only the position() has changed.
- d->position = point;
- emit positionChanged();
- emit lightChanged();
- }
- } else {
- // Both the position() and direction() are changed.
- d->type = Positional;
- d->position = point;
- emit positionChanged();
- emit directionChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::direction
- \brief the direction of this light if it is Directional; or a null
- QVector3D if it is Positional. By default, the light is Directional.
-
- For a Directional light, the return value is the direction vector of
- an infinitely distant directional light, like the sun.
-
- The default value is (0, 0, 1), for a directional light pointing along
- the positive z-axis.
-
- OpenGL will ignore other parameters such as attenuation and spot angle
- when this value is set, since a directional light has no location.
- In order to set the direction of a spot light, use the setSpotDirection()
- function.
-
- Setting the direction converts the light from Positional to Directional.
-
- \sa position(), type(), directionChanged()
-*/
-
-/*!
- \qmlproperty vector3D Light::direction
- The direction of this light if it is Directional; or a zero vector
- if it is Positional. By default, the light is Directional.
-
- For a Directional light, the return value is the direction vector of
- an infinitely distant directional light, like the sun.
-
- The default value is (0, 0, 1), for a directional light pointing along
- the positive z-axis.
-
- OpenGL will ignore other parameters such as attenuation and spot angle
- when this value is set, since a directional light has no location.
- In order to set the direction of a spot light, use the setSpotDirection()
- function.
-
- Setting the direction converts the light from Positional to Directional.
-
- \sa position, type
-*/
-
-QVector3D QGLLightParameters::direction() const
-{
- Q_D(const QGLLightParameters);
- if (d->type == Directional)
- return d->position;
- else
- return QVector3D();
-}
-
-void QGLLightParameters::setDirection(const QVector3D& value)
-{
- Q_D(QGLLightParameters);
- if (d->type == Directional) {
- if (d->position != value) {
- // Only the direction() has changed.
- d->position = value;
- emit directionChanged();
- emit lightChanged();
- }
- } else {
- // Both the position() and direction() are changed.
- d->type = Directional;
- d->position = value;
- emit positionChanged();
- emit directionChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::ambientColor
- \brief the ambient color of this light. The default value is black.
-
- \sa diffuseColor(), specularColor(), ambientColorChanged()
-*/
-
-/*!
- \qmlproperty color Light::ambientColor
- The ambient color of this light. The default value is black.
-
- \sa diffuseColor, specularColor
-*/
-
-QColor QGLLightParameters::ambientColor() const
-{
- Q_D(const QGLLightParameters);
- return d->ambientColor;
-}
-
-void QGLLightParameters::setAmbientColor(const QColor& value)
-{
- Q_D(QGLLightParameters);
- if (d->ambientColor != value) {
- d->ambientColor = value;
- emit ambientColorChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::diffuseColor
- \brief the diffuse color of this light. The default value is white.
-
- \sa ambientColor(), specularColor(), diffuseColorChanged()
-*/
-
-/*!
- \qmlproperty color Light::diffuseColor
- The diffuse color of this light. The default value is white.
-
- \sa ambientColor, specularColor
-*/
-QColor QGLLightParameters::diffuseColor() const
-{
- Q_D(const QGLLightParameters);
- return d->diffuseColor;
-}
-
-void QGLLightParameters::setDiffuseColor(const QColor& value)
-{
- Q_D(QGLLightParameters);
- if (d->diffuseColor != value) {
- d->diffuseColor = value;
- emit diffuseColorChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::specularColor
- \brief the specular color of this light. The default value is white.
-
- \sa ambientColor(), diffuseColor(), specularColorChanged()
-*/
-
-/*!
- \qmlproperty color Light::specularColor
- The specular color of this light. The default value is white.
-
- \sa ambientColor, diffuseColor
-*/
-
-QColor QGLLightParameters::specularColor() const
-{
- Q_D(const QGLLightParameters);
- return d->specularColor;
-}
-
-void QGLLightParameters::setSpecularColor(const QColor& value)
-{
- Q_D(QGLLightParameters);
- if (d->specularColor != value) {
- d->specularColor = value;
- emit specularColorChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::spotDirection
- \brief the direction that a spot-light is shining in.
-
- A spotlight is a positional light that has a value other than the default
- for spot angle. The default value is (0, 0, -1).
-
- This parameter has no effect on a Directional light.
-
- \sa spotExponent(), spotDirectionChanged()
-*/
-
-/*!
- \qmlproperty vector3D Light::spotDirection
- The direction that a spot-light is shining in.
-
- A spotlight is a positional light that has a value other than the default
- for spot angle. The default value is (0, 0, -1).
-
- This parameter has no effect on a Directional light.
-
- \sa spotExponent
-*/
-QVector3D QGLLightParameters::spotDirection() const
-{
- Q_D(const QGLLightParameters);
- return d->spotDirection;
-}
-
-void QGLLightParameters::setSpotDirection(const QVector3D& vector)
-{
- Q_D(QGLLightParameters);
- if (d->spotDirection != vector) {
- d->spotDirection = vector;
- emit spotDirectionChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::spotExponent
- \brief the exponent value between 0 and 128 that indicates the
- intensity distribution of a spot-light. The default value is 0,
- indicating uniform light distribution.
-
- This parameter has no effect on a Directional light.
-
- \sa spotAngle(), setPosition(), spotExponentChanged()
-*/
-
-/*!
- \qmlproperty real Light::spotExponent
- The exponent value between 0 and 128 that indicates the
- intensity distribution of a spot-light. The default value is 0,
- indicating uniform light distribution.
-
- This parameter has no effect on a Directional light.
-
- \sa spotAngle, position
-*/
-
-qreal QGLLightParameters::spotExponent() const
-{
- Q_D(const QGLLightParameters);
- return d->spotExponent;
-}
-
-void QGLLightParameters::setSpotExponent(qreal value)
-{
- Q_D(QGLLightParameters);
- if (d->spotExponent != value) {
- d->spotExponent = value;
- emit spotExponentChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::spotAngle
- \brief the angle over which light is spread from this light.
- It should be between 0 and 90 for spot lights, and 180 for
- uniform light distribution from a remote light source.
- The default value is 180.
-
- This parameter has no effect on a Directional light.
-
- \sa spotCosAngle(), spotAngleChanged()
-*/
-
-/*!
- \qmlproperty real Light::spotAngle
- The angle over which light is spread from this light.
- It should be between 0 and 90 for spot lights, and 180 for
- uniform light distribution from a remote light source.
- The default value is 180.
-
- This parameter has no effect on a Directional light.
-*/
-
-qreal QGLLightParameters::spotAngle() const
-{
- Q_D(const QGLLightParameters);
- return d->spotAngle;
-}
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-void QGLLightParameters::setSpotAngle(qreal value)
-{
- Q_D(QGLLightParameters);
- if (d->spotAngle != value) {
- d->spotAngle = value;
- if (value != 180.0f)
- d->spotCosAngle = qCos(value * M_PI / 180.0f);
- else
- d->spotCosAngle = -1.0f;
- emit spotAngleChanged();
- emit lightChanged();
- }
-}
-
-/*!
- Returns the cosine of spotAngle(), or -1 if spotAngle() is 180.
-
- The cosine of spotAngle() is useful in lighting algorithms.
- This function returns a cached copy of the cosine so that it
- does not need to be computed every time the lighting parameters
- are read.
-
- \sa spotAngle()
-*/
-qreal QGLLightParameters::spotCosAngle() const
-{
- Q_D(const QGLLightParameters);
- return d->spotCosAngle;
-}
-
-/*!
- \property QGLLightParameters::constantAttenuation
- \brief the constant light attenuation factor. The default value is 1.
-
- This parameter has no effect on a Directional light.
-
- \sa linearAttenuation(), quadraticAttenuation()
- \sa constantAttenuationChanged()
-*/
-
-/*!
- \qmlproperty real Light::constantAttenuation
- The constant light attenuation factor. The default value is 1.
-
- This parameter has no effect on a Directional light.
-
- \sa linearAttenuation, quadraticAttenuation
-*/
-
-qreal QGLLightParameters::constantAttenuation() const
-{
- Q_D(const QGLLightParameters);
- return d->constantAttenuation;
-}
-
-void QGLLightParameters::setConstantAttenuation(qreal value)
-{
- Q_D(QGLLightParameters);
- if (d->constantAttenuation != value) {
- d->constantAttenuation = value;
- emit constantAttenuationChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::linearAttenuation
- \brief the linear light attenuation factor. The default value is 0.
-
- This parameter has no effect on a Directional light.
-
- \sa constantAttenuation(), quadraticAttenuation()
- \sa linearAttenuationChanged()
-*/
-
-/*!
- \qmlproperty real Light::linearAttenuation
- The linear light attenuation factor. The default value is 0.
-
- This parameter has no effect on a Directional light.
-
- \sa constantAttenuation, quadraticAttenuation
-*/
-
-qreal QGLLightParameters::linearAttenuation() const
-{
- Q_D(const QGLLightParameters);
- return d->linearAttenuation;
-}
-
-void QGLLightParameters::setLinearAttenuation(qreal value)
-{
- Q_D(QGLLightParameters);
- if (d->linearAttenuation != value) {
- d->linearAttenuation = value;
- emit linearAttenuationChanged();
- emit lightChanged();
- }
-}
-
-/*!
- \property QGLLightParameters::quadraticAttenuation
- \brief the quadratic light attenuation factor. The default value is 0.
-
- This parameter has no effect on a Directional light.
-
- \sa constantAttenuation(), linearAttenuation()
- \sa quadraticAttenuationChanged()
-*/
-
-/*!
- \qmlproperty real Light::quadraticAttenuation
- The quadratic light attenuation factor. The default value is 0.
-
- This parameter has no effect on a Directional light.
-
- \sa constantAttenuation, linearAttenuation
-*/
-
-qreal QGLLightParameters::quadraticAttenuation() const
-{
- Q_D(const QGLLightParameters);
- return d->quadraticAttenuation;
-}
-
-void QGLLightParameters::setQuadraticAttenuation(qreal value)
-{
- Q_D(QGLLightParameters);
- if (d->quadraticAttenuation != value) {
- d->quadraticAttenuation = value;
- emit quadraticAttenuationChanged();
- emit lightChanged();
- }
-}
-
-/*!
- Returns the position of this light after transforming it from
- world co-ordinates to eye co-ordinates using \a transform.
-
- If the light is Directional, then direction() will be transformed,
- after setting the w co-ordinate to 0. If the light is Positional,
- then position() will be transformed after setting the w co-ordinate
- to 1.
-
- The returned result is suitable to be applied to the GL_POSITION
- property of \c{glLight()}, assuming that the modelview transformation
- in the GL context is set to the identity.
-
- \sa eyeSpotDirection()
-*/
-QVector4D QGLLightParameters::eyePosition(const QMatrix4x4& transform) const
-{
- Q_D(const QGLLightParameters);
- if (d->type == Directional)
- return transform * QVector4D(d->position, 0.0f);
- else
- return transform * QVector4D(d->position, 1.0f);
-}
-
-/*!
- Returns the spotDirection() for this light after transforming it
- from world co-ordinates to eye co-ordinates using the top-left
- 3x3 submatrix within \a transform.
-
- The returned result is suitable to be applied to the GL_SPOT_DIRECTION
- property of \c{glLight()}, assuming that the modelview transformation
- in the GL context is set to the identity.
-
- \sa eyePosition()
-*/
-QVector3D QGLLightParameters::eyeSpotDirection
- (const QMatrix4x4& transform) const
-{
- Q_D(const QGLLightParameters);
- return transform.mapVector(d->spotDirection);
-}
-
-/*!
- \fn void QGLLightParameters::positionChanged()
-
- This signal is emitted when position() changes, or when the type()
- changes between Directional and Positional.
-
- \sa position(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::directionChanged()
-
- This signal is emitted when direction() changes, or when the type()
- changes between Directional and Positional.
-
- \sa direction(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::ambientColorChanged()
-
- This signal is emitted when ambientColor() changes.
-
- \sa ambientColor(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::diffuseColorChanged()
-
- This signal is emitted when diffuseColor() changes.
-
- \sa diffuseColor(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::specularColorChanged()
-
- This signal is emitted when specularColor() changes.
-
- \sa specularColor(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::spotDirectionChanged()
-
- This signal is emitted when spotDirection() changes.
-
- \sa spotDirection(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::spotExponentChanged()
-
- This signal is emitted when spotExponent() changes.
-
- \sa spotExponent(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::spotAngleChanged()
-
- This signal is emitted when spotAngle() changes.
-
- \sa spotAngle(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::constantAttenuationChanged()
-
- This signal is emitted when constantAttenuation() changes.
-
- \sa constantAttenuation(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::linearAttenuationChanged()
-
- This signal is emitted when linearAttenuation() changes.
-
- \sa linearAttenuation(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::quadraticAttenuationChanged()
-
- This signal is emitted when quadraticAttenuation() changes.
-
- \sa quadraticAttenuation(), lightChanged()
-*/
-
-/*!
- \fn void QGLLightParameters::lightChanged()
-
- This signal is emitted when any of the properties on the light changes.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qgllightparameters.h b/src/gui/extern/Qt3D/painting/qgllightparameters.h
deleted file mode 100644
index ca9f6da6ceb6e5c4fbd23a09a369402aa7fddbff..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qgllightparameters.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLLIGHTPARAMETERS_H
-#define QGLLIGHTPARAMETERS_H
-
-#include "qt3dglobal.h"
-#include <QtCore/qobject.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLLightParametersPrivate;
-class QMatrix4x4;
-
-class Q_QT3D_EXPORT QGLLightParameters : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLLightParameters)
- Q_ENUMS(LightType)
- Q_PROPERTY(LightType type READ type)
- Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)
- Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
- Q_PROPERTY(QColor ambientColor READ ambientColor WRITE setAmbientColor NOTIFY ambientColorChanged)
- Q_PROPERTY(QColor diffuseColor READ diffuseColor WRITE setDiffuseColor NOTIFY diffuseColorChanged)
- Q_PROPERTY(QColor specularColor READ specularColor WRITE setSpecularColor NOTIFY specularColorChanged)
- Q_PROPERTY(QVector3D spotDirection READ spotDirection WRITE setSpotDirection NOTIFY spotDirectionChanged)
- Q_PROPERTY(qreal spotExponent READ spotExponent WRITE setSpotExponent NOTIFY spotExponentChanged)
- Q_PROPERTY(qreal spotAngle READ spotAngle WRITE setSpotAngle NOTIFY spotAngleChanged)
- Q_PROPERTY(qreal constantAttenuation READ constantAttenuation WRITE setConstantAttenuation NOTIFY constantAttenuationChanged)
- Q_PROPERTY(qreal linearAttenuation READ linearAttenuation WRITE setLinearAttenuation NOTIFY linearAttenuationChanged)
- Q_PROPERTY(qreal quadraticAttenuation READ quadraticAttenuation WRITE setQuadraticAttenuation NOTIFY quadraticAttenuationChanged)
-public:
- enum LightType {
- Directional,
- Positional
- };
-
- QGLLightParameters(QObject *parent = 0);
- ~QGLLightParameters();
-
- QGLLightParameters::LightType type() const;
-
- QVector3D position() const;
- void setPosition(const QVector3D& value);
-
- QVector3D direction() const;
- void setDirection(const QVector3D& value);
-
- QColor ambientColor() const;
- void setAmbientColor(const QColor& value);
-
- QColor diffuseColor() const;
- void setDiffuseColor(const QColor& value);
-
- QColor specularColor() const;
- void setSpecularColor(const QColor& value);
-
- QVector3D spotDirection() const;
- void setSpotDirection(const QVector3D& value);
-
- qreal spotExponent() const;
- void setSpotExponent(qreal value);
-
- qreal spotAngle() const;
- void setSpotAngle(qreal value);
-
- qreal spotCosAngle() const;
-
- qreal constantAttenuation() const;
- void setConstantAttenuation(qreal value);
-
- qreal linearAttenuation() const;
- void setLinearAttenuation(qreal value);
-
- qreal quadraticAttenuation() const;
- void setQuadraticAttenuation(qreal value);
-
- QVector4D eyePosition(const QMatrix4x4& transform) const;
- QVector3D eyeSpotDirection(const QMatrix4x4& transform) const;
-
-Q_SIGNALS:
- void positionChanged();
- void directionChanged();
- void ambientColorChanged();
- void diffuseColorChanged();
- void specularColorChanged();
- void spotDirectionChanged();
- void spotExponentChanged();
- void spotAngleChanged();
- void constantAttenuationChanged();
- void linearAttenuationChanged();
- void quadraticAttenuationChanged();
- void lightChanged();
-
-private:
- Q_DISABLE_COPY(QGLLightParameters)
-
- QScopedPointer<QGLLightParametersPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qglpainter.cpp b/src/gui/extern/Qt3D/painting/qglpainter.cpp
deleted file mode 100644
index eade9eac8f5b63b92bc7450d6e15f23534dafdf8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglpainter.cpp
+++ /dev/null
@@ -1,2327 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglpainter.h"
-#include "qglpainter_p.h"
-#include "qglabstracteffect.h"
-#include "qglext_p.h"
-#include <QtOpenGL/qglpixelbuffer.h>
-#include <QtOpenGL/qglshaderprogram.h>
-#include <QtOpenGL/qglframebufferobject.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qpaintengine.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qmap.h>
-#if !defined(QT_NO_THREAD)
-#include <QtCore/qthreadstorage.h>
-#endif
-#include "qglflatcoloreffect_p.h"
-#include "qglflattextureeffect_p.h"
-#include "qgllitmaterialeffect_p.h"
-#include "qgllittextureeffect_p.h"
-#include "qglpickcolors_p.h"
-#include "qgltexture2d.h"
-#include "qgltexturecube.h"
-#include "qgeometrydata.h"
-#include "qglvertexbundle_p.h"
-#include "qmatrix4x4stack_p.h"
-#include "qglwidgetsurface.h"
-#include "qglpixelbuffersurface.h"
-#include "qglpaintersurface_p.h"
-
-#undef glActiveTexture
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLPainter
- \brief The QGLPainter class provides portable API's for rendering into a GL context.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-
- TBD - lots of TBD
-
- All QGLPainter instances on a context share the same context state:
- matrices, effects, vertex attributes, etc. For example, calling
- ortho() on one QGLPainter instance for a context will alter the
- projectionMatrix() as seen by the other QGLPainter instances.
-*/
-
-/*!
- \enum QGLPainter::Update
- This enum defines the values that were changed since the last QGLPainter::update().
-
- \value UpdateColor The color has been updated.
- \value UpdateModelViewMatrix The modelview matrix has been updated.
- \value UpdateProjectionMatrix The projection matrix has been updated.
- \value UpdateMatrices The combination of UpdateModelViewMatrix and
- UpdateProjectionMatrix.
- \value UpdateLights The lights have been updated.
- \value UpdateMaterials The material parameters have been updated.
- \value UpdateViewport The viewport needs to be updated because the
- drawing surface has changed.
- \value UpdateAll All values have been updated. This is specified
- when an effect is activated.
-*/
-
-#define QGLPAINTER_CHECK_PRIVATE() \
- Q_ASSERT_X(d, "QGLPainter", "begin() has not been called or it failed")
-
-QGLPainterPrivate::QGLPainterPrivate()
- : ref(1),
- eye(QGL::NoEye),
- lightModel(0),
- defaultLightModel(0),
- defaultLight(0),
- frontMaterial(0),
- backMaterial(0),
- defaultMaterial(0),
- frontColorMaterial(0),
- backColorMaterial(0),
- viewingCube(QVector3D(-1, -1, -1), QVector3D(1, 1, 1)),
- color(255, 255, 255, 255),
- updates(QGLPainter::UpdateAll),
- pick(0),
- boundVertexBuffer(0),
- boundIndexBuffer(0),
- renderSequencer(0),
- isFixedFunction(true) // Updated by QGLPainter::begin()
-{
- context = 0;
- effect = 0;
- userEffect = 0;
- standardEffect = QGL::FlatColor;
- memset(stdeffects, 0, sizeof(stdeffects));
-}
-
-QGLPainterPrivate::~QGLPainterPrivate()
-{
- delete defaultLightModel;
- delete defaultLight;
- delete defaultMaterial;
- delete frontColorMaterial;
- delete backColorMaterial;
- for (int effect = 0; effect < QGL_MAX_STD_EFFECTS; ++effect)
- delete stdeffects[effect];
- delete pick;
- qDeleteAll(cachedPrograms);
- delete renderSequencer;
-}
-
-QGLPainterPickPrivate::QGLPainterPickPrivate()
-{
- isPicking = false;
- objectPickId = -1;
- pickColorIndex = -1;
- pickColor = 0;
- defaultPickEffect = new QGLFlatColorEffect();
-}
-
-QGLPainterPickPrivate::~QGLPainterPickPrivate()
-{
- delete defaultPickEffect;
-}
-
-#if !defined(QT_NO_THREAD)
-
-// QGLContext's are thread-specific, so QGLPainterPrivateCache should be too.
-
-typedef QThreadStorage<QGLPainterPrivateCache *> QGLPainterPrivateStorage;
-Q_GLOBAL_STATIC(QGLPainterPrivateStorage, painterPrivateStorage)
-static QGLPainterPrivateCache *painterPrivateCache()
-{
- QGLPainterPrivateCache *cache = painterPrivateStorage()->localData();
- if (!cache) {
- cache = new QGLPainterPrivateCache();
- painterPrivateStorage()->setLocalData(cache);
- }
- return cache;
-}
-
-#else
-
-Q_GLOBAL_STATIC(QGLPainterPrivateCache, painterPrivateCache)
-
-#endif
-
-QGLPainterPrivateCache::QGLPainterPrivateCache()
-{
- connect(QGLSignalProxy::instance(),
- SIGNAL(aboutToDestroyContext(const QGLContext *)),
- this,
- SLOT(contextDestroyed(const QGLContext *)));
-}
-
-QGLPainterPrivateCache::~QGLPainterPrivateCache()
-{
-}
-
-QGLPainterPrivate *QGLPainterPrivateCache::fromContext
- (const QGLContext *context)
-{
- QGLPainterPrivate *priv = cache.value(context, 0);
- if (priv)
- return priv;
- priv = new QGLPainterPrivate();
- priv->context = context;
- cache.insert(context, priv);
- return priv;
-}
-
-QGLPainterPrivateCache *QGLPainterPrivateCache::instance()
-{
- return painterPrivateCache();
-}
-
-void QGLPainterPrivateCache::contextDestroyed(const QGLContext *context)
-{
- QGLPainterPrivate *priv = cache.value(context, 0);
- if (priv) {
- priv->context = 0;
- cache.remove(context);
- if (!priv->ref.deref())
- delete priv;
- }
- emit destroyedContext(context);
-}
-
-/*!
- Constructs a new GL painter. Call begin() to attach the
- painter to a GL context.
-
- \sa begin()
-*/
-QGLPainter::QGLPainter()
- : d_ptr(0)
-{
-}
-
-/*!
- Constructs a new GL painter and attaches it to \a context.
- It is not necessary to call begin() after construction.
-
- \sa begin()
-*/
-QGLPainter::QGLPainter(const QGLContext *context)
- : d_ptr(0)
-{
- begin(context);
-}
-
-/*!
- Constructs a new GL painter and attaches it to the GL
- context associated with \a widget. It is not necessary to
- call begin() after construction.
-
- \sa begin(), isActive()
-*/
-QGLPainter::QGLPainter(QGLWidget *widget)
- : d_ptr(0)
-{
- begin(widget);
-}
-
-/*!
- Constructs a new GL painter and attaches it to the GL context associated
- with \a painter. It is assumed that \a painter is the currently
- active painter and that it is associated with the current GL context.
-
- If \a painter is not using an OpenGL paint engine, then isActive()
- will return false; true otherwise.
-
- This constructor is typically used when mixing regular Qt painting
- operations and GL painting operations on a widget that is being
- drawn using the OpenGL graphics system.
-
- \sa begin(), isActive()
-*/
-QGLPainter::QGLPainter(QPainter *painter)
- : d_ptr(0)
-{
- begin(painter);
-}
-
-/*!
- Constructs a new GL painter and attaches it to the GL context associated
- with \a surface.
-
- \sa begin(), isActive()
-*/
-QGLPainter::QGLPainter(QGLAbstractSurface *surface)
- : d_ptr(0)
-{
- begin(surface);
-}
-
-/*!
- Destroys this GL painter.
-*/
-QGLPainter::~QGLPainter()
-{
- end();
-}
-
-/*!
- Begins painting on QGLContext::currentContext(). Returns false
- if there is no GL context current.
-
- \sa end()
-*/
-bool QGLPainter::begin()
-{
- return begin(QGLContext::currentContext());
-}
-
-/*!
- Begins painting on \a context. If painting was already in progress,
- then this function will call end() first. The \a context will be
- made current if it is not already current.
-
- Returns true if painting can begin; false otherwise.
-
- All QGLPainter instances on a context share the same context state:
- matrices, the effect(), vertex attributes, etc. For example,
- calling ortho() on one QGLPainter instance for a context will
- alter the projectionMatrix() as seen by the other QGLPainter instances.
-
- \sa end(), isActive()
-*/
-bool QGLPainter::begin(const QGLContext *context)
-{
- if (!context)
- return false;
- end();
- return begin(context, QGLAbstractSurface::createSurfaceForContext(context));
-}
-
-/*!
- \internal
-*/
-bool QGLPainter::begin
- (const QGLContext *context, QGLAbstractSurface *surface,
- bool destroySurface)
-{
- // If we don't have a context specified, then use the one
- // that the surface just made current.
- if (!context)
- context = QGLContext::currentContext();
-
- // Find the QGLPainterPrivate for the context, or create a new one.
- d_ptr = painterPrivateCache()->fromContext(context);
- d_ptr->ref.ref();
- if (d_ptr->renderSequencer)
- {
- d_ptr->renderSequencer->reset();
- d_ptr->renderSequencer->setPainter(this);
- }
-
- // Activate the main surface for the context.
- QGLAbstractSurface *prevSurface;
- if (d_ptr->surfaceStack.isEmpty()) {
- prevSurface = 0;
- } else {
- // We are starting a nested begin()/end() scope, so switch
- // to the new main surface rather than activate from scratch.
- prevSurface = d_ptr->surfaceStack.last().surface;
- prevSurface->deactivate(surface);
- }
- if (!surface->activate(prevSurface)) {
- if (prevSurface)
- prevSurface->activate(surface);
- if (destroySurface)
- delete surface;
- if (!d_ptr->ref.deref())
- delete d_ptr;
- d_ptr = 0;
- return false;
- }
-
- // Push a main surface descriptor onto the surface stack.
- QGLPainterSurfaceInfo psurf;
- psurf.surface = surface;
- psurf.destroySurface = destroySurface;
- psurf.mainSurface = true;
- d_ptr->surfaceStack.append(psurf);
-
- // Force the matrices to be updated the first time we use them.
- d_ptr->modelViewMatrix.setDirty(true);
- d_ptr->projectionMatrix.setDirty(true);
-
- // Initialize the QOpenGLFunctions parent class.
- initializeGLFunctions(context);
-
- // Determine if the OpenGL implementation is fixed-function or not.
- d_ptr->isFixedFunction = !hasOpenGLFeature(QOpenGLFunctions::Shaders);
- return true;
-}
-
-/*!
- Begins painting on the GL context associated with \a widget.
- Returns false if \a widget is null.
-
- \sa end()
-*/
-bool QGLPainter::begin(QGLWidget *widget)
-{
- if (!widget)
- return false;
- end();
- return begin(widget->context(), new QGLWidgetSurface(widget));
-}
-
-/*!
- Begins painting on the GL context associated with \a painter.
- Returns false if \a painter is not using an OpenGL paint engine.
- It is assumed that \a painter is the currently active painter
- and that it is associated with the current GL context.
-
- This function is typically used when mixing regular Qt painting
- operations and GL painting operations on a widget that is being
- drawn using the OpenGL graphics system.
-
- \sa end()
-*/
-bool QGLPainter::begin(QPainter *painter)
-{
- // Validate that the painting is OpenGL-based.
- if (!painter)
- return false;
- QPaintEngine *engine = painter->paintEngine();
- if (!engine)
- return false;
- if (engine->type() != QPaintEngine::OpenGL &&
- engine->type() != QPaintEngine::OpenGL2)
- return false;
-
- // Begin GL painting operations.
- return begin(0, new QGLPainterSurface(painter));
-}
-
-/*!
- Begins painting to \a surface. Returns false if \a surface is
- null or could not be activated.
-
- \sa end(), QGLAbstractSurface::activate()
-*/
-bool QGLPainter::begin(QGLAbstractSurface *surface)
-{
- if (!surface)
- return false;
- end();
- return begin(0, surface, false);
-}
-
-/*!
- Ends GL painting. Returns true if painting was ended successfully;
- false if this painter was not bound to a GL context.
-
- The GL context that was bound to this painter will not have
- QGLContext::doneCurrent() called on it. It is the responsibility
- of the caller to terminate context operations.
-
- The effect() will be left active in the GL context and will be
- assumed to still be active the next time begin() is called.
- If this assumption doesn't apply, then call disableEffect()
- to disable the effect before calling end().
-
- This function will pop all surfaces from the surface stack,
- and return currentSurface() to null (the default drawing surface).
-
- \sa begin(), isActive(), disableEffect()
-*/
-bool QGLPainter::end()
-{
- Q_D(QGLPainter);
- if (!d)
- return false;
-
- // Unbind the current vertex and index buffers.
- if (d->boundVertexBuffer) {
- QGLBuffer::release(QGLBuffer::VertexBuffer);
- d->boundVertexBuffer = 0;
- }
- if (d->boundIndexBuffer) {
- QGLBuffer::release(QGLBuffer::IndexBuffer);
- d->boundIndexBuffer = 0;
- }
-
- // Pop surfaces from the surface stack until we reach a
- // main surface. Then deactivate the main surface.
- int size = d->surfaceStack.size();
- while (size > 0) {
- --size;
- QGLPainterSurfaceInfo &surf = d->surfaceStack[size];
- if (surf.mainSurface) {
- if (size > 0) {
- // There are still other surfaces on the stack, probably
- // because we are within a nested begin()/end() scope.
- // Re-activate the next surface down in the outer scope.
- QGLPainterSurfaceInfo &nextSurf = d->surfaceStack[size - 1];
- surf.surface->switchTo(nextSurf.surface);
- } else {
- // Last surface on the stack, so deactivate it permanently.
- surf.surface->deactivate();
- }
- if (surf.destroySurface)
- delete surf.surface;
- break;
- } else if (size > 0) {
- surf.surface->deactivate(d->surfaceStack[size - 1].surface);
- }
- }
- d->surfaceStack.resize(size);
-
- // Force a viewport update if we are within a nested begin()/end().
- d->updates |= UpdateViewport;
-
- // Destroy the QGLPainterPrivate if this is the last reference.
- if (!d->ref.deref())
- delete d;
- d_ptr = 0;
- return true;
-}
-
-/*!
- Returns true if this painter is currently bound to a GL context;
- false otherwise.
-
- \sa begin(), end()
-*/
-bool QGLPainter::isActive() const
-{
- return (d_ptr != 0 && d_ptr->context != 0);
-}
-
-/*!
- Returns the GL context that is bound to this painter, or null
- if it is not currently bound.
-*/
-const QGLContext *QGLPainter::context() const
-{
- if (d_ptr)
- return d_ptr->context;
- else
- return 0;
-}
-
-/*!
- Returns true if the underlying OpenGL implementation is OpenGL 1.x
- or OpenGL/ES 1.x and only supports fixed-function OpenGL operations.
- Returns false if the underlying OpenGL implementation is using
- GLSL or GLSL/ES shaders.
-
- If this function returns false, then the built-in effects will
- use shaders and QGLPainter will not update the fixed-function
- matrices in the OpenGL context when update() is called.
- User-supplied effects will need to use shaders also or update
- the fixed-function matrices themselves or call updateFixedFunction().
-
- \sa update(), updateFixedFunction()
-*/
-bool QGLPainter::isFixedFunction() const
-{
-#if defined(QT_OPENGL_ES_2)
- return false;
-#else
- Q_D(const QGLPainter);
- if (d)
- return d->isFixedFunction;
- else
- return true;
-#endif
-}
-
-/*!
- Sets the \a color to use to clear the color buffer when \c{glClear()}
- is called.
-*/
-void QGLPainter::setClearColor(const QColor& color)
-{
- glClearColor(color.redF(), color.greenF(), color.blueF(), color.alphaF());
-}
-
-/*!
- Sets the scissor \a rect for the current drawing surface
- to use when \c{GL_SCISSOR_TEST} is enabled. If \a rect is empty,
- then the scissor will be set to clip away all drawing.
-
- Note that \a rect is in Qt co-ordinates with the origin
- at the top-left of the drawing surface's viewport rectangle.
- If the currentSurface() is an instance of QGLSubsurface,
- then \a rect will be adjusted relative to the subsurface's position.
-
- \sa currentSurface(), QGLAbstractSurface::viewportGL()
-*/
-void QGLPainter::setScissor(const QRect& rect)
-{
- if (!rect.isEmpty()) {
- // Adjust the rectangle by the position of the surface viewport.
- QGLAbstractSurface *surface = currentSurface();
- QRect viewport = surface->viewportGL();
- QRect r(viewport.x() + rect.x(),
- viewport.y() + viewport.height() - (rect.y() + rect.height()),
- rect.width(), rect.height());
- if (!r.isEmpty())
- glScissor(r.x(), r.y(), r.width(), r.height());
- else
- glScissor(0, 0, 0, 0);
- } else {
- glScissor(0, 0, 0, 0);
- }
-}
-
-/*!
- Returns a reference to the projection matrix stack.
-
- It is recommended that setCamera() be used to set the projection
- matrix at the beginning of a scene rendering pass so that the
- eye position can be adjusted for stereo.
-
- \sa modelViewMatrix(), combinedMatrix(), setCamera()
-*/
-QMatrix4x4Stack& QGLPainter::projectionMatrix()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->projectionMatrix;
-}
-
-/*!
- Returns a reference to the modelview matrix stack.
-
- \sa projectionMatrix(), combinedMatrix(), normalMatrix(), setCamera()
- \sa worldMatrix()
-*/
-QMatrix4x4Stack& QGLPainter::modelViewMatrix()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->modelViewMatrix;
-}
-
-/*!
- \fn QMatrix4x4 QGLPainter::combinedMatrix() const
-
- Returns the result of multiplying the projectionMatrix()
- and the modelViewMatrix(). This combined matrix value is
- useful for setting uniform matrix values on shader programs.
-
- Calling this function is more efficient than calling
- projectionMatrix() and modelViewMatrix() separately and
- multiplying the return values.
-
- \sa projectionMatrix(), modelViewMatrix(), normalMatrix()
-*/
-QMatrix4x4 QGLPainter::combinedMatrix() const
-{
- const QGLPainterPrivate *d = d_func();
- if (!d)
- return QMatrix4x4();
- const QMatrix4x4StackPrivate *proj = d->projectionMatrix.d_func();
- const QMatrix4x4StackPrivate *mv = d->modelViewMatrix.d_func();
- return proj->matrix * mv->matrix;
-}
-
-// Inverting the eye transformation will often result in values like
-// 1.5e-15 in the world matrix. Clamp these to zero to make worldMatrix()
-// more stable when removing the eye component of the modelViewMatrix().
-static inline qreal qt_gl_stablize_value(qreal value)
-{
- return (qAbs(value) >= 0.00001f) ? value : 0.0f;
-}
-static inline QMatrix4x4 qt_gl_stablize_matrix(const QMatrix4x4 &m)
-{
- return QMatrix4x4(qt_gl_stablize_value(m(0, 0)),
- qt_gl_stablize_value(m(0, 1)),
- qt_gl_stablize_value(m(0, 2)),
- qt_gl_stablize_value(m(0, 3)),
- qt_gl_stablize_value(m(1, 0)),
- qt_gl_stablize_value(m(1, 1)),
- qt_gl_stablize_value(m(1, 2)),
- qt_gl_stablize_value(m(1, 3)),
- qt_gl_stablize_value(m(2, 0)),
- qt_gl_stablize_value(m(2, 1)),
- qt_gl_stablize_value(m(2, 2)),
- qt_gl_stablize_value(m(2, 3)),
- qt_gl_stablize_value(m(3, 0)),
- qt_gl_stablize_value(m(3, 1)),
- qt_gl_stablize_value(m(3, 2)),
- qt_gl_stablize_value(m(3, 3)));
-}
-
-/*!
- Returns the world matrix, which is the modelViewMatrix() without
- the eye transformation that was set in the previous call to
- setCamera().
-
- In the following example, the \c{world} variable will be set to the
- translation and scale component of the modelview transformation,
- without the "look at" component from the camera:
-
- \code
- painter.setCamera(camera);
- painter.modelViewMatrix().translate(0.0f, 5.0f, 0.0f);
- painter.modelViewMatrix().scale(1.5f);
- QMatrix4x4 world = painter.worldMatrix();
- \endcode
-
- Note: the world matrix is determined by multiplying the inverse of
- the camera's look at component with the current modelview matrix.
- Thus, the result may not be precisely the same as constructing a
- matrix from translate and scale operations starting with the identity.
-
- \sa modelViewMatrix(), setCamera()
-*/
-QMatrix4x4 QGLPainter::worldMatrix() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return qt_gl_stablize_matrix
- (d->inverseEyeMatrix * d->modelViewMatrix.top());
-}
-
-/*!
- \fn QMatrix3x3 QGLPainter::normalMatrix() const
-
- Returns the normal matrix corresponding to modelViewMatrix().
-
- The normal matrix is the transpose of the inverse of the top-left
- 3x3 part of the 4x4 modelview matrix. If the 3x3 sub-matrix is not
- invertible, this function returns the identity.
-
- \sa modelViewMatrix(), combinedMatrix()
-*/
-QMatrix3x3 QGLPainter::normalMatrix() const
-{
- const QGLPainterPrivate *d = d_func();
- if (!d)
- return QMatrix3x3();
- const QMatrix4x4StackPrivate *mv = d->modelViewMatrix.d_func();
- return mv->matrix.normalMatrix();
-}
-
-/*!
- Returns the camera eye that is currently being used for stereo
- rendering. The default is QGL::NoEye.
-
- The eye is used to adjust the camera position by a small amount
- when setCamera() is called.
-
- \sa setEye(), setCamera()
-*/
-QGL::Eye QGLPainter::eye() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->eye;
-}
-
-/*!
- Sets the camera \a eye that is currently being used for stereo
- rendering.
-
- The \a eye is used to adjust the camera position by a small amount
- when setCamera() is called.
-
- \sa eye(), setCamera()
-*/
-void QGLPainter::setEye(QGL::Eye eye)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->eye = eye;
-}
-
-/*!
- Sets the modelViewMatrix() and projectionMatrix() to the view
- defined by \a camera. If eye() is not QGL::NoEye, then the view
- will be adjusted for the camera's eye separation.
-
- This function is typically called at the beginning of a scene rendering
- pass to initialize the modelview and projection matrices.
-
- \sa eye(), modelViewMatrix(), projectionMatrix(), worldMatrix()
-*/
-void QGLPainter::setCamera(const QGLCamera *camera)
-{
- Q_ASSERT(camera);
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- QMatrix4x4 lookAt = camera->modelViewMatrix(d->eye);
- d->modelViewMatrix = lookAt;
- d->projectionMatrix = camera->projectionMatrix(aspectRatio());
- d->inverseEyeMatrix = lookAt.inverted();
-}
-
-/*!
- Returns true if \a point is outside the current viewing volume.
- This is used to perform object culling checks.
-*/
-bool QGLPainter::isCullable(const QVector3D& point) const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- QVector3D projected = d->modelViewMatrix * point;
- projected = d->projectionMatrix * projected;
- return !d->viewingCube.contains(projected);
-}
-
-static inline uint outcode(const QVector4D &v)
-{
- // For a discussion of outcodes see pg 388 Dunn & Parberry.
- // For why you can't just test if the point is in a bounding box
- // consider the case where a view frustum with view-size 1.5 x 1.5
- // is tested against a 2x2 box which encloses the near-plane, while
- // all the points in the box are outside the frustum.
- // TODO: optimise this with assembler - according to D&P this can
- // be done in one line of assembler on some platforms
- uint code = 0;
- if (v.x() < -v.w()) code |= 0x01;
- if (v.x() > v.w()) code |= 0x02;
- if (v.y() < -v.w()) code |= 0x04;
- if (v.y() > v.w()) code |= 0x08;
- if (v.z() < -v.w()) code |= 0x10;
- if (v.z() > v.w()) code |= 0x20;
- return code;
-}
-
-/*!
- Returns true if \a box is completely outside the current viewing volume.
- This is used to perform object culling checks.
-*/
-bool QGLPainter::isCullable(const QBox3D& box) const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- // This function uses the technique of view frustum culling known as
- // clip space testing. Since the normal QVector3D representation
- // of the points throws away the w value needed, we convert the box
- // into a set of 8 points represented as QVector4D's and then apply
- // the test. The test is to transform the points into clip space
- // by applying the MV and Proj matrices, then test to see if the 4D
- // points are outside the clip space by testing x, y & z against w.
- QArray<QVector4D> box4d;
- QVector3D n = box.minimum();
- QVector3D x = box.maximum();
- box4d.append(QVector4D(n.x(), n.y(), x.z(), 1), QVector4D(x.x(), n.y(), x.z(), 1),
- QVector4D(x.x(), x.y(), x.z(), 1), QVector4D(n.x(), x.y(), x.z(), 1));
- box4d.append(QVector4D(n.x(), n.y(), n.z(), 1), QVector4D(x.x(), n.y(), n.z(), 1),
- QVector4D(x.x(), x.y(), n.z(), 1), QVector4D(n.x(), x.y(), n.z(), 1));
- QMatrix4x4 mvp = d->projectionMatrix.top() * d->modelViewMatrix.top();
- for (int i = 0; i < box4d.size(); ++i)
- {
- box4d[i] = mvp * box4d.at(i);
- }
- // if the logical AND of all the outcodes is non-zero then the BB is
- // definitely outside the view frustum.
- uint out = 0xff;
- for (int i = 0; i < box4d.size(); ++i)
- {
- out = out & outcode(box4d.at(i));
- }
- return out;
-}
-
-/*!
- Returns the current render order sequencer.
-
- \sa QGLRenderSequencer
-*/
-QGLRenderSequencer *QGLPainter::renderSequencer()
-{
- Q_D(QGLPainter);
- if (!d->renderSequencer)
- d->renderSequencer = new QGLRenderSequencer(this);
- return d->renderSequencer;
-}
-
-/*!
- Returns the aspect ratio of the viewport for adjusting projection
- transformations.
-*/
-qreal QGLPainter::aspectRatio() const
-{
- return currentSurface()->aspectRatio();
-}
-
-/*!
- Returns the current effect that is in use, which is userEffect()
- if it is not null, or the effect object associated with
- standardEffect() otherwise.
-
- If isPicking() is true, then this will return the effect object
- that is being used to generate pick colors.
-
- \sa userEffect(), standardEffect(), isPicking()
-*/
-QGLAbstractEffect *QGLPainter::effect() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->ensureEffect(const_cast<QGLPainter *>(this));
- return d->effect;
-}
-
-/*!
- Returns the user-defined effect that is being used for drawing
- operations, or null if standardEffect() is in use.
-
- \sa setUserEffect(), standardEffect(), effect()
-*/
-QGLAbstractEffect *QGLPainter::userEffect() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->userEffect;
-}
-
-/*!
- Sets a user-defined \a effect to use for drawing operations
- in the current GL context. If \a effect is null, this will
- disable user-defined effects and return to using standardEffect().
-
- \sa effect(), draw(), setStandardEffect()
-*/
-void QGLPainter::setUserEffect(QGLAbstractEffect *effect)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->userEffect == effect)
- return;
- if (d->effect)
- d->effect->setActive(this, false);
- d->userEffect = effect;
- if (effect && (!d->pick || !d->pick->isPicking)) {
- d->effect = effect;
- d->effect->setActive(this, true);
- d->updates = UpdateAll;
- } else {
- // Revert to the effect associated with standardEffect().
- d->effect = 0;
- d->ensureEffect(this);
- }
-}
-
-/*!
- Returns the standard effect to use for rendering fragments in
- the current GL context when userEffect() is null.
-
- \sa setStandardEffect(), userEffect()
-*/
-QGL::StandardEffect QGLPainter::standardEffect() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->standardEffect;
-}
-
-/*!
- Sets a standard \a effect to use for rendering fragments
- in the current GL context. This will also set userEffect()
- to null. If \a effect is an invalid value, then the behavior
- of QGL::FlatColor will be used instead.
-
- \sa standardEffect(), setUserEffect()
-*/
-void QGLPainter::setStandardEffect(QGL::StandardEffect effect)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->standardEffect == effect && d->effect && d->userEffect == 0)
- return;
- if (d->effect)
- d->effect->setActive(this, false);
- d->standardEffect = effect;
- d->userEffect = 0;
- d->effect = 0;
- d->ensureEffect(this);
-}
-
-/*!
- Disables the current effect and sets userEffect() to null.
- Unlike setUserEffect() this not activate the standardEffect()
- until the next time effect() is called.
-
- This function can be used to disable all effect-based drawing
- operations prior to performing raw GL calls. The next time
- effect() is called on this QGLPainter, the standardEffect()
- will be reactivated. An effect can also be reactivated by
- calling setUserEffect() or setStandardEffect().
-
- \sa userEffect(), standardEffect()
-*/
-void QGLPainter::disableEffect()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->effect)
- d->effect->setActive(this, false);
- d->userEffect = 0;
- d->effect = 0;
-}
-
-/*!
- Returns the cached shader program associated with \a name; or null
- if \a name is not currently associated with a shader program.
-
- \sa setCachedProgram()
-*/
-QGLShaderProgram *QGLPainter::cachedProgram(const QString& name) const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->cachedPrograms.value(name, 0);
-}
-
-/*!
- Sets the cached shader \a program associated with \a name.
-
- Effect objects can use this function to store pre-compiled
- and pre-linked shader programs in the painter for future
- use by the same effect. The \a program will be destroyed
- when context() is destroyed.
-
- If \a program is null, then the program associated with \a name
- will be destroyed. If \a name is already present as a cached
- program, then it will be replaced with \a program.
-
- Names that start with "\c{qt.}" are reserved for use by Qt's
- internal effects.
-
- \sa cachedProgram()
-*/
-void QGLPainter::setCachedProgram
- (const QString& name, QGLShaderProgram *program)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- QGLShaderProgram *current = d->cachedPrograms.value(name, 0);
- if (current != program) {
- if (program)
- d->cachedPrograms[name] = program;
- else
- d->cachedPrograms.remove(name);
- delete current;
- }
-}
-
-void QGLPainterPrivate::createEffect(QGLPainter *painter)
-{
- if (userEffect) {
- if (!pick || !pick->isPicking) {
- effect = userEffect;
- effect->setActive(painter, true);
- updates = QGLPainter::UpdateAll;
- return;
- }
- if (userEffect->supportsPicking()) {
- effect = userEffect;
- effect->setActive(painter, true);
- updates = QGLPainter::UpdateAll;
- return;
- }
- effect = pick->defaultPickEffect;
- effect->setActive(painter, true);
- updates = QGLPainter::UpdateAll;
- return;
- }
- if (uint(standardEffect) >= QGL_MAX_STD_EFFECTS)
- effect = stdeffects[int(QGL::FlatColor)];
- else
- effect = stdeffects[int(standardEffect)];
- if (!effect) {
- switch (standardEffect) {
- case QGL::FlatColor: default:
- effect = new QGLFlatColorEffect();
- break;
- case QGL::FlatPerVertexColor:
- effect = new QGLPerVertexColorEffect();
- break;
- case QGL::FlatReplaceTexture2D:
- effect = new QGLFlatTextureEffect();
- break;
- case QGL::FlatDecalTexture2D:
- effect = new QGLFlatDecalTextureEffect();
- break;
- case QGL::LitMaterial:
- effect = new QGLLitMaterialEffect();
- break;
- case QGL::LitDecalTexture2D:
- effect = new QGLLitDecalTextureEffect();
- break;
- case QGL::LitModulateTexture2D:
- effect = new QGLLitModulateTextureEffect();
- break;
- }
- if (uint(standardEffect) >= QGL_MAX_STD_EFFECTS)
- stdeffects[int(QGL::FlatColor)] = effect;
- else
- stdeffects[int(standardEffect)] = effect;
- }
- if (!pick || !pick->isPicking || effect->supportsPicking()) {
- effect->setActive(painter, true);
- } else {
- effect = pick->defaultPickEffect;
- effect->setActive(painter, true);
- }
- updates = QGLPainter::UpdateAll;
-}
-
-/*!
- Returns the last color that was set with setColor(). The default
- value is (1, 1, 1, 1).
-
- \sa setColor()
-*/
-QColor QGLPainter::color() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->color;
-}
-
-/*!
- Sets the default fragment \a color for effects associated
- with this painter. This function does not apply the color
- to the effect until update() is called.
-
- \sa color(), update()
-*/
-void QGLPainter::setColor(const QColor& color)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->color = color;
- d->updates |= UpdateColor;
-}
-
-static void qt_gl_setVertexAttribute(QGL::VertexAttribute attribute, const QGLAttributeValue& value)
-{
-#if !defined(QT_OPENGL_ES_2)
- switch (attribute) {
- case QGL::Position:
- glVertexPointer(value.tupleSize(), value.type(),
- value.stride(), value.data());
- break;
-
- case QGL::Normal:
- if (value.tupleSize() == 3)
- glNormalPointer(value.type(), value.stride(), value.data());
- break;
-
- case QGL::Color:
- glColorPointer(value.tupleSize(), value.type(),
- value.stride(), value.data());
- break;
-
-#ifdef GL_TEXTURE_COORD_ARRAY
- case QGL::TextureCoord0:
- case QGL::TextureCoord1:
- case QGL::TextureCoord2:
- {
- int unit = (int)(attribute - QGL::TextureCoord0);
- qt_gl_ClientActiveTexture(GL_TEXTURE0 + unit);
- glTexCoordPointer(value.tupleSize(), value.type(),
- value.stride(), value.data());
- if (unit != 0) // Stay on unit 0 between requests.
- qt_gl_ClientActiveTexture(GL_TEXTURE0);
- }
- break;
-#endif
-
- default: break;
- }
-#else
- Q_UNUSED(attribute);
- Q_UNUSED(value);
-#endif
-}
-
-/*!
- Returns the set of vertex attributes that have been set on the
- painter state by setVertexAttribute() and setVertexBundle()
- since the last call to clearAttributes().
-
- The most common use for this function is to determine if specific
- attributes have been supplied on the painter so as to adjust the
- current drawing effect accordingly. The following example will
- use a lit texture effect if texture co-ordinates were provided
- in the vertex bundle, or a simple lit material effect if
- texture co-ordinates were not provided:
-
- \code
- painter.clearAttributes();
- painter.setVertexBundle(bundle);
- if (painter.attributes().contains(QGL::TextureCoord0))
- painter.setStandardEffect(QGL::LitModulateTexture2D);
- else
- painter.setStandardEffect(QGL::LitMaterial);
- \endcode
-
- It is important to clear the attributes before setting the vertex
- bundle, so that attributes from a previous bundle will not leak
- through. Multiple vertex bundles may be supplied if they contain
- different parts of the same logical piece of geometry.
-
- \sa clearAttributes(), setVertexBundle()
-*/
-QGLAttributeSet QGLPainter::attributes() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->attributeSet;
-}
-
-/*!
- Clears the set of vertex attributes that have been set on the
- painter state by setVertexAttribute() and setVertexBundle().
- See the documentation for attributes() for more information.
-
- \sa attributes()
-*/
-void QGLPainter::clearAttributes()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->attributeSet.clear();
-}
-
-/*!
- Sets a vertex \a attribute on the current GL context to \a value.
-
- The vertex attribute is bound to the GL state on the index
- corresponding to \a attribute. For example, QGL::Position
- will be bound to index 0, QGL::TextureCoord0 will be bound
- to index 3, etc.
-
- Vertex attributes are independent of the effect() and can be
- bound once and then used with multiple effects.
-
- If this is the first attribute in a new piece of geometry,
- it is recommended that clearAttributes() be called before this
- function. This will inform QGLPainter that a new piece of geometry
- is being provided and that the previous geometry is now invalid.
- See the documentation for attributes() for more information.
-
- \sa setVertexBundle(), draw(), clearAttributes(), attributes()
-*/
-void QGLPainter::setVertexAttribute
- (QGL::VertexAttribute attribute, const QGLAttributeValue& value)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->ensureEffect(this);
- if (d->boundVertexBuffer) {
- QGLBuffer::release(QGLBuffer::VertexBuffer);
- d->boundVertexBuffer = 0;
- }
- if (d->isFixedFunction) {
- qt_gl_setVertexAttribute(attribute, value);
- } else {
- glVertexAttribPointer(GLuint(attribute), value.tupleSize(),
- value.type(), GL_TRUE,
- value.stride(), value.data());
- }
- d->attributeSet.insert(attribute);
-}
-
-/*!
- Sets the vertex attributes on the current GL context that are
- stored in \a buffer.
-
- The vertex attributes are bound to the GL state on the indexes
- that are specified within \a buffer; QGL::Position will be
- bound to index 0, QGL::TextureCoord0 will be bound to index 3, etc.
-
- Vertex attributes are independent of the effect() and can be
- bound once and then used with multiple effects.
-
- It is recommended that clearAttributes() be called before this
- function to inform QGLPainter that a new piece of geometry is
- being provided and that the previous geometry is now invalid.
- See the documentation for attributes() for more information.
-
- \sa setVertexAttribute(), draw(), clearAttributes(), attributes()
-*/
-void QGLPainter::setVertexBundle(const QGLVertexBundle& buffer)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->ensureEffect(this);
- QGLVertexBundlePrivate *bd = const_cast<QGLVertexBundlePrivate *>(buffer.d_func());
- if (bd->buffer.isCreated()) {
- GLuint id = bd->buffer.bufferId();
- if (id != d->boundVertexBuffer) {
- bd->buffer.bind();
- d->boundVertexBuffer = id;
- }
- } else if (d->boundVertexBuffer) {
- QGLBuffer::release(QGLBuffer::VertexBuffer);
- d->boundVertexBuffer = 0;
- }
- for (int index = 0; index < bd->attributes.size(); ++index) {
- QGLVertexBundleAttribute *attr = bd->attributes[index];
- if (d->isFixedFunction) {
- qt_gl_setVertexAttribute(attr->attribute, attr->value);
- } else {
- glVertexAttribPointer(GLuint(attr->attribute),
- attr->value.tupleSize(),
- attr->value.type(), GL_TRUE,
- attr->value.stride(), attr->value.data());
- }
- }
- d->attributeSet.unite(buffer.attributes());
-}
-
-/*!
- Updates the projection matrix, modelview matrix, and lighting
- conditions in the currently active effect() object by calling
- QGLAbstractEffect::update(). Also updates \c{glViewport()}
- to cover the currentSurface() if necessary.
-
- Normally this function is called automatically by draw().
- However, if the user wishes to use raw GL functions to draw fragments,
- it will be necessary to explicitly call this function to ensure that
- the matrix state and lighting conditions have been set on the
- active effect().
-
- Note that this function informs the effect that an update is needed.
- It does not change the GL state itself, except for \c{glViewport()}.
- In particular, the modelview and projection matrices in the
- fixed-function pipeline are not changed unless the effect or
- application calls updateFixedFunction().
-
- \sa setUserEffect(), projectionMatrix(), modelViewMatrix()
- \sa draw(), updateFixedFunction()
-*/
-void QGLPainter::update()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->ensureEffect(this);
- QGLPainter::Updates updates = d->updates;
- d->updates = 0;
- if (d->modelViewMatrix.isDirty()) {
- updates |= UpdateModelViewMatrix;
- d->modelViewMatrix.setDirty(false);
- }
- if (d->projectionMatrix.isDirty()) {
- updates |= UpdateProjectionMatrix;
- d->projectionMatrix.setDirty(false);
- }
- if ((updates & UpdateViewport) != 0) {
- QRect viewport = currentSurface()->viewportGL();
- glViewport(viewport.x(), viewport.y(),
- viewport.width(), viewport.height());
- }
- if (updates != 0)
- d->effect->update(this, updates);
-}
-
-#if !defined(QT_OPENGL_ES_2)
-
-static void setLight(int light, const QGLLightParameters *parameters,
- const QMatrix4x4& transform)
-{
- GLfloat params[4];
-
- QColor color = parameters->ambientColor();
- params[0] = color.redF();
- params[1] = color.greenF();
- params[2] = color.blueF();
- params[3] = color.alphaF();
- glLightfv(light, GL_AMBIENT, params);
-
- color = parameters->diffuseColor();
- params[0] = color.redF();
- params[1] = color.greenF();
- params[2] = color.blueF();
- params[3] = color.alphaF();
- glLightfv(light, GL_DIFFUSE, params);
-
- color = parameters->specularColor();
- params[0] = color.redF();
- params[1] = color.greenF();
- params[2] = color.blueF();
- params[3] = color.alphaF();
- glLightfv(light, GL_SPECULAR, params);
-
- QVector4D vector = parameters->eyePosition(transform);
- params[0] = vector.x();
- params[1] = vector.y();
- params[2] = vector.z();
- params[3] = vector.w();
- glLightfv(light, GL_POSITION, params);
-
- QVector3D spotDirection = parameters->eyeSpotDirection(transform);
- params[0] = spotDirection.x();
- params[1] = spotDirection.y();
- params[2] = spotDirection.z();
- glLightfv(light, GL_SPOT_DIRECTION, params);
-
- params[0] = parameters->spotExponent();
- glLightfv(light, GL_SPOT_EXPONENT, params);
-
- params[0] = parameters->spotAngle();
- glLightfv(light, GL_SPOT_CUTOFF, params);
-
- params[0] = parameters->constantAttenuation();
- glLightfv(light, GL_CONSTANT_ATTENUATION, params);
-
- params[0] = parameters->linearAttenuation();
- glLightfv(light, GL_LINEAR_ATTENUATION, params);
-
- params[0] = parameters->quadraticAttenuation();
- glLightfv(light, GL_QUADRATIC_ATTENUATION, params);
-}
-
-static void setMaterial(int face, const QGLMaterial *parameters)
-{
- GLfloat params[17];
-
- QColor mcolor = parameters->ambientColor();
- params[0] = mcolor.redF();
- params[1] = mcolor.greenF();
- params[2] = mcolor.blueF();
- params[3] = mcolor.alphaF();
-
- mcolor = parameters->diffuseColor();
- params[4] = mcolor.redF();
- params[5] = mcolor.greenF();
- params[6] = mcolor.blueF();
- params[7] = mcolor.alphaF();
-
- mcolor = parameters->specularColor();
- params[8] = mcolor.redF();
- params[9] = mcolor.greenF();
- params[10] = mcolor.blueF();
- params[11] = mcolor.alphaF();
-
- mcolor = parameters->emittedLight();
- params[12] = mcolor.redF();
- params[13] = mcolor.greenF();
- params[14] = mcolor.blueF();
- params[15] = mcolor.alphaF();
-
- params[16] = parameters->shininess();
-
- glMaterialfv(face, GL_AMBIENT, params);
- glMaterialfv(face, GL_DIFFUSE, params + 4);
- glMaterialfv(face, GL_SPECULAR, params + 8);
- glMaterialfv(face, GL_EMISSION, params + 12);
- glMaterialfv(face, GL_SHININESS, params + 16);
-}
-
-#endif // !QT_OPENGL_ES_2
-
-/*!
- Updates the fixed-function pipeline with the current painting
- state according to the flags in \a updates.
-
- This function is intended for use by effects in their
- QGLAbstractEffect::update() override if they are using the
- fixed-function pipeline. It can also be used by user
- applications if they need the QGLPainter state to be
- set in the fixed-function pipeline.
-
- If the OpenGL implementation does not have a fixed-function
- pipeline, e.g. OpenGL/ES 2.0, this function does nothing.
-
- \sa update()
-*/
-void QGLPainter::updateFixedFunction(QGLPainter::Updates updates)
-{
-#if defined(QT_OPENGL_ES_2)
- Q_UNUSED(updates);
-#else
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if ((updates & QGLPainter::UpdateColor) != 0) {
- QColor color;
- if (isPicking())
- color = pickColor();
- else
- color = this->color();
- glColor4f(color.redF(), color.greenF(), color.blueF(), color.alphaF());
- }
- if ((updates & QGLPainter::UpdateModelViewMatrix) != 0) {
- const QMatrix4x4 &matrix = d->modelViewMatrix.top();
- glMatrixMode(GL_MODELVIEW);
- if (sizeof(qreal) == sizeof(GLfloat)) {
- glLoadMatrixf(reinterpret_cast<const GLfloat *>
- (matrix.constData()));
- } else {
- GLfloat mat[16];
- const qreal *m = matrix.constData();
- for (int index = 0; index < 16; ++index)
- mat[index] = m[index];
- glLoadMatrixf(mat);
- }
- }
- if ((updates & QGLPainter::UpdateProjectionMatrix) != 0) {
- const QMatrix4x4 &matrix = d->projectionMatrix.top();
- glMatrixMode(GL_PROJECTION);
- if (sizeof(qreal) == sizeof(GLfloat)) {
- glLoadMatrixf(reinterpret_cast<const GLfloat *>
- (matrix.constData()));
- } else {
- GLfloat mat[16];
- const qreal *m = matrix.constData();
- for (int index = 0; index < 16; ++index)
- mat[index] = m[index];
- glLoadMatrixf(mat);
- }
- }
- if ((updates & QGLPainter::UpdateLights) != 0) {
- // Save the current modelview matrix and load the identity.
- // We need to apply the light in the modelview transformation
- // that was active when the light was specified.
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-
- // Enable the main light.
- const QGLLightParameters *params = mainLight();
- setLight(GL_LIGHT0, params, mainLightTransform());
-
- // Restore the previous modelview transformation.
- glPopMatrix();
-
- // Set up the light model parameters if at least one light is enabled.
- const QGLLightModel *lightModel = this->lightModel();
- GLfloat values[4];
-#ifdef GL_LIGHT_MODEL_TWO_SIDE
- if (lightModel->model() == QGLLightModel::TwoSided)
- values[0] = 1.0f;
- else
- values[0] = 0.0f;
- glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, values);
-#endif
-#ifdef GL_LIGHT_MODEL_COLOR_CONTROL
- if (lightModel->colorControl() == QGLLightModel::SeparateSpecularColor)
- values[0] = GL_SEPARATE_SPECULAR_COLOR;
- else
- values[0] = GL_SINGLE_COLOR;
- glLightModelfv(GL_LIGHT_MODEL_COLOR_CONTROL, values);
-#endif
-#ifdef GL_LIGHT_MODEL_LOCAL_VIEWER
- if (lightModel->viewerPosition() == QGLLightModel::LocalViewer)
- values[0] = 1.0f;
- else
- values[0] = 0.0f;
- glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, values);
-#endif
-#ifdef GL_LIGHT_MODEL_AMBIENT
- QColor color = lightModel->ambientSceneColor();
- values[0] = color.redF();
- values[1] = color.blueF();
- values[2] = color.greenF();
- values[3] = color.alphaF();
- glLightModelfv(GL_LIGHT_MODEL_AMBIENT, values);
-#endif
- }
- if ((updates & QGLPainter::UpdateMaterials) != 0) {
- const QGLMaterial *frontMaterial = faceMaterial(QGL::FrontFaces);
- const QGLMaterial *backMaterial = faceMaterial(QGL::BackFaces);
- if (frontMaterial == backMaterial) {
- setMaterial(GL_FRONT_AND_BACK, frontMaterial);
- } else {
- setMaterial(GL_FRONT, frontMaterial);
- setMaterial(GL_BACK, backMaterial);
- }
- }
-#endif
-}
-
-/*!
- Draws primitives using \a count vertices from the arrays specified
- by setVertexAttribute(). The type of primitive to draw is specified
- by \a mode.
-
- This operation will consume \a count values from the
- enabled arrays, starting at \a index.
-
- \sa update()
-*/
-void QGLPainter::draw(QGL::DrawingMode mode, int count, int index)
-{
- update();
- glDrawArrays((GLenum)mode, index, count);
-}
-
-/*!
- \overload
-
- Draws primitives using vertices from the arrays specified by
- setVertexAttribute(). The type of primitive to draw is
- specified by \a mode.
-
- This operation will consume \a count elements of \a indices,
- which are used to index into the enabled arrays.
-
- \sa update()
-*/
-void QGLPainter::draw(QGL::DrawingMode mode, const ushort *indices, int count)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- update();
- if (d->boundIndexBuffer) {
- QGLBuffer::release(QGLBuffer::IndexBuffer);
- d->boundIndexBuffer = 0;
- }
- glDrawElements(GLenum(mode), count, GL_UNSIGNED_SHORT, indices);
-}
-
-/*!
- Pushes \a surface onto the surface stack and makes it the current
- drawing surface for context(). If \a surface is null, then the
- current drawing surface will be set to the main surface (e.g. the window).
-
- Note: the \a surface object must remain valid until popped from
- the stack or end() is called. All surfaces are popped from
- the stack by end().
-
- The UpdateViewport flag will be set to indicate that the
- \c{glViewport()} should be adjusted to the extents of \a surface
- when update() is next called.
-
- \sa popSurface(), currentSurface(), setSurface()
- \sa QGLAbstractSurface::activate()
-*/
-void QGLPainter::pushSurface(QGLAbstractSurface *surface)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- Q_ASSERT(surface);
- if (!surface) {
- // Find the most recent main surface for this painter.
- int size = d->surfaceStack.size();
- while (size > 0 && !d->surfaceStack[size - 1].mainSurface)
- --size;
- if (!size)
- return; // Shouldn't happen, but be safe anyway.
- surface = d->surfaceStack[size - 1].surface;
- }
- Q_ASSERT(!d->surfaceStack.isEmpty()); // Should have a main surface.
- QGLAbstractSurface *current = d->surfaceStack.top().surface;
- QGLPainterSurfaceInfo psurf;
- psurf.surface = surface;
- psurf.destroySurface = false;
- psurf.mainSurface = false;
- d->surfaceStack.append(psurf);
- current->switchTo(surface);
- d->updates |= UpdateViewport;
-}
-
-/*!
- Pops the top-most drawing surface from the surface stack
- and returns it. The next object on the stack will be made
- the current drawing surface for context(). Returns null if the
- surface stack is already at the main surface (e.g. the window).
-
- The UpdateViewport flag will be set to indicate that the
- \c{glViewport()} should be adjusted to the new surface extents
- when update() is next called.
-
- \sa pushSurface(), currentSurface(), setSurface()
-*/
-QGLAbstractSurface *QGLPainter::popSurface()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- Q_ASSERT(!d->surfaceStack.isEmpty()); // Should have a main surface.
- QGLPainterSurfaceInfo &surf = d->surfaceStack.top();
- if (surf.mainSurface)
- return 0;
- QGLAbstractSurface *surface = surf.surface;
- d->surfaceStack.pop();
- Q_ASSERT(!d->surfaceStack.isEmpty()); // Should have a main surface.
- QGLAbstractSurface *nextSurface = d->surfaceStack.top().surface;
- surface->switchTo(nextSurface);
- d->updates |= UpdateViewport;
- return surface;
-}
-
-/*!
- Sets the top-most drawing surface on the surface stack to \a surface
- and activate it.
-
- Note: if the top-most drawing surface is the main surface specified
- during begin(), then this function will perform a pushSurface()
- instead. Typically this function is used to replace the last
- surface that was pushed onto the stack and avoid doing popSurface()
- followed by pushSurface(). The main surface cannot be replaced
- in this manner.
-
- The UpdateViewport flag will be set to indicate that the
- \c{glViewport()} should be adjusted to the extents of \a surface
- when update() is next called.
-
- \sa pushSurface(), popSurface(), currentSurface()
-*/
-void QGLPainter::setSurface(QGLAbstractSurface *surface)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- Q_ASSERT(surface);
- Q_ASSERT(!d->surfaceStack.isEmpty()); // Should have a main surface.
- QGLPainterSurfaceInfo &surf = d->surfaceStack.top();
- if (surf.mainSurface) {
- pushSurface(surface);
- return;
- }
- QGLAbstractSurface *oldSurface = surf.surface;
- surf.surface = surface;
- oldSurface->switchTo(surface);
- d->updates |= UpdateViewport;
-}
-
-/*!
- Returns the current drawing surface.
-
- \sa pushSurface(), popSurface(), setSurface()
-*/
-QGLAbstractSurface *QGLPainter::currentSurface() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- Q_ASSERT(!d->surfaceStack.isEmpty()); // Should have a main surface.
- return d->surfaceStack.top().surface;
-}
-
-/*!
- Returns the current lighting model.
-
- \sa setLightModel()
-*/
-const QGLLightModel *QGLPainter::lightModel() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (!d->lightModel) {
- if (!d->defaultLightModel)
- d->defaultLightModel = new QGLLightModel();
- d->lightModel = d->defaultLightModel;
- }
- return d->lightModel;
-}
-
-/*!
- Sets the current lighting model to \a value. If \a value is
- null, then the default lighting model parameters will be used.
-
- The light settings in the GL server will not be changed until
- update() is called.
-
- \sa lightModel()
-*/
-void QGLPainter::setLightModel(const QGLLightModel *value)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- d->lightModel = value;
- d->updates |= QGLPainter::UpdateLights;
-}
-
-/*!
- Returns the parameters for the main light in the scene.
-
- The light parameters are specified in world co-ordinates at
- the point when setMainLight() was called. The mainLightTransform()
- must be applied to obtain eye co-ordinates.
-
- This function is a convenience that returns the light with
- identifier 0. If light 0 is not currently enabled, then a
- default light is added to the painter with an identity
- transform and then returned as the main light.
-
- \sa setMainLight(), mainLightTransform(), addLight()
-*/
-const QGLLightParameters *QGLPainter::mainLight() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->lights.isEmpty()) {
- if (!d->defaultLight)
- d->defaultLight = new QGLLightParameters();
- d->lights.append(d->defaultLight);
- d->lightTransforms.append(QMatrix4x4());
- } else if (!d->lights[0]) {
- if (!d->defaultLight)
- d->defaultLight = new QGLLightParameters();
- d->lights[0] = d->defaultLight;
- d->lightTransforms[0] = QMatrix4x4();
- }
- return d->lights[0];
-}
-
-/*!
- Sets the \a parameters for the main light in the scene.
- The mainLightTransform() is set to the current modelViewMatrix().
-
- Light parameters are stored in world co-ordinates, not eye co-ordinates.
- The mainLightTransform() specifies the transformation to apply to
- convert the world co-ordinates into eye co-ordinates when the light
- is used.
-
- Note: the \a parameters may be ignored by effect() if it
- has some other way to determine the lighting conditions.
-
- The light settings in the GL server will not be changed until
- update() is called.
-
- This function is a convenience that sets the light with
- identifier 0. If \a parameters is null, then light 0
- will be removed.
-
- \sa mainLight(), mainLightTransform(), addLight()
-*/
-void QGLPainter::setMainLight(const QGLLightParameters *parameters)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->lights.isEmpty()) {
- if (parameters) {
- d->lights.append(parameters);
- d->lightTransforms.append(modelViewMatrix());
- d->updates |= QGLPainter::UpdateLights;
- }
- } else if (parameters) {
- d->lights[0] = parameters;
- d->lightTransforms[0] = modelViewMatrix();
- d->updates |= QGLPainter::UpdateLights;
- } else {
- removeLight(0);
- }
-}
-
-/*!
- Sets the \a parameters for the main light in the scene, and set
- mainLightTransform() to \a transform.
-
- Light parameters are stored in world co-ordinates, not eye co-ordinates.
- The \a transform specifies the transformation to apply to convert the
- world co-ordinates into eye co-ordinates when the light is used.
-
- Note: the \a parameters may be ignored by effect() if it
- has some other way to determine the lighting conditions.
-
- The light settings in the GL server will not be changed until
- update() is called.
-
- This function is a convenience that sets the light with
- identifier 0. If \a parameters is null, then light 0
- will be removed.
-
- \sa mainLight(), mainLightTransform()
-*/
-void QGLPainter::setMainLight
- (const QGLLightParameters *parameters, const QMatrix4x4& transform)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->lights.isEmpty()) {
- if (parameters) {
- d->lights.append(parameters);
- d->lightTransforms.append(transform);
- d->updates |= QGLPainter::UpdateLights;
- }
- } else if (parameters) {
- d->lights[0] = parameters;
- d->lightTransforms[0] = transform;
- d->updates |= QGLPainter::UpdateLights;
- } else {
- removeLight(0);
- }
-}
-
-/*!
- Returns the modelview transformation matrix for the main light that
- was set at the time setMainLight() was called.
-
- The light transform may be used by later painting operations to
- convert the light from world co-ordinates into eye co-ordinates.
- The eye transformation is set when the light is specified.
-
- This function is a convenience that returns the tranform for the
- light with identifier 0. If light 0 is not enabled, then the
- function returns the identity matrix.
-
- \sa mainLight(), setMainLight(), addLight()
-*/
-QMatrix4x4 QGLPainter::mainLightTransform() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (!d->lights.isEmpty() && d->lights[0])
- return d->lightTransforms[0];
- else
- return QMatrix4x4();
-}
-
-/*!
- Adds a light to this painter, with the specified \a parameters.
- The lightTransform() for the light is set to the current
- modelViewMatrix(). Returns an identifier for the light.
-
- Light parameters are stored in world co-ordinates, not eye co-ordinates.
- The lightTransform() specifies the transformation to apply to
- convert the world co-ordinates into eye co-ordinates when the light
- is used.
-
- Note: the \a parameters may be ignored by effect() if it
- has some other way to determine the lighting conditions.
-
- The light settings in the GL server will not be changed until
- update() is called.
-
- \sa removeLight(), light(), mainLight()
-*/
-int QGLPainter::addLight(const QGLLightParameters *parameters)
-{
- return addLight(parameters, modelViewMatrix());
-}
-
-/*!
- Adds a light to this painter, with the specified \a parameters.
- The lightTransform() for the light is set to \a transform.
- Returns an identifier for the light.
-
- Light parameters are stored in world co-ordinates, not eye co-ordinates.
- The \a transform specifies the transformation to apply to
- convert the world co-ordinates into eye co-ordinates when the light
- is used.
-
- Note: the \a parameters may be ignored by effect() if it
- has some other way to determine the lighting conditions.
-
- The light settings in the GL server will not be changed until
- update() is called.
-
- \sa removeLight(), light(), mainLight()
-*/
-int QGLPainter::addLight(const QGLLightParameters *parameters, const QMatrix4x4 &transform)
-{
- Q_ASSERT(parameters);
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- int lightId = 0;
- while (lightId < d->lights.size() && d->lights[lightId] != 0)
- ++lightId;
- if (lightId < d->lights.size()) {
- d->lights[lightId] = parameters;
- d->lightTransforms[lightId] = transform;
- } else {
- d->lights.append(parameters);
- d->lightTransforms.append(transform);
- }
- d->updates |= QGLPainter::UpdateLights;
- return lightId;
-}
-
-/*!
- Removes the light with the specified \a lightId.
-
- \sa addLight(), light()
-*/
-void QGLPainter::removeLight(int lightId)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (lightId >= 0 && lightId < d->lights.size()) {
- d->lights[lightId] = 0;
- if (lightId >= (d->lights.size() - 1)) {
- do {
- d->lights.resize(lightId);
- d->lightTransforms.resize(lightId);
- --lightId;
- } while (lightId >= 0 && d->lights[lightId] == 0);
- }
- d->updates |= QGLPainter::UpdateLights;
- }
-}
-
-/*!
- Returns the maximum light identifier currently in use on this painter;
- or -1 if there are no lights.
-
- It is possible that some light identifiers less than maximumLightId()
- may be invalid because the lights have been removed. Use the following
- code to locate all enabled lights:
-
- \code
- int maxLightId = painter.maximumLightId();
- for (int lightId = 0; index <= maxLightId; ++index) {
- const QGLLightParameters *params = painter.light(lightId);
- if (params) {
- ...
- }
- }
- \endcode
-
- \sa addLight(), light()
-*/
-int QGLPainter::maximumLightId() const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return d->lights.size() - 1;
-}
-
-/*!
- Returns the parameters for the light with the identifier \a lightId;
- or null if \a lightId is not valid or has been removed.
-
- \sa addLight(), removeLight(), lightTransform()
-*/
-const QGLLightParameters *QGLPainter::light(int lightId) const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (lightId >= 0 && lightId < d->lights.size())
- return d->lights[lightId];
- else
- return 0;
-}
-
-/*!
- Returns the modelview transformation for the light with the identifier
- \a lightId; or the identity matrix if \a lightId is not valid or has
- been removed.
-
- \sa addLight(), removeLight(), light()
-*/
-QMatrix4x4 QGLPainter::lightTransform(int lightId) const
-{
- Q_D(const QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (lightId >= 0 && lightId < d->lights.size() && d->lights[lightId])
- return d->lightTransforms[lightId];
- else
- return QMatrix4x4();
-}
-
-/*!
- Returns the material that is used for drawing \a face on polygons.
- If \a face is QGL::FrontFaces or QGL::AllFaces, then the front
- material is returned. If \a face is QGL::BackFaces, then the
- back material is returned.
-
- \sa setFaceMaterial(), setFaceColor()
-*/
-const QGLMaterial *QGLPainter::faceMaterial(QGL::Face face) const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (face == QGL::BackFaces) {
- if (!d->backMaterial) {
- if (!d->defaultMaterial)
- d->defaultMaterial = new QGLMaterial();
- d->backMaterial = d->defaultMaterial;
- }
- return d->backMaterial;
- } else {
- if (!d->frontMaterial) {
- if (!d->defaultMaterial)
- d->defaultMaterial = new QGLMaterial();
- d->frontMaterial = d->defaultMaterial;
- }
- return d->frontMaterial;
- }
-}
-
-/*!
- Sets the material that is used for drawing \a face on polygons
- to \a value. If \a face is QGL::FrontFaces, then the front
- material is set. If \a face is QGL::BackFaces, then the
- back material is set. If \a face is QGL::AllFaces, then both
- the front and back materials are set.
-
- If \a value is null, then the \a face material will be set to
- the default material properties.
-
- The material settings in the GL server will not be changed until
- update() is called.
-
- \sa faceMaterial(), setFaceColor()
-*/
-void QGLPainter::setFaceMaterial
- (QGL::Face face, const QGLMaterial *value)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (face == QGL::FrontFaces) {
- if (d->frontMaterial == value)
- return;
- d->frontMaterial = value;
- } else if (face == QGL::BackFaces) {
- if (d->backMaterial == value)
- return;
- d->backMaterial = value;
- } else {
- if (d->frontMaterial == value && d->backMaterial == value)
- return;
- d->frontMaterial = value;
- d->backMaterial = value;
- }
- d->updates |= QGLPainter::UpdateMaterials;
-}
-
-static QGLMaterial *createColorMaterial
- (QGLMaterial *prev, const QColor& color)
-{
- QGLMaterial *material;
- if (prev)
- material = prev;
- else
- material = new QGLMaterial();
- material->setColor(color);
- return material;
-}
-
-/*!
- Sets the material that is used for drawing \a face on polygons
- to \a color. This is a convenience function for setting materials
- to simple colors.
-
- The RGB components of the ambient color of the material will be set
- to 20% of \a color, and the RGB components of the diffuse color of the
- material will be set to 80% of \a color. The alpha components of
- the ambient and diffuse material colors will both be set to the
- alpha component of \a color.
-
- If \a face is QGL::FrontFaces, then the front material is set.
- If \a face is QGL::BackFaces, then the back material is set.
- If \a face is QGL::AllFaces, then both the front and back
- materials are set.
-
- The material settings in the GL server will not be changed until
- update() is called.
-
- \sa faceMaterial(), setFaceMaterial()
-*/
-void QGLPainter::setFaceColor(QGL::Face face, const QColor& color)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (face == QGL::FrontFaces) {
- d->frontColorMaterial =
- createColorMaterial(d->frontColorMaterial, color);
- d->frontMaterial = d->frontColorMaterial;
- } else if (face == QGL::BackFaces) {
- d->backColorMaterial =
- createColorMaterial(d->backColorMaterial, color);
- d->backMaterial = d->backColorMaterial;
- } else {
- d->frontColorMaterial =
- createColorMaterial(d->frontColorMaterial, color);
- d->backColorMaterial =
- createColorMaterial(d->backColorMaterial, color);
- d->frontMaterial = d->frontColorMaterial;
- d->backMaterial = d->backColorMaterial;
- }
- d->updates |= QGLPainter::UpdateMaterials;
-}
-
-/*!
- Returns true if this painter is in object picking mode;
- false if this painter is in normal rendering mode.
-
- \sa setPicking(), objectPickId()
-*/
-bool QGLPainter::isPicking() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return (d->pick ? d->pick->isPicking : false);
-}
-
-/*!
- Enables or disables object picking mode according to \a value.
-
- If \a value is true, then the effect() will be overridden with a
- simple flat color effect that renders objects with pickColor().
- These colors can be read back later with pickObject().
-
- \sa isPicking(), objectPickId(), pickObject()
-*/
-void QGLPainter::setPicking(bool value)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (!d->pick)
- d->pick = new QGLPainterPickPrivate();
- if (d->pick->isPicking != value) {
- // Switch to/from the pick effect.
- d->pick->isPicking = value;
- if (d->effect)
- d->effect->setActive(this, false);
- d->effect = 0;
- d->ensureEffect(this);
- }
-}
-
-/*!
- Returns the current object pick identifier. The default value
- is -1 which indicates that rendered objects should not have a
- pickColor() associated with them.
-
- \sa setObjectPickId(), clearPickObjects(), pickObject()
-*/
-int QGLPainter::objectPickId() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- return (d->pick ? d->pick->objectPickId : -1);
-}
-
-/*!
- Sets the current object pick identifier to \a value. If \a value
- is -1, then subsequent objects will be rendered without a pickColor().
-
- If value is not -1, then the pickColor() is changed to a color
- that represents that object pick identifier. If \a value has been
- seen previously, then the same pickColor() as last time will
- be returned.
-
- The function call will be ignored if isPicking() is false.
-
- \sa objectPickId(), clearPickObjects(), pickObject()
-*/
-void QGLPainter::setObjectPickId(int value)
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (!d->pick || !d->pick->isPicking)
- return;
- d->pick->objectPickId = value;
- if (value != -1) {
- QRgb color = d->pick->pickObjectToColor.value(value, 0);
- if (!color) {
- color = qt_qgl_pick_color(d->pick->pickColorIndex++);
- d->pick->pickObjectToColor[value] = color;
- d->pick->pickColorToObject[color] = value;
- }
- d->pick->pickColor = color;
- d->updates |= UpdateColor;
- } else {
- d->pick->pickColor = 0;
- d->updates |= UpdateColor;
- }
-}
-
-/*!
- Clears the objectPickId() to pickColor() mappings that
- were used previously. This will also set objectPickId()
- to -1 and pickColor() to (0, 0, 0, 1).
-
- The function call will be ignored if isPicking() is false.
-
- \sa objectPickId(), pickColor()
-*/
-void QGLPainter::clearPickObjects()
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->pick && d->pick->isPicking) {
- d->pick->pickObjectToColor.clear();
- d->pick->pickColorToObject.clear();
- d->pick->pickColorIndex = 0;
- d->pick->objectPickId = -1;
- d->pick->pickColor = 0;
- d->updates |= UpdateColor;
- }
-}
-
-/*!
- Returns the current pick color to use to render the object
- associated with objectPickId(). The returned color will
- be (0, 0, 0, 1) if objectPickId() is -1.
-
- \sa objectPickId(), clearPickObjects()
-*/
-QColor QGLPainter::pickColor() const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
- if (d->pick) {
- QColor color;
- color.setRgb(d->pick->pickColor);
- return color;
- } else {
- return Qt::black;
- }
-}
-
-/*!
- Picks the color at (\a x, \a y) in the color buffer and
- returns the objectPickId() that corresponds to that color.
- Returns -1 if (\a x, \a y) is not positioned over a
- recognized object. The origin (0, 0) is assumed to be
- the bottom-left corner of the drawing surface.
-
- \sa objectPickId()
-*/
-int QGLPainter::pickObject(int x, int y) const
-{
- Q_D(QGLPainter);
- QGLPAINTER_CHECK_PRIVATE();
-
- if (!d->pick)
- {
- return -1;
- }
-
- // Fetch the color at the specified pixel.
- unsigned char data[4] = {0, 0, 0, 0};
- glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, data);
- QRgb color = qRgb(data[0], data[1], data[2]);
-
- // Normalize the color to account for floating-point rounding.
- color = qt_qgl_normalize_pick_color(color); // XXX: detect RGB444 screens.
-
- // Map the color back to an object identifier.
- return d->pick->pickColorToObject.value(color, -1);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qglpainter.h b/src/gui/extern/Qt3D/painting/qglpainter.h
deleted file mode 100644
index e6d1fc202b3b7b7872ee38d094f7a0935aa8bfca..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglpainter.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPAINTER_H
-#define QGLPAINTER_H
-
-#include <QtOpenGL/qgl.h>
-#include "qglnamespace.h"
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-#include <QtGui/qmatrix4x4.h>
-#include "qbox3d.h"
-#include "qopenglfunctions.h"
-#include "qglvertexbundle.h"
-#include "qglindexbuffer.h"
-#include "qgllightmodel.h"
-#include "qgllightparameters.h"
-#include "qglmaterial.h"
-#include "qglabstractsurface.h"
-#include "qmatrix4x4stack.h"
-#include "qglcamera.h"
-#include "qvector2darray.h"
-#include "qvector3darray.h"
-#include "qvector4darray.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLAbstractEffect;
-class QGLPainterPrivate;
-class QGLTexture2D;
-class QGLTextureCube;
-class QGeometryData;
-class QGLShaderProgram;
-class QGLFramebufferObject;
-class QGLSceneNode;
-class QGLRenderSequencer;
-class QGLAbstractSurface;
-
-class Q_QT3D_EXPORT QGLPainter : public QOpenGLFunctions
-{
-public:
- QGLPainter();
- explicit QGLPainter(const QGLContext *context);
- explicit QGLPainter(QGLWidget *widget);
- explicit QGLPainter(QPainter *painter);
- explicit QGLPainter(QGLAbstractSurface *surface);
- virtual ~QGLPainter();
-
- bool begin();
- bool begin(const QGLContext *context);
- bool begin(QGLWidget *widget);
- bool begin(QPainter *painter);
- bool begin(QGLAbstractSurface *surface);
- bool end();
- bool isActive() const;
-
- const QGLContext *context() const;
-
- bool isFixedFunction() const;
-
- enum Update
- {
- UpdateColor = 0x00000001,
- UpdateModelViewMatrix = 0x00000002,
- UpdateProjectionMatrix = 0x00000004,
- UpdateMatrices = 0x00000006,
- UpdateLights = 0x00000008,
- UpdateMaterials = 0x00000010,
- UpdateViewport = 0x00000020,
- UpdateAll = 0x7FFFFFFF
- };
- Q_DECLARE_FLAGS(Updates, Update);
-
- void setClearColor(const QColor& color);
-
- void setScissor(const QRect& rect);
-
- QMatrix4x4Stack& projectionMatrix();
- QMatrix4x4Stack& modelViewMatrix();
- QMatrix4x4 combinedMatrix() const;
- QMatrix3x3 normalMatrix() const;
- QMatrix4x4 worldMatrix() const;
-
- QGL::Eye eye() const;
- void setEye(QGL::Eye eye);
-
- void setCamera(const QGLCamera *camera);
-
- bool isCullable(const QVector3D& point) const;
- bool isCullable(const QBox3D& box) const;
- QGLRenderSequencer *renderSequencer();
-
- qreal aspectRatio() const;
-
- QGLAbstractEffect *effect() const;
-
- QGLAbstractEffect *userEffect() const;
- void setUserEffect(QGLAbstractEffect *effect);
-
- QGL::StandardEffect standardEffect() const;
- void setStandardEffect(QGL::StandardEffect effect);
-
- void disableEffect();
-
- QGLShaderProgram *cachedProgram(const QString& name) const;
- void setCachedProgram(const QString& name, QGLShaderProgram *program);
-
- QColor color() const;
- void setColor(const QColor& color);
-
- QGLAttributeSet attributes() const;
- void clearAttributes();
-
- void setVertexAttribute
- (QGL::VertexAttribute attribute, const QGLAttributeValue& value);
- void setVertexBundle(const QGLVertexBundle& buffer);
-
- void update();
- void updateFixedFunction(QGLPainter::Updates updates);
-
- void draw(QGL::DrawingMode mode, int count, int index = 0);
- void draw(QGL::DrawingMode mode, const ushort *indices, int count);
- void draw(QGL::DrawingMode mode, const QGLIndexBuffer& indices);
- virtual void draw(QGL::DrawingMode mode, const QGLIndexBuffer& indices, int offset, int count);
-
- void pushSurface(QGLAbstractSurface *surface);
- QGLAbstractSurface *popSurface();
- void setSurface(QGLAbstractSurface *surface);
- QGLAbstractSurface *currentSurface() const;
-
- const QGLLightModel *lightModel() const;
- void setLightModel(const QGLLightModel *value);
-
- const QGLLightParameters *mainLight() const;
- void setMainLight(const QGLLightParameters *parameters);
- void setMainLight
- (const QGLLightParameters *parameters, const QMatrix4x4& transform);
- QMatrix4x4 mainLightTransform() const;
-
- int addLight(const QGLLightParameters *parameters);
- int addLight(const QGLLightParameters *parameters, const QMatrix4x4 &transform);
- void removeLight(int lightId);
-
- int maximumLightId() const;
- const QGLLightParameters *light(int lightId) const;
- QMatrix4x4 lightTransform(int lightId) const;
-
- const QGLMaterial *faceMaterial(QGL::Face face) const;
- void setFaceMaterial(QGL::Face face, const QGLMaterial *value);
- void setFaceColor(QGL::Face face, const QColor& color);
-
- bool isPicking() const;
- void setPicking(bool value);
-
- int objectPickId() const;
- void setObjectPickId(int value);
- void clearPickObjects();
-
- QColor pickColor() const;
-
- int pickObject(int x, int y) const;
-
-private:
- Q_DISABLE_COPY(QGLPainter)
-
- QGLPainterPrivate *d_ptr;
-
- QGLPainterPrivate *d_func() const { return d_ptr; }
-
- friend class QGLAbstractEffect;
-
- bool begin(const QGLContext *context, QGLAbstractSurface *surface,
- bool destroySurface = true);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLPainter::Updates)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qglpainter_p.h b/src/gui/extern/Qt3D/painting/qglpainter_p.h
deleted file mode 100644
index 5e93f3bdba99238d62387750ae1bbab85493a0d1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglpainter_p.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPAINTER_P_H
-#define QGLPAINTER_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglpainter.h"
-#include "qglrendersequencer.h"
-
-#include <QtCore/qatomic.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qstack.h>
-
-QT_BEGIN_NAMESPACE
-
-#define QGL_MAX_LIGHTS 32
-#define QGL_MAX_STD_EFFECTS 16
-
-class QGLPainterPickPrivate
-{
-public:
- QGLPainterPickPrivate();
- ~QGLPainterPickPrivate();
-
- bool isPicking;
- int objectPickId;
- int pickColorIndex;
- QRgb pickColor;
- QMap<int, QRgb> pickObjectToColor;
- QMap<QRgb, int> pickColorToObject;
- QGLAbstractEffect *defaultPickEffect;
-};
-
-struct QGLPainterSurfaceInfo
-{
- QGLAbstractSurface *surface;
- bool destroySurface;
- bool mainSurface;
-};
-
-class QGLPainterPrivate
-{
-public:
- QGLPainterPrivate();
- ~QGLPainterPrivate();
-
- QAtomicInt ref;
- const QGLContext *context;
- QMatrix4x4Stack projectionMatrix;
- QMatrix4x4Stack modelViewMatrix;
- QMatrix4x4 inverseEyeMatrix;
- QGL::Eye eye;
- QGLAbstractEffect *effect;
- QGLAbstractEffect *userEffect;
- QGL::StandardEffect standardEffect;
- QGLAbstractEffect *stdeffects[QGL_MAX_STD_EFFECTS];
- const QGLLightModel *lightModel;
- QGLLightModel *defaultLightModel;
- QGLLightParameters *defaultLight;
- QArray<const QGLLightParameters *> lights;
- QArray<QMatrix4x4> lightTransforms;
- const QGLMaterial *frontMaterial;
- const QGLMaterial *backMaterial;
- QGLMaterial *defaultMaterial;
- QGLMaterial *frontColorMaterial;
- QGLMaterial *backColorMaterial;
- QBox3D viewingCube;
- QColor color;
- QGLPainter::Updates updates;
- QGLPainterPickPrivate *pick;
- QMap<QString, QGLShaderProgram *> cachedPrograms;
- QStack<QGLPainterSurfaceInfo> surfaceStack;
- GLuint boundVertexBuffer;
- GLuint boundIndexBuffer;
- QGLRenderSequencer *renderSequencer;
- bool isFixedFunction;
- QGLAttributeSet attributeSet;
-
- inline void ensureEffect(QGLPainter *painter)
- { if (!effect) createEffect(painter); }
- void createEffect(QGLPainter *painter);
-};
-
-class QGLPainterPrivateCache : public QObject
-{
- Q_OBJECT
-public:
- QGLPainterPrivateCache();
- ~QGLPainterPrivateCache();
-
- QMap<const QGLContext *, QGLPainterPrivate *> cache;
-
- QGLPainterPrivate *fromContext(const QGLContext *context);
-
- static QGLPainterPrivateCache *instance();
-
-public Q_SLOTS:
- void contextDestroyed(const QGLContext *context);
-
-Q_SIGNALS:
- void destroyedContext(const QGLContext *context);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qglpickcolors.cpp b/src/gui/extern/Qt3D/painting/qglpickcolors.cpp
deleted file mode 100644
index 123fd33caf3c7d8e8302969480cad8c4e5fb0a7b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglpickcolors.cpp
+++ /dev/null
@@ -1,1125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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$
-**
-****************************************************************************/
-
-#if !defined(QGL_GENERATOR_PROGRAM)
-
-#include "qglpickcolors_p.h"
-
-QT_BEGIN_NAMESPACE
-
-// The following tables are generated by the program listed at the
-// end of this source file.
-
-static int const pickColors[4096] = {
- 0xffffff, 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0xff00ff, 0x00ffff,
- 0xff8000, 0x80ff00, 0x8000ff, 0xff0080, 0x0080ff, 0x00ff80, 0xff80ff,
- 0x80ffff, 0xffff80, 0x80ff80, 0xff8080, 0x8080ff, 0x808080, 0x800000,
- 0x008000, 0x000080, 0x808000, 0x800080, 0x008080, 0xff80c0, 0x80c0ff,
- 0xc0ff80, 0xffc080, 0x80ffc0, 0xc080ff, 0xffc000, 0xc0ff00, 0xc000ff,
- 0xff00c0, 0x00c0ff, 0x00ffc0, 0xffc0ff, 0xc0ffff, 0xffffc0, 0xc0ffc0,
- 0xffc0c0, 0xc0c0ff, 0x80c000, 0xc08000, 0xc00080, 0x8000c0, 0x00c080,
- 0x0080c0, 0x80c080, 0xc08080, 0x8080c0, 0xc080c0, 0x80c0c0, 0xc0c080,
- 0xc0c0c0, 0xc00000, 0x00c000, 0x0000c0, 0xc0c000, 0xc000c0, 0x00c0c0,
- 0xff8040, 0x8040ff, 0x40ff80, 0xff4080, 0x80ff40, 0x4080ff, 0xffc040,
- 0xc040ff, 0x40ffc0, 0xff40c0, 0xc0ff40, 0x40c0ff, 0xff4000, 0x40ff00,
- 0x4000ff, 0xff0040, 0x0040ff, 0x00ff40, 0xff40ff, 0x40ffff, 0xffff40,
- 0x40ff40, 0xff4040, 0x4040ff, 0x80c040, 0xc04080, 0x4080c0, 0x8040c0,
- 0xc08040, 0x40c080, 0x804000, 0x408000, 0x400080, 0x800040, 0x004080,
- 0x008040, 0x804080, 0x408080, 0x808040, 0x408040, 0x804040, 0x404080,
- 0xc04000, 0x40c000, 0x4000c0, 0xc00040, 0x0040c0, 0x00c040, 0xc040c0,
- 0x40c0c0, 0xc0c040, 0x40c040, 0xc04040, 0x4040c0, 0x404040, 0x400000,
- 0x004000, 0x000040, 0x404000, 0x400040, 0x004040, 0xff80e0, 0x80e0ff,
- 0xe0ff80, 0xffe080, 0x80ffe0, 0xe080ff, 0xffc0e0, 0xc0e0ff, 0xe0ffc0,
- 0xffe0c0, 0xc0ffe0, 0xe0c0ff, 0xff40e0, 0x40e0ff, 0xe0ff40, 0xffe040,
- 0x40ffe0, 0xe040ff, 0xffe000, 0xe0ff00, 0xe000ff, 0xff00e0, 0x00e0ff,
- 0x00ffe0, 0xffe0ff, 0xe0ffff, 0xffffe0, 0xe0ffe0, 0xffe0e0, 0xe0e0ff,
- 0x80c0e0, 0xc0e080, 0xe080c0, 0x80e0c0, 0xc080e0, 0xe0c080, 0x8040e0,
- 0x40e080, 0xe08040, 0x80e040, 0x4080e0, 0xe04080, 0x80e000, 0xe08000,
- 0xe00080, 0x8000e0, 0x00e080, 0x0080e0, 0x80e080, 0xe08080, 0x8080e0,
- 0xe080e0, 0x80e0e0, 0xe0e080, 0xc040e0, 0x40e0c0, 0xe0c040, 0xc0e040,
- 0x40c0e0, 0xe040c0, 0xc0e000, 0xe0c000, 0xe000c0, 0xc000e0, 0x00e0c0,
- 0x00c0e0, 0xc0e0c0, 0xe0c0c0, 0xc0c0e0, 0xe0c0e0, 0xc0e0e0, 0xe0e0c0,
- 0x40e000, 0xe04000, 0xe00040, 0x4000e0, 0x00e040, 0x0040e0, 0x40e040,
- 0xe04040, 0x4040e0, 0xe040e0, 0x40e0e0, 0xe0e040, 0xe0e0e0, 0xe00000,
- 0x00e000, 0x0000e0, 0xe0e000, 0xe000e0, 0x00e0e0, 0xff8060, 0x8060ff,
- 0x60ff80, 0xff6080, 0x80ff60, 0x6080ff, 0xffc060, 0xc060ff, 0x60ffc0,
- 0xff60c0, 0xc0ff60, 0x60c0ff, 0xff4060, 0x4060ff, 0x60ff40, 0xff6040,
- 0x40ff60, 0x6040ff, 0xffe060, 0xe060ff, 0x60ffe0, 0xff60e0, 0xe0ff60,
- 0x60e0ff, 0xff6000, 0x60ff00, 0x6000ff, 0xff0060, 0x0060ff, 0x00ff60,
- 0xff60ff, 0x60ffff, 0xffff60, 0x60ff60, 0xff6060, 0x6060ff, 0x80c060,
- 0xc06080, 0x6080c0, 0x8060c0, 0xc08060, 0x60c080, 0x804060, 0x406080,
- 0x608040, 0x806040, 0x408060, 0x604080, 0x80e060, 0xe06080, 0x6080e0,
- 0x8060e0, 0xe08060, 0x60e080, 0x806000, 0x608000, 0x600080, 0x800060,
- 0x006080, 0x008060, 0x806080, 0x608080, 0x808060, 0x608060, 0x806060,
- 0x606080, 0xc04060, 0x4060c0, 0x60c040, 0xc06040, 0x40c060, 0x6040c0,
- 0xc0e060, 0xe060c0, 0x60c0e0, 0xc060e0, 0xe0c060, 0x60e0c0, 0xc06000,
- 0x60c000, 0x6000c0, 0xc00060, 0x0060c0, 0x00c060, 0xc060c0, 0x60c0c0,
- 0xc0c060, 0x60c060, 0xc06060, 0x6060c0, 0x40e060, 0xe06040, 0x6040e0,
- 0x4060e0, 0xe04060, 0x60e040, 0x406000, 0x604000, 0x600040, 0x400060,
- 0x006040, 0x004060, 0x406040, 0x604040, 0x404060, 0x604060, 0x406060,
- 0x606040, 0xe06000, 0x60e000, 0x6000e0, 0xe00060, 0x0060e0, 0x00e060,
- 0xe060e0, 0x60e0e0, 0xe0e060, 0x60e060, 0xe06060, 0x6060e0, 0x606060,
- 0x600000, 0x006000, 0x000060, 0x606000, 0x600060, 0x006060, 0xff80a0,
- 0x80a0ff, 0xa0ff80, 0xffa080, 0x80ffa0, 0xa080ff, 0xffc0a0, 0xc0a0ff,
- 0xa0ffc0, 0xffa0c0, 0xc0ffa0, 0xa0c0ff, 0xff40a0, 0x40a0ff, 0xa0ff40,
- 0xffa040, 0x40ffa0, 0xa040ff, 0xffe0a0, 0xe0a0ff, 0xa0ffe0, 0xffa0e0,
- 0xe0ffa0, 0xa0e0ff, 0xff60a0, 0x60a0ff, 0xa0ff60, 0xffa060, 0x60ffa0,
- 0xa060ff, 0xffa000, 0xa0ff00, 0xa000ff, 0xff00a0, 0x00a0ff, 0x00ffa0,
- 0xffa0ff, 0xa0ffff, 0xffffa0, 0xa0ffa0, 0xffa0a0, 0xa0a0ff, 0x80c0a0,
- 0xc0a080, 0xa080c0, 0x80a0c0, 0xc080a0, 0xa0c080, 0x8040a0, 0x40a080,
- 0xa08040, 0x80a040, 0x4080a0, 0xa04080, 0x80e0a0, 0xe0a080, 0xa080e0,
- 0x80a0e0, 0xe080a0, 0xa0e080, 0x8060a0, 0x60a080, 0xa08060, 0x80a060,
- 0x6080a0, 0xa06080, 0x80a000, 0xa08000, 0xa00080, 0x8000a0, 0x00a080,
- 0x0080a0, 0x80a080, 0xa08080, 0x8080a0, 0xa080a0, 0x80a0a0, 0xa0a080,
- 0xc040a0, 0x40a0c0, 0xa0c040, 0xc0a040, 0x40c0a0, 0xa040c0, 0xc0e0a0,
- 0xe0a0c0, 0xa0c0e0, 0xc0a0e0, 0xe0c0a0, 0xa0e0c0, 0xc060a0, 0x60a0c0,
- 0xa0c060, 0xc0a060, 0x60c0a0, 0xa060c0, 0xc0a000, 0xa0c000, 0xa000c0,
- 0xc000a0, 0x00a0c0, 0x00c0a0, 0xc0a0c0, 0xa0c0c0, 0xc0c0a0, 0xa0c0a0,
- 0xc0a0a0, 0xa0a0c0, 0x40e0a0, 0xe0a040, 0xa040e0, 0x40a0e0, 0xe040a0,
- 0xa0e040, 0x4060a0, 0x60a040, 0xa04060, 0x40a060, 0x6040a0, 0xa06040,
- 0x40a000, 0xa04000, 0xa00040, 0x4000a0, 0x00a040, 0x0040a0, 0x40a040,
- 0xa04040, 0x4040a0, 0xa040a0, 0x40a0a0, 0xa0a040, 0xe060a0, 0x60a0e0,
- 0xa0e060, 0xe0a060, 0x60e0a0, 0xa060e0, 0xe0a000, 0xa0e000, 0xa000e0,
- 0xe000a0, 0x00a0e0, 0x00e0a0, 0xe0a0e0, 0xa0e0e0, 0xe0e0a0, 0xa0e0a0,
- 0xe0a0a0, 0xa0a0e0, 0x60a000, 0xa06000, 0xa00060, 0x6000a0, 0x00a060,
- 0x0060a0, 0x60a060, 0xa06060, 0x6060a0, 0xa060a0, 0x60a0a0, 0xa0a060,
- 0xa0a0a0, 0xa00000, 0x00a000, 0x0000a0, 0xa0a000, 0xa000a0, 0x00a0a0,
- 0xff8020, 0x8020ff, 0x20ff80, 0xff2080, 0x80ff20, 0x2080ff, 0xffc020,
- 0xc020ff, 0x20ffc0, 0xff20c0, 0xc0ff20, 0x20c0ff, 0xff4020, 0x4020ff,
- 0x20ff40, 0xff2040, 0x40ff20, 0x2040ff, 0xffe020, 0xe020ff, 0x20ffe0,
- 0xff20e0, 0xe0ff20, 0x20e0ff, 0xff6020, 0x6020ff, 0x20ff60, 0xff2060,
- 0x60ff20, 0x2060ff, 0xffa020, 0xa020ff, 0x20ffa0, 0xff20a0, 0xa0ff20,
- 0x20a0ff, 0xff2000, 0x20ff00, 0x2000ff, 0xff0020, 0x0020ff, 0x00ff20,
- 0xff20ff, 0x20ffff, 0xffff20, 0x20ff20, 0xff2020, 0x2020ff, 0x80c020,
- 0xc02080, 0x2080c0, 0x8020c0, 0xc08020, 0x20c080, 0x804020, 0x402080,
- 0x208040, 0x802040, 0x408020, 0x204080, 0x80e020, 0xe02080, 0x2080e0,
- 0x8020e0, 0xe08020, 0x20e080, 0x806020, 0x602080, 0x208060, 0x802060,
- 0x608020, 0x206080, 0x80a020, 0xa02080, 0x2080a0, 0x8020a0, 0xa08020,
- 0x20a080, 0x802000, 0x208000, 0x200080, 0x800020, 0x002080, 0x008020,
- 0x802080, 0x208080, 0x808020, 0x208020, 0x802020, 0x202080, 0xc04020,
- 0x4020c0, 0x20c040, 0xc02040, 0x40c020, 0x2040c0, 0xc0e020, 0xe020c0,
- 0x20c0e0, 0xc020e0, 0xe0c020, 0x20e0c0, 0xc06020, 0x6020c0, 0x20c060,
- 0xc02060, 0x60c020, 0x2060c0, 0xc0a020, 0xa020c0, 0x20c0a0, 0xc020a0,
- 0xa0c020, 0x20a0c0, 0xc02000, 0x20c000, 0x2000c0, 0xc00020, 0x0020c0,
- 0x00c020, 0xc020c0, 0x20c0c0, 0xc0c020, 0x20c020, 0xc02020, 0x2020c0,
- 0x40e020, 0xe02040, 0x2040e0, 0x4020e0, 0xe04020, 0x20e040, 0x406020,
- 0x602040, 0x204060, 0x402060, 0x604020, 0x206040, 0x40a020, 0xa02040,
- 0x2040a0, 0x4020a0, 0xa04020, 0x20a040, 0x402000, 0x204000, 0x200040,
- 0x400020, 0x002040, 0x004020, 0x402040, 0x204040, 0x404020, 0x204020,
- 0x402020, 0x202040, 0xe06020, 0x6020e0, 0x20e060, 0xe02060, 0x60e020,
- 0x2060e0, 0xe0a020, 0xa020e0, 0x20e0a0, 0xe020a0, 0xa0e020, 0x20a0e0,
- 0xe02000, 0x20e000, 0x2000e0, 0xe00020, 0x0020e0, 0x00e020, 0xe020e0,
- 0x20e0e0, 0xe0e020, 0x20e020, 0xe02020, 0x2020e0, 0x60a020, 0xa02060,
- 0x2060a0, 0x6020a0, 0xa06020, 0x20a060, 0x602000, 0x206000, 0x200060,
- 0x600020, 0x002060, 0x006020, 0x602060, 0x206060, 0x606020, 0x206020,
- 0x602020, 0x202060, 0xa02000, 0x20a000, 0x2000a0, 0xa00020, 0x0020a0,
- 0x00a020, 0xa020a0, 0x20a0a0, 0xa0a020, 0x20a020, 0xa02020, 0x2020a0,
- 0x202020, 0x200000, 0x002000, 0x000020, 0x202000, 0x200020, 0x002020,
- 0xff80f0, 0x80f0ff, 0xf0ff80, 0xfff080, 0x80fff0, 0xf080ff, 0xffc0f0,
- 0xc0f0ff, 0xf0ffc0, 0xfff0c0, 0xc0fff0, 0xf0c0ff, 0xff40f0, 0x40f0ff,
- 0xf0ff40, 0xfff040, 0x40fff0, 0xf040ff, 0xffe0f0, 0xe0f0ff, 0xf0ffe0,
- 0xfff0e0, 0xe0fff0, 0xf0e0ff, 0xff60f0, 0x60f0ff, 0xf0ff60, 0xfff060,
- 0x60fff0, 0xf060ff, 0xffa0f0, 0xa0f0ff, 0xf0ffa0, 0xfff0a0, 0xa0fff0,
- 0xf0a0ff, 0xff20f0, 0x20f0ff, 0xf0ff20, 0xfff020, 0x20fff0, 0xf020ff,
- 0xfff000, 0xf0ff00, 0xf000ff, 0xff00f0, 0x00f0ff, 0x00fff0, 0xfff0ff,
- 0xf0ffff, 0xfffff0, 0xf0fff0, 0xfff0f0, 0xf0f0ff, 0x80c0f0, 0xc0f080,
- 0xf080c0, 0x80f0c0, 0xc080f0, 0xf0c080, 0x8040f0, 0x40f080, 0xf08040,
- 0x80f040, 0x4080f0, 0xf04080, 0x80e0f0, 0xe0f080, 0xf080e0, 0x80f0e0,
- 0xe080f0, 0xf0e080, 0x8060f0, 0x60f080, 0xf08060, 0x80f060, 0x6080f0,
- 0xf06080, 0x80a0f0, 0xa0f080, 0xf080a0, 0x80f0a0, 0xa080f0, 0xf0a080,
- 0x8020f0, 0x20f080, 0xf08020, 0x80f020, 0x2080f0, 0xf02080, 0x80f000,
- 0xf08000, 0xf00080, 0x8000f0, 0x00f080, 0x0080f0, 0x80f080, 0xf08080,
- 0x8080f0, 0xf080f0, 0x80f0f0, 0xf0f080, 0xc040f0, 0x40f0c0, 0xf0c040,
- 0xc0f040, 0x40c0f0, 0xf040c0, 0xc0e0f0, 0xe0f0c0, 0xf0c0e0, 0xc0f0e0,
- 0xe0c0f0, 0xf0e0c0, 0xc060f0, 0x60f0c0, 0xf0c060, 0xc0f060, 0x60c0f0,
- 0xf060c0, 0xc0a0f0, 0xa0f0c0, 0xf0c0a0, 0xc0f0a0, 0xa0c0f0, 0xf0a0c0,
- 0xc020f0, 0x20f0c0, 0xf0c020, 0xc0f020, 0x20c0f0, 0xf020c0, 0xc0f000,
- 0xf0c000, 0xf000c0, 0xc000f0, 0x00f0c0, 0x00c0f0, 0xc0f0c0, 0xf0c0c0,
- 0xc0c0f0, 0xf0c0f0, 0xc0f0f0, 0xf0f0c0, 0x40e0f0, 0xe0f040, 0xf040e0,
- 0x40f0e0, 0xe040f0, 0xf0e040, 0x4060f0, 0x60f040, 0xf04060, 0x40f060,
- 0x6040f0, 0xf06040, 0x40a0f0, 0xa0f040, 0xf040a0, 0x40f0a0, 0xa040f0,
- 0xf0a040, 0x4020f0, 0x20f040, 0xf04020, 0x40f020, 0x2040f0, 0xf02040,
- 0x40f000, 0xf04000, 0xf00040, 0x4000f0, 0x00f040, 0x0040f0, 0x40f040,
- 0xf04040, 0x4040f0, 0xf040f0, 0x40f0f0, 0xf0f040, 0xe060f0, 0x60f0e0,
- 0xf0e060, 0xe0f060, 0x60e0f0, 0xf060e0, 0xe0a0f0, 0xa0f0e0, 0xf0e0a0,
- 0xe0f0a0, 0xa0e0f0, 0xf0a0e0, 0xe020f0, 0x20f0e0, 0xf0e020, 0xe0f020,
- 0x20e0f0, 0xf020e0, 0xe0f000, 0xf0e000, 0xf000e0, 0xe000f0, 0x00f0e0,
- 0x00e0f0, 0xe0f0e0, 0xf0e0e0, 0xe0e0f0, 0xf0e0f0, 0xe0f0f0, 0xf0f0e0,
- 0x60a0f0, 0xa0f060, 0xf060a0, 0x60f0a0, 0xa060f0, 0xf0a060, 0x6020f0,
- 0x20f060, 0xf06020, 0x60f020, 0x2060f0, 0xf02060, 0x60f000, 0xf06000,
- 0xf00060, 0x6000f0, 0x00f060, 0x0060f0, 0x60f060, 0xf06060, 0x6060f0,
- 0xf060f0, 0x60f0f0, 0xf0f060, 0xa020f0, 0x20f0a0, 0xf0a020, 0xa0f020,
- 0x20a0f0, 0xf020a0, 0xa0f000, 0xf0a000, 0xf000a0, 0xa000f0, 0x00f0a0,
- 0x00a0f0, 0xa0f0a0, 0xf0a0a0, 0xa0a0f0, 0xf0a0f0, 0xa0f0f0, 0xf0f0a0,
- 0x20f000, 0xf02000, 0xf00020, 0x2000f0, 0x00f020, 0x0020f0, 0x20f020,
- 0xf02020, 0x2020f0, 0xf020f0, 0x20f0f0, 0xf0f020, 0xf0f0f0, 0xf00000,
- 0x00f000, 0x0000f0, 0xf0f000, 0xf000f0, 0x00f0f0, 0xff80b0, 0x80b0ff,
- 0xb0ff80, 0xffb080, 0x80ffb0, 0xb080ff, 0xffc0b0, 0xc0b0ff, 0xb0ffc0,
- 0xffb0c0, 0xc0ffb0, 0xb0c0ff, 0xff40b0, 0x40b0ff, 0xb0ff40, 0xffb040,
- 0x40ffb0, 0xb040ff, 0xffe0b0, 0xe0b0ff, 0xb0ffe0, 0xffb0e0, 0xe0ffb0,
- 0xb0e0ff, 0xff60b0, 0x60b0ff, 0xb0ff60, 0xffb060, 0x60ffb0, 0xb060ff,
- 0xffa0b0, 0xa0b0ff, 0xb0ffa0, 0xffb0a0, 0xa0ffb0, 0xb0a0ff, 0xff20b0,
- 0x20b0ff, 0xb0ff20, 0xffb020, 0x20ffb0, 0xb020ff, 0xfff0b0, 0xf0b0ff,
- 0xb0fff0, 0xffb0f0, 0xf0ffb0, 0xb0f0ff, 0xffb000, 0xb0ff00, 0xb000ff,
- 0xff00b0, 0x00b0ff, 0x00ffb0, 0xffb0ff, 0xb0ffff, 0xffffb0, 0xb0ffb0,
- 0xffb0b0, 0xb0b0ff, 0x80c0b0, 0xc0b080, 0xb080c0, 0x80b0c0, 0xc080b0,
- 0xb0c080, 0x8040b0, 0x40b080, 0xb08040, 0x80b040, 0x4080b0, 0xb04080,
- 0x80e0b0, 0xe0b080, 0xb080e0, 0x80b0e0, 0xe080b0, 0xb0e080, 0x8060b0,
- 0x60b080, 0xb08060, 0x80b060, 0x6080b0, 0xb06080, 0x80a0b0, 0xa0b080,
- 0xb080a0, 0x80b0a0, 0xa080b0, 0xb0a080, 0x8020b0, 0x20b080, 0xb08020,
- 0x80b020, 0x2080b0, 0xb02080, 0x80f0b0, 0xf0b080, 0xb080f0, 0x80b0f0,
- 0xf080b0, 0xb0f080, 0x80b000, 0xb08000, 0xb00080, 0x8000b0, 0x00b080,
- 0x0080b0, 0x80b080, 0xb08080, 0x8080b0, 0xb080b0, 0x80b0b0, 0xb0b080,
- 0xc040b0, 0x40b0c0, 0xb0c040, 0xc0b040, 0x40c0b0, 0xb040c0, 0xc0e0b0,
- 0xe0b0c0, 0xb0c0e0, 0xc0b0e0, 0xe0c0b0, 0xb0e0c0, 0xc060b0, 0x60b0c0,
- 0xb0c060, 0xc0b060, 0x60c0b0, 0xb060c0, 0xc0a0b0, 0xa0b0c0, 0xb0c0a0,
- 0xc0b0a0, 0xa0c0b0, 0xb0a0c0, 0xc020b0, 0x20b0c0, 0xb0c020, 0xc0b020,
- 0x20c0b0, 0xb020c0, 0xc0f0b0, 0xf0b0c0, 0xb0c0f0, 0xc0b0f0, 0xf0c0b0,
- 0xb0f0c0, 0xc0b000, 0xb0c000, 0xb000c0, 0xc000b0, 0x00b0c0, 0x00c0b0,
- 0xc0b0c0, 0xb0c0c0, 0xc0c0b0, 0xb0c0b0, 0xc0b0b0, 0xb0b0c0, 0x40e0b0,
- 0xe0b040, 0xb040e0, 0x40b0e0, 0xe040b0, 0xb0e040, 0x4060b0, 0x60b040,
- 0xb04060, 0x40b060, 0x6040b0, 0xb06040, 0x40a0b0, 0xa0b040, 0xb040a0,
- 0x40b0a0, 0xa040b0, 0xb0a040, 0x4020b0, 0x20b040, 0xb04020, 0x40b020,
- 0x2040b0, 0xb02040, 0x40f0b0, 0xf0b040, 0xb040f0, 0x40b0f0, 0xf040b0,
- 0xb0f040, 0x40b000, 0xb04000, 0xb00040, 0x4000b0, 0x00b040, 0x0040b0,
- 0x40b040, 0xb04040, 0x4040b0, 0xb040b0, 0x40b0b0, 0xb0b040, 0xe060b0,
- 0x60b0e0, 0xb0e060, 0xe0b060, 0x60e0b0, 0xb060e0, 0xe0a0b0, 0xa0b0e0,
- 0xb0e0a0, 0xe0b0a0, 0xa0e0b0, 0xb0a0e0, 0xe020b0, 0x20b0e0, 0xb0e020,
- 0xe0b020, 0x20e0b0, 0xb020e0, 0xe0f0b0, 0xf0b0e0, 0xb0e0f0, 0xe0b0f0,
- 0xf0e0b0, 0xb0f0e0, 0xe0b000, 0xb0e000, 0xb000e0, 0xe000b0, 0x00b0e0,
- 0x00e0b0, 0xe0b0e0, 0xb0e0e0, 0xe0e0b0, 0xb0e0b0, 0xe0b0b0, 0xb0b0e0,
- 0x60a0b0, 0xa0b060, 0xb060a0, 0x60b0a0, 0xa060b0, 0xb0a060, 0x6020b0,
- 0x20b060, 0xb06020, 0x60b020, 0x2060b0, 0xb02060, 0x60f0b0, 0xf0b060,
- 0xb060f0, 0x60b0f0, 0xf060b0, 0xb0f060, 0x60b000, 0xb06000, 0xb00060,
- 0x6000b0, 0x00b060, 0x0060b0, 0x60b060, 0xb06060, 0x6060b0, 0xb060b0,
- 0x60b0b0, 0xb0b060, 0xa020b0, 0x20b0a0, 0xb0a020, 0xa0b020, 0x20a0b0,
- 0xb020a0, 0xa0f0b0, 0xf0b0a0, 0xb0a0f0, 0xa0b0f0, 0xf0a0b0, 0xb0f0a0,
- 0xa0b000, 0xb0a000, 0xb000a0, 0xa000b0, 0x00b0a0, 0x00a0b0, 0xa0b0a0,
- 0xb0a0a0, 0xa0a0b0, 0xb0a0b0, 0xa0b0b0, 0xb0b0a0, 0x20f0b0, 0xf0b020,
- 0xb020f0, 0x20b0f0, 0xf020b0, 0xb0f020, 0x20b000, 0xb02000, 0xb00020,
- 0x2000b0, 0x00b020, 0x0020b0, 0x20b020, 0xb02020, 0x2020b0, 0xb020b0,
- 0x20b0b0, 0xb0b020, 0xf0b000, 0xb0f000, 0xb000f0, 0xf000b0, 0x00b0f0,
- 0x00f0b0, 0xf0b0f0, 0xb0f0f0, 0xf0f0b0, 0xb0f0b0, 0xf0b0b0, 0xb0b0f0,
- 0xb0b0b0, 0xb00000, 0x00b000, 0x0000b0, 0xb0b000, 0xb000b0, 0x00b0b0,
- 0xff8050, 0x8050ff, 0x50ff80, 0xff5080, 0x80ff50, 0x5080ff, 0xffc050,
- 0xc050ff, 0x50ffc0, 0xff50c0, 0xc0ff50, 0x50c0ff, 0xff4050, 0x4050ff,
- 0x50ff40, 0xff5040, 0x40ff50, 0x5040ff, 0xffe050, 0xe050ff, 0x50ffe0,
- 0xff50e0, 0xe0ff50, 0x50e0ff, 0xff6050, 0x6050ff, 0x50ff60, 0xff5060,
- 0x60ff50, 0x5060ff, 0xffa050, 0xa050ff, 0x50ffa0, 0xff50a0, 0xa0ff50,
- 0x50a0ff, 0xff2050, 0x2050ff, 0x50ff20, 0xff5020, 0x20ff50, 0x5020ff,
- 0xfff050, 0xf050ff, 0x50fff0, 0xff50f0, 0xf0ff50, 0x50f0ff, 0xffb050,
- 0xb050ff, 0x50ffb0, 0xff50b0, 0xb0ff50, 0x50b0ff, 0xff5000, 0x50ff00,
- 0x5000ff, 0xff0050, 0x0050ff, 0x00ff50, 0xff50ff, 0x50ffff, 0xffff50,
- 0x50ff50, 0xff5050, 0x5050ff, 0x80c050, 0xc05080, 0x5080c0, 0x8050c0,
- 0xc08050, 0x50c080, 0x804050, 0x405080, 0x508040, 0x805040, 0x408050,
- 0x504080, 0x80e050, 0xe05080, 0x5080e0, 0x8050e0, 0xe08050, 0x50e080,
- 0x806050, 0x605080, 0x508060, 0x805060, 0x608050, 0x506080, 0x80a050,
- 0xa05080, 0x5080a0, 0x8050a0, 0xa08050, 0x50a080, 0x802050, 0x205080,
- 0x508020, 0x805020, 0x208050, 0x502080, 0x80f050, 0xf05080, 0x5080f0,
- 0x8050f0, 0xf08050, 0x50f080, 0x80b050, 0xb05080, 0x5080b0, 0x8050b0,
- 0xb08050, 0x50b080, 0x805000, 0x508000, 0x500080, 0x800050, 0x005080,
- 0x008050, 0x805080, 0x508080, 0x808050, 0x508050, 0x805050, 0x505080,
- 0xc04050, 0x4050c0, 0x50c040, 0xc05040, 0x40c050, 0x5040c0, 0xc0e050,
- 0xe050c0, 0x50c0e0, 0xc050e0, 0xe0c050, 0x50e0c0, 0xc06050, 0x6050c0,
- 0x50c060, 0xc05060, 0x60c050, 0x5060c0, 0xc0a050, 0xa050c0, 0x50c0a0,
- 0xc050a0, 0xa0c050, 0x50a0c0, 0xc02050, 0x2050c0, 0x50c020, 0xc05020,
- 0x20c050, 0x5020c0, 0xc0f050, 0xf050c0, 0x50c0f0, 0xc050f0, 0xf0c050,
- 0x50f0c0, 0xc0b050, 0xb050c0, 0x50c0b0, 0xc050b0, 0xb0c050, 0x50b0c0,
- 0xc05000, 0x50c000, 0x5000c0, 0xc00050, 0x0050c0, 0x00c050, 0xc050c0,
- 0x50c0c0, 0xc0c050, 0x50c050, 0xc05050, 0x5050c0, 0x40e050, 0xe05040,
- 0x5040e0, 0x4050e0, 0xe04050, 0x50e040, 0x406050, 0x605040, 0x504060,
- 0x405060, 0x604050, 0x506040, 0x40a050, 0xa05040, 0x5040a0, 0x4050a0,
- 0xa04050, 0x50a040, 0x402050, 0x205040, 0x504020, 0x405020, 0x204050,
- 0x502040, 0x40f050, 0xf05040, 0x5040f0, 0x4050f0, 0xf04050, 0x50f040,
- 0x40b050, 0xb05040, 0x5040b0, 0x4050b0, 0xb04050, 0x50b040, 0x405000,
- 0x504000, 0x500040, 0x400050, 0x005040, 0x004050, 0x405040, 0x504040,
- 0x404050, 0x504050, 0x405050, 0x505040, 0xe06050, 0x6050e0, 0x50e060,
- 0xe05060, 0x60e050, 0x5060e0, 0xe0a050, 0xa050e0, 0x50e0a0, 0xe050a0,
- 0xa0e050, 0x50a0e0, 0xe02050, 0x2050e0, 0x50e020, 0xe05020, 0x20e050,
- 0x5020e0, 0xe0f050, 0xf050e0, 0x50e0f0, 0xe050f0, 0xf0e050, 0x50f0e0,
- 0xe0b050, 0xb050e0, 0x50e0b0, 0xe050b0, 0xb0e050, 0x50b0e0, 0xe05000,
- 0x50e000, 0x5000e0, 0xe00050, 0x0050e0, 0x00e050, 0xe050e0, 0x50e0e0,
- 0xe0e050, 0x50e050, 0xe05050, 0x5050e0, 0x60a050, 0xa05060, 0x5060a0,
- 0x6050a0, 0xa06050, 0x50a060, 0x602050, 0x205060, 0x506020, 0x605020,
- 0x206050, 0x502060, 0x60f050, 0xf05060, 0x5060f0, 0x6050f0, 0xf06050,
- 0x50f060, 0x60b050, 0xb05060, 0x5060b0, 0x6050b0, 0xb06050, 0x50b060,
- 0x605000, 0x506000, 0x500060, 0x600050, 0x005060, 0x006050, 0x605060,
- 0x506060, 0x606050, 0x506050, 0x605050, 0x505060, 0xa02050, 0x2050a0,
- 0x50a020, 0xa05020, 0x20a050, 0x5020a0, 0xa0f050, 0xf050a0, 0x50a0f0,
- 0xa050f0, 0xf0a050, 0x50f0a0, 0xa0b050, 0xb050a0, 0x50a0b0, 0xa050b0,
- 0xb0a050, 0x50b0a0, 0xa05000, 0x50a000, 0x5000a0, 0xa00050, 0x0050a0,
- 0x00a050, 0xa050a0, 0x50a0a0, 0xa0a050, 0x50a050, 0xa05050, 0x5050a0,
- 0x20f050, 0xf05020, 0x5020f0, 0x2050f0, 0xf02050, 0x50f020, 0x20b050,
- 0xb05020, 0x5020b0, 0x2050b0, 0xb02050, 0x50b020, 0x205000, 0x502000,
- 0x500020, 0x200050, 0x005020, 0x002050, 0x205020, 0x502020, 0x202050,
- 0x502050, 0x205050, 0x505020, 0xf0b050, 0xb050f0, 0x50f0b0, 0xf050b0,
- 0xb0f050, 0x50b0f0, 0xf05000, 0x50f000, 0x5000f0, 0xf00050, 0x0050f0,
- 0x00f050, 0xf050f0, 0x50f0f0, 0xf0f050, 0x50f050, 0xf05050, 0x5050f0,
- 0xb05000, 0x50b000, 0x5000b0, 0xb00050, 0x0050b0, 0x00b050, 0xb050b0,
- 0x50b0b0, 0xb0b050, 0x50b050, 0xb05050, 0x5050b0, 0x505050, 0x500000,
- 0x005000, 0x000050, 0x505000, 0x500050, 0x005050, 0xff80d0, 0x80d0ff,
- 0xd0ff80, 0xffd080, 0x80ffd0, 0xd080ff, 0xffc0d0, 0xc0d0ff, 0xd0ffc0,
- 0xffd0c0, 0xc0ffd0, 0xd0c0ff, 0xff40d0, 0x40d0ff, 0xd0ff40, 0xffd040,
- 0x40ffd0, 0xd040ff, 0xffe0d0, 0xe0d0ff, 0xd0ffe0, 0xffd0e0, 0xe0ffd0,
- 0xd0e0ff, 0xff60d0, 0x60d0ff, 0xd0ff60, 0xffd060, 0x60ffd0, 0xd060ff,
- 0xffa0d0, 0xa0d0ff, 0xd0ffa0, 0xffd0a0, 0xa0ffd0, 0xd0a0ff, 0xff20d0,
- 0x20d0ff, 0xd0ff20, 0xffd020, 0x20ffd0, 0xd020ff, 0xfff0d0, 0xf0d0ff,
- 0xd0fff0, 0xffd0f0, 0xf0ffd0, 0xd0f0ff, 0xffb0d0, 0xb0d0ff, 0xd0ffb0,
- 0xffd0b0, 0xb0ffd0, 0xd0b0ff, 0xff50d0, 0x50d0ff, 0xd0ff50, 0xffd050,
- 0x50ffd0, 0xd050ff, 0xffd000, 0xd0ff00, 0xd000ff, 0xff00d0, 0x00d0ff,
- 0x00ffd0, 0xffd0ff, 0xd0ffff, 0xffffd0, 0xd0ffd0, 0xffd0d0, 0xd0d0ff,
- 0x80c0d0, 0xc0d080, 0xd080c0, 0x80d0c0, 0xc080d0, 0xd0c080, 0x8040d0,
- 0x40d080, 0xd08040, 0x80d040, 0x4080d0, 0xd04080, 0x80e0d0, 0xe0d080,
- 0xd080e0, 0x80d0e0, 0xe080d0, 0xd0e080, 0x8060d0, 0x60d080, 0xd08060,
- 0x80d060, 0x6080d0, 0xd06080, 0x80a0d0, 0xa0d080, 0xd080a0, 0x80d0a0,
- 0xa080d0, 0xd0a080, 0x8020d0, 0x20d080, 0xd08020, 0x80d020, 0x2080d0,
- 0xd02080, 0x80f0d0, 0xf0d080, 0xd080f0, 0x80d0f0, 0xf080d0, 0xd0f080,
- 0x80b0d0, 0xb0d080, 0xd080b0, 0x80d0b0, 0xb080d0, 0xd0b080, 0x8050d0,
- 0x50d080, 0xd08050, 0x80d050, 0x5080d0, 0xd05080, 0x80d000, 0xd08000,
- 0xd00080, 0x8000d0, 0x00d080, 0x0080d0, 0x80d080, 0xd08080, 0x8080d0,
- 0xd080d0, 0x80d0d0, 0xd0d080, 0xc040d0, 0x40d0c0, 0xd0c040, 0xc0d040,
- 0x40c0d0, 0xd040c0, 0xc0e0d0, 0xe0d0c0, 0xd0c0e0, 0xc0d0e0, 0xe0c0d0,
- 0xd0e0c0, 0xc060d0, 0x60d0c0, 0xd0c060, 0xc0d060, 0x60c0d0, 0xd060c0,
- 0xc0a0d0, 0xa0d0c0, 0xd0c0a0, 0xc0d0a0, 0xa0c0d0, 0xd0a0c0, 0xc020d0,
- 0x20d0c0, 0xd0c020, 0xc0d020, 0x20c0d0, 0xd020c0, 0xc0f0d0, 0xf0d0c0,
- 0xd0c0f0, 0xc0d0f0, 0xf0c0d0, 0xd0f0c0, 0xc0b0d0, 0xb0d0c0, 0xd0c0b0,
- 0xc0d0b0, 0xb0c0d0, 0xd0b0c0, 0xc050d0, 0x50d0c0, 0xd0c050, 0xc0d050,
- 0x50c0d0, 0xd050c0, 0xc0d000, 0xd0c000, 0xd000c0, 0xc000d0, 0x00d0c0,
- 0x00c0d0, 0xc0d0c0, 0xd0c0c0, 0xc0c0d0, 0xd0c0d0, 0xc0d0d0, 0xd0d0c0,
- 0x40e0d0, 0xe0d040, 0xd040e0, 0x40d0e0, 0xe040d0, 0xd0e040, 0x4060d0,
- 0x60d040, 0xd04060, 0x40d060, 0x6040d0, 0xd06040, 0x40a0d0, 0xa0d040,
- 0xd040a0, 0x40d0a0, 0xa040d0, 0xd0a040, 0x4020d0, 0x20d040, 0xd04020,
- 0x40d020, 0x2040d0, 0xd02040, 0x40f0d0, 0xf0d040, 0xd040f0, 0x40d0f0,
- 0xf040d0, 0xd0f040, 0x40b0d0, 0xb0d040, 0xd040b0, 0x40d0b0, 0xb040d0,
- 0xd0b040, 0x4050d0, 0x50d040, 0xd04050, 0x40d050, 0x5040d0, 0xd05040,
- 0x40d000, 0xd04000, 0xd00040, 0x4000d0, 0x00d040, 0x0040d0, 0x40d040,
- 0xd04040, 0x4040d0, 0xd040d0, 0x40d0d0, 0xd0d040, 0xe060d0, 0x60d0e0,
- 0xd0e060, 0xe0d060, 0x60e0d0, 0xd060e0, 0xe0a0d0, 0xa0d0e0, 0xd0e0a0,
- 0xe0d0a0, 0xa0e0d0, 0xd0a0e0, 0xe020d0, 0x20d0e0, 0xd0e020, 0xe0d020,
- 0x20e0d0, 0xd020e0, 0xe0f0d0, 0xf0d0e0, 0xd0e0f0, 0xe0d0f0, 0xf0e0d0,
- 0xd0f0e0, 0xe0b0d0, 0xb0d0e0, 0xd0e0b0, 0xe0d0b0, 0xb0e0d0, 0xd0b0e0,
- 0xe050d0, 0x50d0e0, 0xd0e050, 0xe0d050, 0x50e0d0, 0xd050e0, 0xe0d000,
- 0xd0e000, 0xd000e0, 0xe000d0, 0x00d0e0, 0x00e0d0, 0xe0d0e0, 0xd0e0e0,
- 0xe0e0d0, 0xd0e0d0, 0xe0d0d0, 0xd0d0e0, 0x60a0d0, 0xa0d060, 0xd060a0,
- 0x60d0a0, 0xa060d0, 0xd0a060, 0x6020d0, 0x20d060, 0xd06020, 0x60d020,
- 0x2060d0, 0xd02060, 0x60f0d0, 0xf0d060, 0xd060f0, 0x60d0f0, 0xf060d0,
- 0xd0f060, 0x60b0d0, 0xb0d060, 0xd060b0, 0x60d0b0, 0xb060d0, 0xd0b060,
- 0x6050d0, 0x50d060, 0xd06050, 0x60d050, 0x5060d0, 0xd05060, 0x60d000,
- 0xd06000, 0xd00060, 0x6000d0, 0x00d060, 0x0060d0, 0x60d060, 0xd06060,
- 0x6060d0, 0xd060d0, 0x60d0d0, 0xd0d060, 0xa020d0, 0x20d0a0, 0xd0a020,
- 0xa0d020, 0x20a0d0, 0xd020a0, 0xa0f0d0, 0xf0d0a0, 0xd0a0f0, 0xa0d0f0,
- 0xf0a0d0, 0xd0f0a0, 0xa0b0d0, 0xb0d0a0, 0xd0a0b0, 0xa0d0b0, 0xb0a0d0,
- 0xd0b0a0, 0xa050d0, 0x50d0a0, 0xd0a050, 0xa0d050, 0x50a0d0, 0xd050a0,
- 0xa0d000, 0xd0a000, 0xd000a0, 0xa000d0, 0x00d0a0, 0x00a0d0, 0xa0d0a0,
- 0xd0a0a0, 0xa0a0d0, 0xd0a0d0, 0xa0d0d0, 0xd0d0a0, 0x20f0d0, 0xf0d020,
- 0xd020f0, 0x20d0f0, 0xf020d0, 0xd0f020, 0x20b0d0, 0xb0d020, 0xd020b0,
- 0x20d0b0, 0xb020d0, 0xd0b020, 0x2050d0, 0x50d020, 0xd02050, 0x20d050,
- 0x5020d0, 0xd05020, 0x20d000, 0xd02000, 0xd00020, 0x2000d0, 0x00d020,
- 0x0020d0, 0x20d020, 0xd02020, 0x2020d0, 0xd020d0, 0x20d0d0, 0xd0d020,
- 0xf0b0d0, 0xb0d0f0, 0xd0f0b0, 0xf0d0b0, 0xb0f0d0, 0xd0b0f0, 0xf050d0,
- 0x50d0f0, 0xd0f050, 0xf0d050, 0x50f0d0, 0xd050f0, 0xf0d000, 0xd0f000,
- 0xd000f0, 0xf000d0, 0x00d0f0, 0x00f0d0, 0xf0d0f0, 0xd0f0f0, 0xf0f0d0,
- 0xd0f0d0, 0xf0d0d0, 0xd0d0f0, 0xb050d0, 0x50d0b0, 0xd0b050, 0xb0d050,
- 0x50b0d0, 0xd050b0, 0xb0d000, 0xd0b000, 0xd000b0, 0xb000d0, 0x00d0b0,
- 0x00b0d0, 0xb0d0b0, 0xd0b0b0, 0xb0b0d0, 0xd0b0d0, 0xb0d0d0, 0xd0d0b0,
- 0x50d000, 0xd05000, 0xd00050, 0x5000d0, 0x00d050, 0x0050d0, 0x50d050,
- 0xd05050, 0x5050d0, 0xd050d0, 0x50d0d0, 0xd0d050, 0xd0d0d0, 0xd00000,
- 0x00d000, 0x0000d0, 0xd0d000, 0xd000d0, 0x00d0d0, 0xff8070, 0x8070ff,
- 0x70ff80, 0xff7080, 0x80ff70, 0x7080ff, 0xffc070, 0xc070ff, 0x70ffc0,
- 0xff70c0, 0xc0ff70, 0x70c0ff, 0xff4070, 0x4070ff, 0x70ff40, 0xff7040,
- 0x40ff70, 0x7040ff, 0xffe070, 0xe070ff, 0x70ffe0, 0xff70e0, 0xe0ff70,
- 0x70e0ff, 0xff6070, 0x6070ff, 0x70ff60, 0xff7060, 0x60ff70, 0x7060ff,
- 0xffa070, 0xa070ff, 0x70ffa0, 0xff70a0, 0xa0ff70, 0x70a0ff, 0xff2070,
- 0x2070ff, 0x70ff20, 0xff7020, 0x20ff70, 0x7020ff, 0xfff070, 0xf070ff,
- 0x70fff0, 0xff70f0, 0xf0ff70, 0x70f0ff, 0xffb070, 0xb070ff, 0x70ffb0,
- 0xff70b0, 0xb0ff70, 0x70b0ff, 0xff5070, 0x5070ff, 0x70ff50, 0xff7050,
- 0x50ff70, 0x7050ff, 0xffd070, 0xd070ff, 0x70ffd0, 0xff70d0, 0xd0ff70,
- 0x70d0ff, 0xff7000, 0x70ff00, 0x7000ff, 0xff0070, 0x0070ff, 0x00ff70,
- 0xff70ff, 0x70ffff, 0xffff70, 0x70ff70, 0xff7070, 0x7070ff, 0x80c070,
- 0xc07080, 0x7080c0, 0x8070c0, 0xc08070, 0x70c080, 0x804070, 0x407080,
- 0x708040, 0x807040, 0x408070, 0x704080, 0x80e070, 0xe07080, 0x7080e0,
- 0x8070e0, 0xe08070, 0x70e080, 0x806070, 0x607080, 0x708060, 0x807060,
- 0x608070, 0x706080, 0x80a070, 0xa07080, 0x7080a0, 0x8070a0, 0xa08070,
- 0x70a080, 0x802070, 0x207080, 0x708020, 0x807020, 0x208070, 0x702080,
- 0x80f070, 0xf07080, 0x7080f0, 0x8070f0, 0xf08070, 0x70f080, 0x80b070,
- 0xb07080, 0x7080b0, 0x8070b0, 0xb08070, 0x70b080, 0x805070, 0x507080,
- 0x708050, 0x807050, 0x508070, 0x705080, 0x80d070, 0xd07080, 0x7080d0,
- 0x8070d0, 0xd08070, 0x70d080, 0x807000, 0x708000, 0x700080, 0x800070,
- 0x007080, 0x008070, 0x807080, 0x708080, 0x808070, 0x708070, 0x807070,
- 0x707080, 0xc04070, 0x4070c0, 0x70c040, 0xc07040, 0x40c070, 0x7040c0,
- 0xc0e070, 0xe070c0, 0x70c0e0, 0xc070e0, 0xe0c070, 0x70e0c0, 0xc06070,
- 0x6070c0, 0x70c060, 0xc07060, 0x60c070, 0x7060c0, 0xc0a070, 0xa070c0,
- 0x70c0a0, 0xc070a0, 0xa0c070, 0x70a0c0, 0xc02070, 0x2070c0, 0x70c020,
- 0xc07020, 0x20c070, 0x7020c0, 0xc0f070, 0xf070c0, 0x70c0f0, 0xc070f0,
- 0xf0c070, 0x70f0c0, 0xc0b070, 0xb070c0, 0x70c0b0, 0xc070b0, 0xb0c070,
- 0x70b0c0, 0xc05070, 0x5070c0, 0x70c050, 0xc07050, 0x50c070, 0x7050c0,
- 0xc0d070, 0xd070c0, 0x70c0d0, 0xc070d0, 0xd0c070, 0x70d0c0, 0xc07000,
- 0x70c000, 0x7000c0, 0xc00070, 0x0070c0, 0x00c070, 0xc070c0, 0x70c0c0,
- 0xc0c070, 0x70c070, 0xc07070, 0x7070c0, 0x40e070, 0xe07040, 0x7040e0,
- 0x4070e0, 0xe04070, 0x70e040, 0x406070, 0x607040, 0x704060, 0x407060,
- 0x604070, 0x706040, 0x40a070, 0xa07040, 0x7040a0, 0x4070a0, 0xa04070,
- 0x70a040, 0x402070, 0x207040, 0x704020, 0x407020, 0x204070, 0x702040,
- 0x40f070, 0xf07040, 0x7040f0, 0x4070f0, 0xf04070, 0x70f040, 0x40b070,
- 0xb07040, 0x7040b0, 0x4070b0, 0xb04070, 0x70b040, 0x405070, 0x507040,
- 0x704050, 0x407050, 0x504070, 0x705040, 0x40d070, 0xd07040, 0x7040d0,
- 0x4070d0, 0xd04070, 0x70d040, 0x407000, 0x704000, 0x700040, 0x400070,
- 0x007040, 0x004070, 0x407040, 0x704040, 0x404070, 0x704070, 0x407070,
- 0x707040, 0xe06070, 0x6070e0, 0x70e060, 0xe07060, 0x60e070, 0x7060e0,
- 0xe0a070, 0xa070e0, 0x70e0a0, 0xe070a0, 0xa0e070, 0x70a0e0, 0xe02070,
- 0x2070e0, 0x70e020, 0xe07020, 0x20e070, 0x7020e0, 0xe0f070, 0xf070e0,
- 0x70e0f0, 0xe070f0, 0xf0e070, 0x70f0e0, 0xe0b070, 0xb070e0, 0x70e0b0,
- 0xe070b0, 0xb0e070, 0x70b0e0, 0xe05070, 0x5070e0, 0x70e050, 0xe07050,
- 0x50e070, 0x7050e0, 0xe0d070, 0xd070e0, 0x70e0d0, 0xe070d0, 0xd0e070,
- 0x70d0e0, 0xe07000, 0x70e000, 0x7000e0, 0xe00070, 0x0070e0, 0x00e070,
- 0xe070e0, 0x70e0e0, 0xe0e070, 0x70e070, 0xe07070, 0x7070e0, 0x60a070,
- 0xa07060, 0x7060a0, 0x6070a0, 0xa06070, 0x70a060, 0x602070, 0x207060,
- 0x706020, 0x607020, 0x206070, 0x702060, 0x60f070, 0xf07060, 0x7060f0,
- 0x6070f0, 0xf06070, 0x70f060, 0x60b070, 0xb07060, 0x7060b0, 0x6070b0,
- 0xb06070, 0x70b060, 0x605070, 0x507060, 0x706050, 0x607050, 0x506070,
- 0x705060, 0x60d070, 0xd07060, 0x7060d0, 0x6070d0, 0xd06070, 0x70d060,
- 0x607000, 0x706000, 0x700060, 0x600070, 0x007060, 0x006070, 0x607060,
- 0x706060, 0x606070, 0x706070, 0x607070, 0x707060, 0xa02070, 0x2070a0,
- 0x70a020, 0xa07020, 0x20a070, 0x7020a0, 0xa0f070, 0xf070a0, 0x70a0f0,
- 0xa070f0, 0xf0a070, 0x70f0a0, 0xa0b070, 0xb070a0, 0x70a0b0, 0xa070b0,
- 0xb0a070, 0x70b0a0, 0xa05070, 0x5070a0, 0x70a050, 0xa07050, 0x50a070,
- 0x7050a0, 0xa0d070, 0xd070a0, 0x70a0d0, 0xa070d0, 0xd0a070, 0x70d0a0,
- 0xa07000, 0x70a000, 0x7000a0, 0xa00070, 0x0070a0, 0x00a070, 0xa070a0,
- 0x70a0a0, 0xa0a070, 0x70a070, 0xa07070, 0x7070a0, 0x20f070, 0xf07020,
- 0x7020f0, 0x2070f0, 0xf02070, 0x70f020, 0x20b070, 0xb07020, 0x7020b0,
- 0x2070b0, 0xb02070, 0x70b020, 0x205070, 0x507020, 0x702050, 0x207050,
- 0x502070, 0x705020, 0x20d070, 0xd07020, 0x7020d0, 0x2070d0, 0xd02070,
- 0x70d020, 0x207000, 0x702000, 0x700020, 0x200070, 0x007020, 0x002070,
- 0x207020, 0x702020, 0x202070, 0x702070, 0x207070, 0x707020, 0xf0b070,
- 0xb070f0, 0x70f0b0, 0xf070b0, 0xb0f070, 0x70b0f0, 0xf05070, 0x5070f0,
- 0x70f050, 0xf07050, 0x50f070, 0x7050f0, 0xf0d070, 0xd070f0, 0x70f0d0,
- 0xf070d0, 0xd0f070, 0x70d0f0, 0xf07000, 0x70f000, 0x7000f0, 0xf00070,
- 0x0070f0, 0x00f070, 0xf070f0, 0x70f0f0, 0xf0f070, 0x70f070, 0xf07070,
- 0x7070f0, 0xb05070, 0x5070b0, 0x70b050, 0xb07050, 0x50b070, 0x7050b0,
- 0xb0d070, 0xd070b0, 0x70b0d0, 0xb070d0, 0xd0b070, 0x70d0b0, 0xb07000,
- 0x70b000, 0x7000b0, 0xb00070, 0x0070b0, 0x00b070, 0xb070b0, 0x70b0b0,
- 0xb0b070, 0x70b070, 0xb07070, 0x7070b0, 0x50d070, 0xd07050, 0x7050d0,
- 0x5070d0, 0xd05070, 0x70d050, 0x507000, 0x705000, 0x700050, 0x500070,
- 0x007050, 0x005070, 0x507050, 0x705050, 0x505070, 0x705070, 0x507070,
- 0x707050, 0xd07000, 0x70d000, 0x7000d0, 0xd00070, 0x0070d0, 0x00d070,
- 0xd070d0, 0x70d0d0, 0xd0d070, 0x70d070, 0xd07070, 0x7070d0, 0x707070,
- 0x700000, 0x007000, 0x000070, 0x707000, 0x700070, 0x007070, 0xff8030,
- 0x8030ff, 0x30ff80, 0xff3080, 0x80ff30, 0x3080ff, 0xffc030, 0xc030ff,
- 0x30ffc0, 0xff30c0, 0xc0ff30, 0x30c0ff, 0xff4030, 0x4030ff, 0x30ff40,
- 0xff3040, 0x40ff30, 0x3040ff, 0xffe030, 0xe030ff, 0x30ffe0, 0xff30e0,
- 0xe0ff30, 0x30e0ff, 0xff6030, 0x6030ff, 0x30ff60, 0xff3060, 0x60ff30,
- 0x3060ff, 0xffa030, 0xa030ff, 0x30ffa0, 0xff30a0, 0xa0ff30, 0x30a0ff,
- 0xff2030, 0x2030ff, 0x30ff20, 0xff3020, 0x20ff30, 0x3020ff, 0xfff030,
- 0xf030ff, 0x30fff0, 0xff30f0, 0xf0ff30, 0x30f0ff, 0xffb030, 0xb030ff,
- 0x30ffb0, 0xff30b0, 0xb0ff30, 0x30b0ff, 0xff5030, 0x5030ff, 0x30ff50,
- 0xff3050, 0x50ff30, 0x3050ff, 0xffd030, 0xd030ff, 0x30ffd0, 0xff30d0,
- 0xd0ff30, 0x30d0ff, 0xff7030, 0x7030ff, 0x30ff70, 0xff3070, 0x70ff30,
- 0x3070ff, 0xff3000, 0x30ff00, 0x3000ff, 0xff0030, 0x0030ff, 0x00ff30,
- 0xff30ff, 0x30ffff, 0xffff30, 0x30ff30, 0xff3030, 0x3030ff, 0x80c030,
- 0xc03080, 0x3080c0, 0x8030c0, 0xc08030, 0x30c080, 0x804030, 0x403080,
- 0x308040, 0x803040, 0x408030, 0x304080, 0x80e030, 0xe03080, 0x3080e0,
- 0x8030e0, 0xe08030, 0x30e080, 0x806030, 0x603080, 0x308060, 0x803060,
- 0x608030, 0x306080, 0x80a030, 0xa03080, 0x3080a0, 0x8030a0, 0xa08030,
- 0x30a080, 0x802030, 0x203080, 0x308020, 0x803020, 0x208030, 0x302080,
- 0x80f030, 0xf03080, 0x3080f0, 0x8030f0, 0xf08030, 0x30f080, 0x80b030,
- 0xb03080, 0x3080b0, 0x8030b0, 0xb08030, 0x30b080, 0x805030, 0x503080,
- 0x308050, 0x803050, 0x508030, 0x305080, 0x80d030, 0xd03080, 0x3080d0,
- 0x8030d0, 0xd08030, 0x30d080, 0x807030, 0x703080, 0x308070, 0x803070,
- 0x708030, 0x307080, 0x803000, 0x308000, 0x300080, 0x800030, 0x003080,
- 0x008030, 0x803080, 0x308080, 0x808030, 0x308030, 0x803030, 0x303080,
- 0xc04030, 0x4030c0, 0x30c040, 0xc03040, 0x40c030, 0x3040c0, 0xc0e030,
- 0xe030c0, 0x30c0e0, 0xc030e0, 0xe0c030, 0x30e0c0, 0xc06030, 0x6030c0,
- 0x30c060, 0xc03060, 0x60c030, 0x3060c0, 0xc0a030, 0xa030c0, 0x30c0a0,
- 0xc030a0, 0xa0c030, 0x30a0c0, 0xc02030, 0x2030c0, 0x30c020, 0xc03020,
- 0x20c030, 0x3020c0, 0xc0f030, 0xf030c0, 0x30c0f0, 0xc030f0, 0xf0c030,
- 0x30f0c0, 0xc0b030, 0xb030c0, 0x30c0b0, 0xc030b0, 0xb0c030, 0x30b0c0,
- 0xc05030, 0x5030c0, 0x30c050, 0xc03050, 0x50c030, 0x3050c0, 0xc0d030,
- 0xd030c0, 0x30c0d0, 0xc030d0, 0xd0c030, 0x30d0c0, 0xc07030, 0x7030c0,
- 0x30c070, 0xc03070, 0x70c030, 0x3070c0, 0xc03000, 0x30c000, 0x3000c0,
- 0xc00030, 0x0030c0, 0x00c030, 0xc030c0, 0x30c0c0, 0xc0c030, 0x30c030,
- 0xc03030, 0x3030c0, 0x40e030, 0xe03040, 0x3040e0, 0x4030e0, 0xe04030,
- 0x30e040, 0x406030, 0x603040, 0x304060, 0x403060, 0x604030, 0x306040,
- 0x40a030, 0xa03040, 0x3040a0, 0x4030a0, 0xa04030, 0x30a040, 0x402030,
- 0x203040, 0x304020, 0x403020, 0x204030, 0x302040, 0x40f030, 0xf03040,
- 0x3040f0, 0x4030f0, 0xf04030, 0x30f040, 0x40b030, 0xb03040, 0x3040b0,
- 0x4030b0, 0xb04030, 0x30b040, 0x405030, 0x503040, 0x304050, 0x403050,
- 0x504030, 0x305040, 0x40d030, 0xd03040, 0x3040d0, 0x4030d0, 0xd04030,
- 0x30d040, 0x407030, 0x703040, 0x304070, 0x403070, 0x704030, 0x307040,
- 0x403000, 0x304000, 0x300040, 0x400030, 0x003040, 0x004030, 0x403040,
- 0x304040, 0x404030, 0x304030, 0x403030, 0x303040, 0xe06030, 0x6030e0,
- 0x30e060, 0xe03060, 0x60e030, 0x3060e0, 0xe0a030, 0xa030e0, 0x30e0a0,
- 0xe030a0, 0xa0e030, 0x30a0e0, 0xe02030, 0x2030e0, 0x30e020, 0xe03020,
- 0x20e030, 0x3020e0, 0xe0f030, 0xf030e0, 0x30e0f0, 0xe030f0, 0xf0e030,
- 0x30f0e0, 0xe0b030, 0xb030e0, 0x30e0b0, 0xe030b0, 0xb0e030, 0x30b0e0,
- 0xe05030, 0x5030e0, 0x30e050, 0xe03050, 0x50e030, 0x3050e0, 0xe0d030,
- 0xd030e0, 0x30e0d0, 0xe030d0, 0xd0e030, 0x30d0e0, 0xe07030, 0x7030e0,
- 0x30e070, 0xe03070, 0x70e030, 0x3070e0, 0xe03000, 0x30e000, 0x3000e0,
- 0xe00030, 0x0030e0, 0x00e030, 0xe030e0, 0x30e0e0, 0xe0e030, 0x30e030,
- 0xe03030, 0x3030e0, 0x60a030, 0xa03060, 0x3060a0, 0x6030a0, 0xa06030,
- 0x30a060, 0x602030, 0x203060, 0x306020, 0x603020, 0x206030, 0x302060,
- 0x60f030, 0xf03060, 0x3060f0, 0x6030f0, 0xf06030, 0x30f060, 0x60b030,
- 0xb03060, 0x3060b0, 0x6030b0, 0xb06030, 0x30b060, 0x605030, 0x503060,
- 0x306050, 0x603050, 0x506030, 0x305060, 0x60d030, 0xd03060, 0x3060d0,
- 0x6030d0, 0xd06030, 0x30d060, 0x607030, 0x703060, 0x306070, 0x603070,
- 0x706030, 0x307060, 0x603000, 0x306000, 0x300060, 0x600030, 0x003060,
- 0x006030, 0x603060, 0x306060, 0x606030, 0x306030, 0x603030, 0x303060,
- 0xa02030, 0x2030a0, 0x30a020, 0xa03020, 0x20a030, 0x3020a0, 0xa0f030,
- 0xf030a0, 0x30a0f0, 0xa030f0, 0xf0a030, 0x30f0a0, 0xa0b030, 0xb030a0,
- 0x30a0b0, 0xa030b0, 0xb0a030, 0x30b0a0, 0xa05030, 0x5030a0, 0x30a050,
- 0xa03050, 0x50a030, 0x3050a0, 0xa0d030, 0xd030a0, 0x30a0d0, 0xa030d0,
- 0xd0a030, 0x30d0a0, 0xa07030, 0x7030a0, 0x30a070, 0xa03070, 0x70a030,
- 0x3070a0, 0xa03000, 0x30a000, 0x3000a0, 0xa00030, 0x0030a0, 0x00a030,
- 0xa030a0, 0x30a0a0, 0xa0a030, 0x30a030, 0xa03030, 0x3030a0, 0x20f030,
- 0xf03020, 0x3020f0, 0x2030f0, 0xf02030, 0x30f020, 0x20b030, 0xb03020,
- 0x3020b0, 0x2030b0, 0xb02030, 0x30b020, 0x205030, 0x503020, 0x302050,
- 0x203050, 0x502030, 0x305020, 0x20d030, 0xd03020, 0x3020d0, 0x2030d0,
- 0xd02030, 0x30d020, 0x207030, 0x703020, 0x302070, 0x203070, 0x702030,
- 0x307020, 0x203000, 0x302000, 0x300020, 0x200030, 0x003020, 0x002030,
- 0x203020, 0x302020, 0x202030, 0x302030, 0x203030, 0x303020, 0xf0b030,
- 0xb030f0, 0x30f0b0, 0xf030b0, 0xb0f030, 0x30b0f0, 0xf05030, 0x5030f0,
- 0x30f050, 0xf03050, 0x50f030, 0x3050f0, 0xf0d030, 0xd030f0, 0x30f0d0,
- 0xf030d0, 0xd0f030, 0x30d0f0, 0xf07030, 0x7030f0, 0x30f070, 0xf03070,
- 0x70f030, 0x3070f0, 0xf03000, 0x30f000, 0x3000f0, 0xf00030, 0x0030f0,
- 0x00f030, 0xf030f0, 0x30f0f0, 0xf0f030, 0x30f030, 0xf03030, 0x3030f0,
- 0xb05030, 0x5030b0, 0x30b050, 0xb03050, 0x50b030, 0x3050b0, 0xb0d030,
- 0xd030b0, 0x30b0d0, 0xb030d0, 0xd0b030, 0x30d0b0, 0xb07030, 0x7030b0,
- 0x30b070, 0xb03070, 0x70b030, 0x3070b0, 0xb03000, 0x30b000, 0x3000b0,
- 0xb00030, 0x0030b0, 0x00b030, 0xb030b0, 0x30b0b0, 0xb0b030, 0x30b030,
- 0xb03030, 0x3030b0, 0x50d030, 0xd03050, 0x3050d0, 0x5030d0, 0xd05030,
- 0x30d050, 0x507030, 0x703050, 0x305070, 0x503070, 0x705030, 0x307050,
- 0x503000, 0x305000, 0x300050, 0x500030, 0x003050, 0x005030, 0x503050,
- 0x305050, 0x505030, 0x305030, 0x503030, 0x303050, 0xd07030, 0x7030d0,
- 0x30d070, 0xd03070, 0x70d030, 0x3070d0, 0xd03000, 0x30d000, 0x3000d0,
- 0xd00030, 0x0030d0, 0x00d030, 0xd030d0, 0x30d0d0, 0xd0d030, 0x30d030,
- 0xd03030, 0x3030d0, 0x703000, 0x307000, 0x300070, 0x700030, 0x003070,
- 0x007030, 0x703070, 0x307070, 0x707030, 0x307030, 0x703030, 0x303070,
- 0x303030, 0x300000, 0x003000, 0x000030, 0x303000, 0x300030, 0x003030,
- 0xff8090, 0x8090ff, 0x90ff80, 0xff9080, 0x80ff90, 0x9080ff, 0xffc090,
- 0xc090ff, 0x90ffc0, 0xff90c0, 0xc0ff90, 0x90c0ff, 0xff4090, 0x4090ff,
- 0x90ff40, 0xff9040, 0x40ff90, 0x9040ff, 0xffe090, 0xe090ff, 0x90ffe0,
- 0xff90e0, 0xe0ff90, 0x90e0ff, 0xff6090, 0x6090ff, 0x90ff60, 0xff9060,
- 0x60ff90, 0x9060ff, 0xffa090, 0xa090ff, 0x90ffa0, 0xff90a0, 0xa0ff90,
- 0x90a0ff, 0xff2090, 0x2090ff, 0x90ff20, 0xff9020, 0x20ff90, 0x9020ff,
- 0xfff090, 0xf090ff, 0x90fff0, 0xff90f0, 0xf0ff90, 0x90f0ff, 0xffb090,
- 0xb090ff, 0x90ffb0, 0xff90b0, 0xb0ff90, 0x90b0ff, 0xff5090, 0x5090ff,
- 0x90ff50, 0xff9050, 0x50ff90, 0x9050ff, 0xffd090, 0xd090ff, 0x90ffd0,
- 0xff90d0, 0xd0ff90, 0x90d0ff, 0xff7090, 0x7090ff, 0x90ff70, 0xff9070,
- 0x70ff90, 0x9070ff, 0xff3090, 0x3090ff, 0x90ff30, 0xff9030, 0x30ff90,
- 0x9030ff, 0xff9000, 0x90ff00, 0x9000ff, 0xff0090, 0x0090ff, 0x00ff90,
- 0xff90ff, 0x90ffff, 0xffff90, 0x90ff90, 0xff9090, 0x9090ff, 0x80c090,
- 0xc09080, 0x9080c0, 0x8090c0, 0xc08090, 0x90c080, 0x804090, 0x409080,
- 0x908040, 0x809040, 0x408090, 0x904080, 0x80e090, 0xe09080, 0x9080e0,
- 0x8090e0, 0xe08090, 0x90e080, 0x806090, 0x609080, 0x908060, 0x809060,
- 0x608090, 0x906080, 0x80a090, 0xa09080, 0x9080a0, 0x8090a0, 0xa08090,
- 0x90a080, 0x802090, 0x209080, 0x908020, 0x809020, 0x208090, 0x902080,
- 0x80f090, 0xf09080, 0x9080f0, 0x8090f0, 0xf08090, 0x90f080, 0x80b090,
- 0xb09080, 0x9080b0, 0x8090b0, 0xb08090, 0x90b080, 0x805090, 0x509080,
- 0x908050, 0x809050, 0x508090, 0x905080, 0x80d090, 0xd09080, 0x9080d0,
- 0x8090d0, 0xd08090, 0x90d080, 0x807090, 0x709080, 0x908070, 0x809070,
- 0x708090, 0x907080, 0x803090, 0x309080, 0x908030, 0x809030, 0x308090,
- 0x903080, 0x809000, 0x908000, 0x900080, 0x800090, 0x009080, 0x008090,
- 0x809080, 0x908080, 0x808090, 0x908090, 0x809090, 0x909080, 0xc04090,
- 0x4090c0, 0x90c040, 0xc09040, 0x40c090, 0x9040c0, 0xc0e090, 0xe090c0,
- 0x90c0e0, 0xc090e0, 0xe0c090, 0x90e0c0, 0xc06090, 0x6090c0, 0x90c060,
- 0xc09060, 0x60c090, 0x9060c0, 0xc0a090, 0xa090c0, 0x90c0a0, 0xc090a0,
- 0xa0c090, 0x90a0c0, 0xc02090, 0x2090c0, 0x90c020, 0xc09020, 0x20c090,
- 0x9020c0, 0xc0f090, 0xf090c0, 0x90c0f0, 0xc090f0, 0xf0c090, 0x90f0c0,
- 0xc0b090, 0xb090c0, 0x90c0b0, 0xc090b0, 0xb0c090, 0x90b0c0, 0xc05090,
- 0x5090c0, 0x90c050, 0xc09050, 0x50c090, 0x9050c0, 0xc0d090, 0xd090c0,
- 0x90c0d0, 0xc090d0, 0xd0c090, 0x90d0c0, 0xc07090, 0x7090c0, 0x90c070,
- 0xc09070, 0x70c090, 0x9070c0, 0xc03090, 0x3090c0, 0x90c030, 0xc09030,
- 0x30c090, 0x9030c0, 0xc09000, 0x90c000, 0x9000c0, 0xc00090, 0x0090c0,
- 0x00c090, 0xc090c0, 0x90c0c0, 0xc0c090, 0x90c090, 0xc09090, 0x9090c0,
- 0x40e090, 0xe09040, 0x9040e0, 0x4090e0, 0xe04090, 0x90e040, 0x406090,
- 0x609040, 0x904060, 0x409060, 0x604090, 0x906040, 0x40a090, 0xa09040,
- 0x9040a0, 0x4090a0, 0xa04090, 0x90a040, 0x402090, 0x209040, 0x904020,
- 0x409020, 0x204090, 0x902040, 0x40f090, 0xf09040, 0x9040f0, 0x4090f0,
- 0xf04090, 0x90f040, 0x40b090, 0xb09040, 0x9040b0, 0x4090b0, 0xb04090,
- 0x90b040, 0x405090, 0x509040, 0x904050, 0x409050, 0x504090, 0x905040,
- 0x40d090, 0xd09040, 0x9040d0, 0x4090d0, 0xd04090, 0x90d040, 0x407090,
- 0x709040, 0x904070, 0x409070, 0x704090, 0x907040, 0x403090, 0x309040,
- 0x904030, 0x409030, 0x304090, 0x903040, 0x409000, 0x904000, 0x900040,
- 0x400090, 0x009040, 0x004090, 0x409040, 0x904040, 0x404090, 0x904090,
- 0x409090, 0x909040, 0xe06090, 0x6090e0, 0x90e060, 0xe09060, 0x60e090,
- 0x9060e0, 0xe0a090, 0xa090e0, 0x90e0a0, 0xe090a0, 0xa0e090, 0x90a0e0,
- 0xe02090, 0x2090e0, 0x90e020, 0xe09020, 0x20e090, 0x9020e0, 0xe0f090,
- 0xf090e0, 0x90e0f0, 0xe090f0, 0xf0e090, 0x90f0e0, 0xe0b090, 0xb090e0,
- 0x90e0b0, 0xe090b0, 0xb0e090, 0x90b0e0, 0xe05090, 0x5090e0, 0x90e050,
- 0xe09050, 0x50e090, 0x9050e0, 0xe0d090, 0xd090e0, 0x90e0d0, 0xe090d0,
- 0xd0e090, 0x90d0e0, 0xe07090, 0x7090e0, 0x90e070, 0xe09070, 0x70e090,
- 0x9070e0, 0xe03090, 0x3090e0, 0x90e030, 0xe09030, 0x30e090, 0x9030e0,
- 0xe09000, 0x90e000, 0x9000e0, 0xe00090, 0x0090e0, 0x00e090, 0xe090e0,
- 0x90e0e0, 0xe0e090, 0x90e090, 0xe09090, 0x9090e0, 0x60a090, 0xa09060,
- 0x9060a0, 0x6090a0, 0xa06090, 0x90a060, 0x602090, 0x209060, 0x906020,
- 0x609020, 0x206090, 0x902060, 0x60f090, 0xf09060, 0x9060f0, 0x6090f0,
- 0xf06090, 0x90f060, 0x60b090, 0xb09060, 0x9060b0, 0x6090b0, 0xb06090,
- 0x90b060, 0x605090, 0x509060, 0x906050, 0x609050, 0x506090, 0x905060,
- 0x60d090, 0xd09060, 0x9060d0, 0x6090d0, 0xd06090, 0x90d060, 0x607090,
- 0x709060, 0x906070, 0x609070, 0x706090, 0x907060, 0x603090, 0x309060,
- 0x906030, 0x609030, 0x306090, 0x903060, 0x609000, 0x906000, 0x900060,
- 0x600090, 0x009060, 0x006090, 0x609060, 0x906060, 0x606090, 0x906090,
- 0x609090, 0x909060, 0xa02090, 0x2090a0, 0x90a020, 0xa09020, 0x20a090,
- 0x9020a0, 0xa0f090, 0xf090a0, 0x90a0f0, 0xa090f0, 0xf0a090, 0x90f0a0,
- 0xa0b090, 0xb090a0, 0x90a0b0, 0xa090b0, 0xb0a090, 0x90b0a0, 0xa05090,
- 0x5090a0, 0x90a050, 0xa09050, 0x50a090, 0x9050a0, 0xa0d090, 0xd090a0,
- 0x90a0d0, 0xa090d0, 0xd0a090, 0x90d0a0, 0xa07090, 0x7090a0, 0x90a070,
- 0xa09070, 0x70a090, 0x9070a0, 0xa03090, 0x3090a0, 0x90a030, 0xa09030,
- 0x30a090, 0x9030a0, 0xa09000, 0x90a000, 0x9000a0, 0xa00090, 0x0090a0,
- 0x00a090, 0xa090a0, 0x90a0a0, 0xa0a090, 0x90a090, 0xa09090, 0x9090a0,
- 0x20f090, 0xf09020, 0x9020f0, 0x2090f0, 0xf02090, 0x90f020, 0x20b090,
- 0xb09020, 0x9020b0, 0x2090b0, 0xb02090, 0x90b020, 0x205090, 0x509020,
- 0x902050, 0x209050, 0x502090, 0x905020, 0x20d090, 0xd09020, 0x9020d0,
- 0x2090d0, 0xd02090, 0x90d020, 0x207090, 0x709020, 0x902070, 0x209070,
- 0x702090, 0x907020, 0x203090, 0x309020, 0x902030, 0x209030, 0x302090,
- 0x903020, 0x209000, 0x902000, 0x900020, 0x200090, 0x009020, 0x002090,
- 0x209020, 0x902020, 0x202090, 0x902090, 0x209090, 0x909020, 0xf0b090,
- 0xb090f0, 0x90f0b0, 0xf090b0, 0xb0f090, 0x90b0f0, 0xf05090, 0x5090f0,
- 0x90f050, 0xf09050, 0x50f090, 0x9050f0, 0xf0d090, 0xd090f0, 0x90f0d0,
- 0xf090d0, 0xd0f090, 0x90d0f0, 0xf07090, 0x7090f0, 0x90f070, 0xf09070,
- 0x70f090, 0x9070f0, 0xf03090, 0x3090f0, 0x90f030, 0xf09030, 0x30f090,
- 0x9030f0, 0xf09000, 0x90f000, 0x9000f0, 0xf00090, 0x0090f0, 0x00f090,
- 0xf090f0, 0x90f0f0, 0xf0f090, 0x90f090, 0xf09090, 0x9090f0, 0xb05090,
- 0x5090b0, 0x90b050, 0xb09050, 0x50b090, 0x9050b0, 0xb0d090, 0xd090b0,
- 0x90b0d0, 0xb090d0, 0xd0b090, 0x90d0b0, 0xb07090, 0x7090b0, 0x90b070,
- 0xb09070, 0x70b090, 0x9070b0, 0xb03090, 0x3090b0, 0x90b030, 0xb09030,
- 0x30b090, 0x9030b0, 0xb09000, 0x90b000, 0x9000b0, 0xb00090, 0x0090b0,
- 0x00b090, 0xb090b0, 0x90b0b0, 0xb0b090, 0x90b090, 0xb09090, 0x9090b0,
- 0x50d090, 0xd09050, 0x9050d0, 0x5090d0, 0xd05090, 0x90d050, 0x507090,
- 0x709050, 0x905070, 0x509070, 0x705090, 0x907050, 0x503090, 0x309050,
- 0x905030, 0x509030, 0x305090, 0x903050, 0x509000, 0x905000, 0x900050,
- 0x500090, 0x009050, 0x005090, 0x509050, 0x905050, 0x505090, 0x905090,
- 0x509090, 0x909050, 0xd07090, 0x7090d0, 0x90d070, 0xd09070, 0x70d090,
- 0x9070d0, 0xd03090, 0x3090d0, 0x90d030, 0xd09030, 0x30d090, 0x9030d0,
- 0xd09000, 0x90d000, 0x9000d0, 0xd00090, 0x0090d0, 0x00d090, 0xd090d0,
- 0x90d0d0, 0xd0d090, 0x90d090, 0xd09090, 0x9090d0, 0x703090, 0x309070,
- 0x907030, 0x709030, 0x307090, 0x903070, 0x709000, 0x907000, 0x900070,
- 0x700090, 0x009070, 0x007090, 0x709070, 0x907070, 0x707090, 0x907090,
- 0x709090, 0x909070, 0x309000, 0x903000, 0x900030, 0x300090, 0x009030,
- 0x003090, 0x309030, 0x903030, 0x303090, 0x903090, 0x309090, 0x909030,
- 0x909090, 0x900000, 0x009000, 0x000090, 0x909000, 0x900090, 0x009090,
- 0xff8010
-};
-
-static unsigned char const pickMapComponent[256] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
- 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50,
- 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
- 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
- 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
- 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
- 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
- 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0,
- 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0,
- 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
- 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
- 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
- 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
- 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0,
- 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0, 0xd0,
- 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
- 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-static unsigned char const pickMapComponent444[256] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x40, 0x40, 0x40, 0x00, 0x00, 0x60, 0x60, 0x60,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
- 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x80,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
- 0x00, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0,
- 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0,
- 0x00, 0x00, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
- 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
- 0xb0, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
- 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
- 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0,
- 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
- 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0xf0, 0xf0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-#define MAX_PICK_COLORS 4096
-
-// Get the value at "index" to use for color picking. Returns a zero
-// QRgb when the table has been exhausted.
-QRgb qt_qgl_pick_color(int index)
-{
- if (index >= 0 && index < MAX_PICK_COLORS)
- return QRgb(pickColors[index] | 0xff000000);
- else
- return 0;
-}
-
-// Normalize a color that was picked out of a screen color buffer
-// so that it is a better match for something that was generated
-// by qt_qgl_pick_color(). Rounding discrepancies in the
-// low bits due to floating-point conversions are factored out.
-QRgb qt_qgl_normalize_pick_color(QRgb color, bool is444)
-{
- int red, green, blue;
- if (!is444) {
- // RGB565, RGB555, and RGB888 screens (alpha is ignored).
- red = pickMapComponent[qRed(color)];
- green = pickMapComponent[qGreen(color)];
- blue = pickMapComponent[qBlue(color)];
- } else {
- // RGB444 screens need a little more care when normalizing.
- red = pickMapComponent444[qRed(color)];
- green = pickMapComponent444[qGreen(color)];
- blue = pickMapComponent444[qBlue(color)];
- }
- return qRgb(red, green, blue);
-}
-
-QT_END_NAMESPACE
-
-#else // QGL_GENERATOR_PROGRAM
-
-#include <stdio.h>
-
-static unsigned char singlePatterns[] = {
- 1, 1, 1,
-
- 1, 0, 0,
- 0, 1, 0,
- 0, 0, 1,
- 1, 1, 0,
- 1, 0, 1,
- 0, 1, 1
-};
-#define NUM_SINGLE_PATTERNS 7
-
-static unsigned char doublePatterns[] = {
- 1, 2, 0,
- 2, 1, 0,
- 2, 0, 1,
- 1, 0, 2,
- 0, 2, 1,
- 0, 1, 2,
-
- 1, 2, 1,
- 2, 1, 1,
- 1, 1, 2,
- 2, 1, 2,
- 1, 2, 2,
- 2, 2, 1
-};
-#define NUM_DOUBLE_PATTERNS 12
-
-static unsigned char triplePatterns[] = {
- 1, 2, 3,
- 2, 3, 1,
- 3, 1, 2,
- 1, 3, 2,
- 2, 1, 3,
- 3, 2, 1
-};
-#define NUM_TRIPLE_PATTERNS 6
-
-static unsigned char values[] = {
- 0x00,
- 0xff, 0x80, 0xc0, 0x40, 0xe0, 0x60, 0xa0, 0x20,
- 0xf0, 0xb0, 0x50, 0xd0, 0x70, 0x30, 0x90, 0x10
-};
-#define NUM_VALUES 16
-#define NUM_VALUES_444 10
-
-#define MAX_GENERATE 4096
-
-static unsigned char used[17][17][17];
-static int generated = 0;
-
-static void genPattern(int red, int green, int blue)
-{
- ++red;
- ++green;
- ++blue;
- if (used[red][green][blue] || generated >= MAX_GENERATE)
- return;
- used[red][green][blue] = 1;
- if ((generated % 7) == 0)
- printf("\n ");
- printf("0x%02x%02x%02x", values[red], values[green], values[blue]);
- ++generated;
- if (generated < MAX_GENERATE && (generated % 7) != 0)
- printf(", ");
- else if (generated < MAX_GENERATE)
- printf(",");
-}
-
-static void genSinglePatterns(int value)
-{
- int index, red, green, blue;
- for (index = 0; index < NUM_SINGLE_PATTERNS; ++index) {
- if (singlePatterns[index * 3] == 0)
- red = -1;
- else
- red = value;
- if (singlePatterns[index * 3 + 1] == 0)
- green = -1;
- else
- green = value;
- if (singlePatterns[index * 3 + 2] == 0)
- blue = -1;
- else
- blue = value;
- genPattern(red, green, blue);
- }
-}
-
-static void genDoublePatterns(int value1, int value2)
-{
- int index, red, green, blue;
- for (index = 0; index < NUM_DOUBLE_PATTERNS; ++index) {
- if (doublePatterns[index * 3] == 0)
- red = -1;
- else if (doublePatterns[index * 3] == 1)
- red = value1;
- else
- red = value2;
- if (doublePatterns[index * 3 + 1] == 0)
- green = -1;
- else if (doublePatterns[index * 3 + 1] == 1)
- green = value1;
- else
- green = value2;
- if (doublePatterns[index * 3 + 2] == 0)
- blue = -1;
- else if (doublePatterns[index * 3 + 2] == 1)
- blue = value1;
- else
- blue = value2;
- genPattern(red, green, blue);
- }
-}
-
-static void genTriplePatterns(int value1, int value2, int value3)
-{
- int index, red, green, blue;
- for (index = 0; index < NUM_TRIPLE_PATTERNS; ++index) {
- if (triplePatterns[index * 3] == 0)
- red = -1;
- else if (triplePatterns[index * 3] == 1)
- red = value1;
- else if (triplePatterns[index * 3] == 2)
- red = value2;
- else
- red = value3;
- if (triplePatterns[index * 3 + 1] == 0)
- green = -1;
- else if (triplePatterns[index * 3 + 1] == 1)
- green = value1;
- else if (triplePatterns[index * 3 + 1] == 2)
- green = value2;
- else
- green = value3;
- if (triplePatterns[index * 3 + 2] == 0)
- blue = -1;
- else if (triplePatterns[index * 3 + 2] == 1)
- blue = value1;
- else if (triplePatterns[index * 3 + 2] == 2)
- blue = value2;
- else
- blue = value3;
- genPattern(red, green, blue);
- }
-}
-
-static void genPatternRange(int limit)
-{
- // This will generate 4912 unique color values which are
- // reasonably well-spaced in the RGB color cube.
- int first, second, third;
- for (first = 0; first < limit; ++first) {
- genSinglePatterns(first);
- for (second = first + 1; second < limit; ++second) {
- genDoublePatterns(first, second);
- for (third = second + 1; third < limit; ++third) {
- genTriplePatterns(first, second, third);
- }
- }
- }
-}
-
-static void generateComponentMap(void)
-{
- int map[256];
- int index, value, index2;
-
- for (index = 0; index < 256; ++index)
- map[index] = 0;
-
- for (index = 0; index < NUM_VALUES; ++index) {
- value = values[index + 1];
- for (index2 = value - 8; index2 < (value + 8); ++index2) {
- if (index2 >= 0 && index2 < 256)
- map[index2] = value;
- }
- }
-
- for (index = 0; index < 256; ++index) {
- if ((index % 8) == 0)
- printf(" ");
- printf("0x%02x", map[index]);
- if (index < 255)
- printf(",");
- if ((index % 8) == 7)
- printf("\n");
- else if (index < 255)
- printf(" ");
- }
-
- // Validate the reversibility of RGB565 and RGB555 mappings.
- for (index = 0; index < 17; ++index) {
- // Integer truncation test - 5-bit for red and blue (and green RGB555).
- value = values[index] * 31 / 255;
- index2 = value * 255 / 31;
- if (values[index] != map[index2]) {
- qWarning("RGB565 (i5) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Integer truncation test - 6-bit for green.
- value = values[index] * 63 / 255;
- index2 = value * 255 / 63;
- if (values[index] != map[index2]) {
- qWarning("RGB565 (i6) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Floating point rounding test - 5-bit for red and blue.
- value = (int)((values[index] * 31.0 / 255.0) + 0.5);
- index2 = (int)((value * 255.0 / 31.0) + 0.5);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (f5) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Floating point rounding test - 6-bit for green.
- value = (int)((values[index] * 63.0 / 255.0) + 0.5);
- index2 = (int)((value * 255.0 / 63.0) + 0.5);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (f6) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Test 5-bit to 8-bit conversion using doubling (ABCDE -> ABCDEABC).
- value = values[index] * 31 / 255;
- index2 = (value << 3) | (value >> 2);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (di5) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
- value = (int)((values[index] * 31.0 / 255.0) + 0.5);
- index2 = (value << 3) | (value >> 2);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (df5) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Test 6-bit to 8-bit conversion using doubling (ABCDEF -> ABCDEFAB).
- value = values[index] * 63 / 255;
- index2 = (value << 2) | (value >> 4);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (di6) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
- value = (int)((values[index] * 63.0 / 255.0) + 0.5);
- index2 = (value << 2) | (value >> 4);
- if (values[index] != map[index2]) {
- qWarning("RGB565 (df6) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
- }
-}
-
-static void generateComponentMap444(void)
-{
- int map[256];
- int index, value, index2;
-
- for (index = 0; index < 256; ++index)
- map[index] = 0;
-
- // Populate mappings for integer conversion with truncation.
- for (index = 0; index < NUM_VALUES_444; ++index) {
- value = values[index + 1] * 15 / 255;
- value = value * 255 / 15;
- if (value > 255)
- value = 255;
- else if (value < 0)
- value = 0;
- for (index2 = value - 8; index2 < (value + 7); ++index2) {
- if (index2 >= 0 && index2 < 256)
- map[index2] = values[index + 1];
- }
- }
-
- // Add some extra mappings for floating-point conversion with rounding.
- for (index = 0; index < NUM_VALUES_444; ++index) {
- value = (int)((values[index + 1] * 15.0 / 255.0) + 0.5);
- value = (int)((value * 255.0 / 15.0) + 0.5);
- if (value > 255)
- value = 255;
- else if (value < 0)
- value = 0;
- for (index2 = value - 8; index2 < (value + 7); ++index2) {
- if (index2 >= 0 && index2 < 256 && map[index2] == 0)
- map[index2] = values[index + 1];
- }
- }
-
- for (index = 0; index < 256; ++index) {
- if ((index % 8) == 0)
- printf(" ");
- printf("0x%02x", map[index]);
- if (index < 255)
- printf(",");
- if ((index % 8) == 7)
- printf("\n");
- else if (index < 255)
- printf(" ");
- }
-
- // Validate the reversibility of RGB444 mappings.
- for (index = 0; index <= NUM_VALUES_444; ++index) {
- // Integer truncation test.
- value = values[index] * 15 / 255;
- index2 = value * 255 / 15;
- if (values[index] != map[index2]) {
- qWarning("RGB444 (i) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Floating point rounding test.
- value = (int)((values[index] * 15.0 / 255.0) + 0.5);
- index2 = (int)((value * 255.0 / 15.0) + 0.5);
- if (values[index] != map[index2]) {
- qWarning("RGB444 (f) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
-
- // Test 4-bit to 8-bit conversion using doubling (ABCD -> ABCDABCD).
- value = values[index] * 15 / 255;
- index2 = value | (value << 4);
- if (values[index] != map[index2]) {
- qWarning("RGB444 (di) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
- value = (int)((values[index] * 15.0 / 255.0) + 0.5);
- index2 = value | (value << 4);
- if (values[index] != map[index2]) {
- qWarning("RGB444 (df) failure: 0x%02X -> 0x%02X -> 0x%02X\n",
- values[index], index2, map[index2]);
- }
- }
-}
-
-int main(int argc, char *argv[])
-{
- int limit;
-
- // Run the generator multiple times using more and more of
- // the elements in the "values" table, and limit to a maximum
- // of 1024 colors.
- //
- // This will sort the output so that colors that involve elements
- // early in the table will be generated first. All combinations
- // of early elements are exhausted before moving onto later values.
- //
- // The result of this sorting should be to maximize the spacing
- // between colors that appear early in the generated output.
- // This should produce better results for color picking on
- // low-end devices with RGB565, RGB555, and RGB444 displays.
- printf("static int const pickColors[%d] = {", MAX_GENERATE);
- for (limit = 1; limit <= NUM_VALUES; ++limit)
- genPatternRange(limit);
- printf("\n};\n\n");
-
- // Generate a component mapping table for mapping 8-bit RGB
- // components to the nearest normalized value.
- printf("static unsigned char const pickMapComponent[256] = {\n");
- generateComponentMap();
- printf("};\n\n");
-
- // Generate a separate mapping table for RGB444, which needs a
- // little more care to deal with truncation errors.
- printf("static unsigned char const pickMapComponent444[256] = {\n");
- generateComponentMap444();
- printf("};\n\n");
-
- printf("#define MAX_PICK_COLORS %d\n\n", MAX_GENERATE);
-
- return 0;
-}
-
-#endif // QGL_GENERATOR_PROGRAM
diff --git a/src/gui/extern/Qt3D/painting/qglpickcolors_p.h b/src/gui/extern/Qt3D/painting/qglpickcolors_p.h
deleted file mode 100644
index ae3e8a1214ab76f3294dc4bde58ddc28a789668d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qglpickcolors_p.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPICKCOLORS_P_H
-#define QGLPICKCOLORS_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-#include <QtGui/qrgb.h>
-
-QT_BEGIN_NAMESPACE
-
-QRgb qt_qgl_pick_color(int index);
-QRgb qt_qgl_normalize_pick_color(QRgb color, bool is444 = false);
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qmatrix4x4stack.cpp b/src/gui/extern/Qt3D/painting/qmatrix4x4stack.cpp
deleted file mode 100644
index 6bd304f612b07be15f7791aaa45f053cd4488950..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qmatrix4x4stack.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qmatrix4x4stack.h"
-#include "qmatrix4x4stack_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QMatrix4x4Stack
- \brief The QMatrix4x4Stack class manages stacks of transformation matrices in GL applications.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-
- Transformation matrices are one of the basic building blocks of
- 3D applications, allowing object models to be positioned, scaled,
- rotated, and projected onto the screen.
-
- GL systems support several standard kinds of matrices, particularly
- modelview and projection matrices. These matrices are typically
- organized into stacks, which allow the current matrix state to be
- saved with push() and restored later with pop().
-
- QMatrix4x4Stack assists QGLPainter with the management of matrix
- stacks, providing operations to set and modify transformation
- matrices in each of the standard matrix stacks.
-
- In the following example, a standard orthographic projection matrix for a
- view is set via the QGLPainter::projectionMatrix() stack, and
- then a modelview matrix is set via the QGLPainter::modelViewMatrix()
- stack to scale and translate an object prior to drawing:
-
- \code
- QGLPainter painter(this);
-
- QMatrix4x4 projm;
- projm.ortho(window->rect());
- painter.projectionMatrix() = projm;
-
- painter.modelViewMatrix().setToIdentity();
- painter.modelViewMatrix().translate(-1.0f, 2.0f, 0.0f);
- painter.modelViewMatrix().scale(0.5f);
- \endcode
-
- Later, the application can save the current modelview matrix state
- and draw a different object with a different modelview matrix:
-
- \code
- painter.modelViewMatrix().push();
- painter.modelViewMatrix().setToIdentity();
- painter.modelViewMatrix().scale(2.0f);
- \endcode
-
- For efficiency, the matrix values are kept client-side until they
- are needed by a QGLPainter::draw() operation. Until then, changes
- to the matrix will not be reflected in the GL server. The application
- can force the GL server to update the server with a call to
- QGLPainter::update().
-
- QMatrix4x4Stack is supported on all GL platforms, including OpenGL/ES 2.0
- which doesn't support matrix stacks natively. On that platform, the
- matrix stack is simulated in client memory. When the application
- selects a shader program to draw under OpenGL/ES 2.0, it calls
- top() to obtain the actual value to be set on the shader program.
-
- \sa QGLPainter
-*/
-
-/*!
- Creates a matrix stack.
-*/
-QMatrix4x4Stack::QMatrix4x4Stack()
- : d_ptr(new QMatrix4x4StackPrivate)
-{
-}
-
-/*!
- Destroy this matrix stack.
-*/
-QMatrix4x4Stack::~QMatrix4x4Stack()
-{
-}
-
-/*!
- Pushes the current matrix onto the matrix stack. The matrix can
- be restored with pop(). The new top of stack will have the
- same value as the previous top of stack.
-
- The depths of the traditional \c{GL_MODELVIEW} and \c{GL_PROJECTION}
- matrix stacks in the GL server are system-dependent and easy to
- overflow in nested rendering code using \c{glPushMatrix()}.
- By contrast, the push() function provides an arbitrary-sized stack
- in client memory.
-
- \sa pop(), top()
-*/
-void QMatrix4x4Stack::push()
-{
- Q_D(QMatrix4x4Stack);
- d->stack.push(d->matrix);
-}
-
-/*!
- Pops the top-most matrix from this matrix stack and sets the
- current matrix to the next value down. Does nothing if the
- matrix stack contains a single entry.
-
- \sa push()
-*/
-void QMatrix4x4Stack::pop()
-{
- Q_D(QMatrix4x4Stack);
- if (!d->stack.isEmpty())
- d->matrix = d->stack.pop();
- d->isDirty = true;
-}
-
-/*!
- Set the matrix at the top of this matrix stack to the identity matrix.
-
- \sa operator=()
-*/
-void QMatrix4x4Stack::setToIdentity()
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.setToIdentity();
- d->isDirty = true;
-}
-
-/*!
- Returns a const reference to the current matrix at the top of this
- matrix stack. This is typically used to fetch the matrix so it can
- be set on user-defined shader programs.
-
- \sa operator=()
-*/
-const QMatrix4x4 &QMatrix4x4Stack::top() const
-{
- Q_D(const QMatrix4x4Stack);
- return d->matrix;
-}
-
-/*!
- \fn QMatrix4x4Stack::operator const QMatrix4x4 &() const
-
- Returns a const reference to the current matrix at the top of
- this matrix stack.
-
- \sa top()
-*/
-
-/*!
- Assigns \a matrix to the matrix at the top of this matrix stack.
-
- \sa top()
-*/
-QMatrix4x4Stack& QMatrix4x4Stack::operator=(const QMatrix4x4& matrix)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix = matrix;
- d->isDirty = true;
- return *this;
-}
-
-/*!
- Multiplies the matrix at the top of this matrix stack by \a matrix.
-
- \sa top()
-*/
-QMatrix4x4Stack& QMatrix4x4Stack::operator*=(const QMatrix4x4& matrix)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix *= matrix;
- d->isDirty = true;
- return *this;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that translates coordinates by (\a x, \a y, \a z). The following example
- translates the modelview matrix by (1, -3, 0):
-
- \code
- QGLPainter painter(this);
- painter.modelViewMatrix().translate(1.0f, -3.0f, 0.0f);
- \endcode
-
- \sa scale(), rotate()
-*/
-void QMatrix4x4Stack::translate(qreal x, qreal y, qreal z)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.translate(x, y, z);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix statck by another
- that translates coordinates by the components of \a vector.
-
- \sa scale(), rotate()
-*/
-void QMatrix4x4Stack::translate(const QVector3D& vector)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.translate(vector);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that scales coordinates by the components \a x, \a y, and \a z.
- The following example scales the modelview matrix by (1, 2, 1):
-
- \code
- QGLPainter painter(this);
- painter.modelViewMatrix().scale(1.0f, 2.0f, 1.0f);
- \endcode
-
- \sa translate(), rotate()
-*/
-void QMatrix4x4Stack::scale(qreal x, qreal y, qreal z)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.scale(x, y, z);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that scales coordinates by the given \a factor. The following example
- scales the modelview matrix by a factor of 2:
-
- \code
- QGLPainter painter(this);
- painter.modelViewMatrix().scale(2.0f);
- \endcode
-
- \sa translate(), rotate()
-*/
-void QMatrix4x4Stack::scale(qreal factor)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.scale(factor);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that scales coordinates by the components of \a vector.
-
- \sa translate(), rotate()
-*/
-void QMatrix4x4Stack::scale(const QVector3D& vector)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.scale(vector);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that rotates coordinates through \a angle degrees about the vector
- (\a x, \a y, \a z). The following example rotates the modelview
- matrix by 45 degress about the vector (1, -3, 0):
-
- \code
- QGLPainter painter(this);
- painter.modelViewMatrix().rotate(45.0f, 1.0f, -3.0f, 0.0f);
- \endcode
-
- \sa scale(), translate()
-*/
-void QMatrix4x4Stack::rotate(qreal angle, qreal x, qreal y, qreal z)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.rotate(angle, x, y, z);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by another
- that rotates coordinates through \a angle degrees about \a vector.
-
- \sa scale(), translate()
-*/
-void QMatrix4x4Stack::rotate(qreal angle, const QVector3D& vector)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.rotate(angle, vector);
- d->isDirty = true;
-}
-
-/*!
- Multiplies the current matrix at the top of this matrix stack by the
- \a quaternion. Thus \c {painter->modelViewMatrix().rotate(quaternion)}
- is equivalent to the following code:
- \code
- QMatrix4x4 mat;
- mat.rotate(quaternion);
- painter->modelViewMatrix() *= mat;
- \endcode
- which rotates coordinates according to the given \a quaternion.
-
- \sa scale(), translate()
-*/
-void QMatrix4x4Stack::rotate(const QQuaternion &quaternion)
-{
- Q_D(QMatrix4x4Stack);
- d->matrix.rotate(quaternion);
- d->isDirty = true;
-}
-
-/*!
- Returns true if the top of this matrix stack has been modified;
- false otherwise.
-
- \sa setDirty()
-*/
-bool QMatrix4x4Stack::isDirty() const
-{
- Q_D(const QMatrix4x4Stack);
- return d->isDirty;
-}
-
-/*!
- Sets the \a dirty flag on this matrix stack, which indicates
- if it has been modified.
-
- A matrix stack may also be set to dirty by translate(),
- scale(), operator*(), etc.
-
- \sa isDirty()
-*/
-void QMatrix4x4Stack::setDirty(bool dirty)
-{
- Q_D(QMatrix4x4Stack);
- d->isDirty = dirty;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/painting/qmatrix4x4stack.h b/src/gui/extern/Qt3D/painting/qmatrix4x4stack.h
deleted file mode 100644
index e570f8b4802fcb9f0263f24728793b0b4ac82a1f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qmatrix4x4stack.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QMATRIX4X4STACK_H
-#define QMATRIX4X4STACK_H
-
-#include "qt3dglobal.h"
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QMatrix4x4StackPrivate;
-
-class Q_QT3D_EXPORT QMatrix4x4Stack
-{
-public:
- QMatrix4x4Stack();
- ~QMatrix4x4Stack();
-
- const QMatrix4x4 &top() const;
-
- void push();
- void pop();
-
- void setToIdentity();
-
- void translate(qreal x, qreal y, qreal z);
- void translate(const QVector3D& vector);
- void scale(qreal x, qreal y, qreal z);
- void scale(qreal factor);
- void scale(const QVector3D& vector);
- void rotate(qreal angle, qreal x, qreal y, qreal z);
- void rotate(qreal angle, const QVector3D& vector);
- void rotate(const QQuaternion &quaternion);
-
- QMatrix4x4Stack& operator=(const QMatrix4x4& matrix);
- QMatrix4x4Stack& operator*=(const QMatrix4x4& matrix);
-
- operator const QMatrix4x4 &() const;
-
- bool isDirty() const;
- void setDirty(bool dirty);
-
-private:
- Q_DISABLE_COPY(QMatrix4x4Stack)
- Q_DECLARE_PRIVATE(QMatrix4x4Stack)
-
- QScopedPointer<QMatrix4x4StackPrivate> d_ptr;
-
- friend class QGLPainter;
-};
-
-inline QMatrix4x4Stack::operator const QMatrix4x4 &() const
-{
- return top();
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/painting/qmatrix4x4stack_p.h b/src/gui/extern/Qt3D/painting/qmatrix4x4stack_p.h
deleted file mode 100644
index 8837755340f9a830ffcbf6a71fa8bdef9a792cd4..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/painting/qmatrix4x4stack_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QMATRIX4X4STACK_P_H
-#define QMATRIX4X4STACK_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qstack.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QMatrix4x4StackPrivate
-{
-public:
- QMatrix4x4StackPrivate() : isDirty(true) {}
-
- QMatrix4x4 matrix;
- QStack<QMatrix4x4> stack;
- bool isDirty;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/private/CMakeLists.txt b/src/gui/extern/Qt3D/private/CMakeLists.txt
deleted file mode 100644
index 3e23d33204d63168f85a4e5c2ec140aa86abc69e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/private/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-target_sources( gui
- PRIVATE
- qglextensions_p.h
- qfactoryloader_p.h
- )
diff --git a/src/gui/extern/Qt3D/private/qfactoryloader_p.h b/src/gui/extern/Qt3D/private/qfactoryloader_p.h
deleted file mode 100644
index 6a4a97cec857ae293ba7e9d39a37623f517e585c..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/private/qfactoryloader_p.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QFACTORYLOADER_P_H
-#define QFACTORYLOADER_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "QtCore/qobject.h"
-#include "QtCore/qstringlist.h"
-//#include "private/qlibrary_p.h"
-
-#ifndef QT_NO_LIBRARY
-
-QT_BEGIN_NAMESPACE
-
-class QFactoryLoaderPrivate;
-
-#ifdef Q_WS_X11
-class QLibraryPrivate;
-#endif
-
-class Q_CORE_EXPORT QFactoryLoader : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QFactoryLoader)
-
-public:
- QFactoryLoader(const char *iid,
- const QString &suffix = QString(),
- Qt::CaseSensitivity = Qt::CaseSensitive);
- ~QFactoryLoader();
-
- QStringList keys() const;
- QObject *instance(const QString &key) const;
-
-#ifdef Q_WS_X11
- QLibraryPrivate *library(const QString &key) const;
-#endif
-
- void update();
-
- static void refreshAll();
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_LIBRARY
-
-#endif // QFACTORYLOADER_P_H
diff --git a/src/gui/extern/Qt3D/private/qglextensions_p.h b/src/gui/extern/Qt3D/private/qglextensions_p.h
deleted file mode 100644
index c2dbcd950512522c5b9c1e33915d6d5ad3ecc984..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/private/qglextensions_p.h
+++ /dev/null
@@ -1,884 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGL_EXTENSIONS_P_H
-#define QGL_EXTENSIONS_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists for the convenience
-// of the Qt OpenGL classes. This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// extension prototypes
-#ifndef Q_WS_MAC
-# ifndef APIENTRYP
-# ifdef APIENTRY
-# define APIENTRYP APIENTRY *
-# else
-# define APIENTRY
-# define APIENTRYP *
-# endif
-# endif
-#else
-# define APIENTRY
-# define APIENTRYP *
-#endif
-
-#include <QtCore/qglobal.h>
-
-#ifndef GL_ARB_vertex_buffer_object
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_VERSION_2_0
-typedef char GLchar;
-#endif
-
-// ARB_vertex_buffer_object
-typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint);
-typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *);
-typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *);
-typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-typedef void (APIENTRY *_glBufferSubData) (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-typedef void (APIENTRY *_glGetBufferSubData) (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-typedef void (APIENTRY *_glGetBufferParameteriv) (GLenum, GLenum, GLint *);
-typedef GLvoid* (APIENTRY *_glMapBufferARB) (GLenum, GLenum);
-typedef GLboolean (APIENTRY *_glUnmapBufferARB) (GLenum);
-// We can call the buffer functions directly in OpenGL/ES 1.1 or higher,
-// but all other platforms need to resolve the extensions.
-#if defined(QT_OPENGL_ES)
-#if defined(GL_OES_VERSION_1_0) && !defined(GL_OES_VERSION_1_1)
-#define QGL_RESOLVE_BUFFER_FUNCS 1
-#endif
-#else
-#define QGL_RESOLVE_BUFFER_FUNCS 1
-#endif
-
-// ARB_fragment_program
-typedef void (APIENTRY *_glProgramStringARB) (GLenum, GLenum, GLsizei, const GLvoid *);
-typedef void (APIENTRY *_glBindProgramARB) (GLenum, GLuint);
-typedef void (APIENTRY *_glDeleteProgramsARB) (GLsizei, const GLuint *);
-typedef void (APIENTRY *_glGenProgramsARB) (GLsizei, GLuint *);
-typedef void (APIENTRY *_glProgramLocalParameter4fvARB) (GLenum, GLuint, const GLfloat *);
-
-// GLSL
-typedef GLuint (APIENTRY *_glCreateShader) (GLenum);
-typedef void (APIENTRY *_glShaderSource) (GLuint, GLsizei, const char **, const GLint *);
-typedef void (APIENTRY *_glShaderBinary) (GLint, const GLuint*, GLenum, const void*, GLint);
-typedef void (APIENTRY *_glCompileShader) (GLuint);
-typedef void (APIENTRY *_glDeleteShader) (GLuint);
-typedef GLboolean (APIENTRY *_glIsShader) (GLuint);
-
-typedef GLuint (APIENTRY *_glCreateProgram) ();
-typedef void (APIENTRY *_glAttachShader) (GLuint, GLuint);
-typedef void (APIENTRY *_glDetachShader) (GLuint, GLuint);
-typedef void (APIENTRY *_glLinkProgram) (GLuint);
-typedef void (APIENTRY *_glUseProgram) (GLuint);
-typedef void (APIENTRY *_glDeleteProgram) (GLuint);
-typedef GLboolean (APIENTRY *_glIsProgram) (GLuint);
-
-typedef void (APIENTRY *_glGetShaderInfoLog) (GLuint, GLsizei, GLsizei *, char *);
-typedef void (APIENTRY *_glGetShaderiv) (GLuint, GLenum, GLint *);
-typedef void (APIENTRY *_glGetShaderSource) (GLuint, GLsizei, GLsizei *, char *);
-typedef void (APIENTRY *_glGetProgramiv) (GLuint, GLenum, GLint *);
-typedef void (APIENTRY *_glGetProgramInfoLog) (GLuint, GLsizei, GLsizei *, char *);
-
-typedef GLuint (APIENTRY *_glGetUniformLocation) (GLuint, const char*);
-typedef void (APIENTRY *_glUniform4fv) (GLint, GLsizei, const GLfloat *);
-typedef void (APIENTRY *_glUniform3fv) (GLint, GLsizei, const GLfloat *);
-typedef void (APIENTRY *_glUniform2fv) (GLint, GLsizei, const GLfloat *);
-typedef void (APIENTRY *_glUniform1fv) (GLint, GLsizei, const GLfloat *);
-typedef void (APIENTRY *_glUniform1i) (GLint, GLint);
-typedef void (APIENTRY *_glUniform1iv) (GLint, GLsizei, const GLint *);
-typedef void (APIENTRY *_glUniformMatrix2fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix3fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix4fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix2x3fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix2x4fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix3x2fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix3x4fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix4x2fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-typedef void (APIENTRY *_glUniformMatrix4x3fv) (GLint, GLsizei, GLboolean, const GLfloat *);
-
-typedef void (APIENTRY *_glBindAttribLocation) (GLuint, GLuint, const char *);
-typedef GLint (APIENTRY *_glGetAttribLocation) (GLuint, const char *);
-typedef void (APIENTRY *_glVertexAttrib1fv) (GLuint, const GLfloat *);
-typedef void (APIENTRY *_glVertexAttrib2fv) (GLuint, const GLfloat *);
-typedef void (APIENTRY *_glVertexAttrib3fv) (GLuint, const GLfloat *);
-typedef void (APIENTRY *_glVertexAttrib4fv) (GLuint, const GLfloat *);
-typedef void (APIENTRY *_glVertexAttribPointer) (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-typedef void (APIENTRY *_glDisableVertexAttribArray) (GLuint);
-typedef void (APIENTRY *_glEnableVertexAttribArray) (GLuint);
-
-typedef void (APIENTRY *_glGetProgramBinaryOES) (GLuint, GLsizei, GLsizei *, GLenum *, void *);
-typedef void (APIENTRY *_glProgramBinaryOES) (GLuint, GLenum, const void *, GLint);
-
-
-typedef void (APIENTRY *_glMultiTexCoord4f) (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-typedef void (APIENTRY *_glActiveStencilFaceEXT) (GLenum );
-
-// Needed for GL2 engine:
-typedef void (APIENTRY *_glStencilOpSeparate) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRY *_glActiveTexture) (GLenum);
-typedef void (APIENTRY *_glBlendColor) (GLclampf, GLclampf, GLclampf, GLclampf);
-
-
-// EXT_GL_framebuffer_object
-typedef GLboolean (APIENTRY *_glIsRenderbuffer) (GLuint renderbuffer);
-typedef void (APIENTRY *_glBindRenderbuffer) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRY *_glDeleteRenderbuffers) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRY *_glGenRenderbuffers) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRY *_glRenderbufferStorage) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRY *_glGetRenderbufferParameteriv) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRY *_glIsFramebuffer) (GLuint framebuffer);
-typedef void (APIENTRY *_glBindFramebuffer) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRY *_glDeleteFramebuffers) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRY *_glGenFramebuffers) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRY *_glCheckFramebufferStatus) (GLenum target);
-typedef void (APIENTRY *_glFramebufferTexture2D) (GLenum target, GLenum attachment, GLenum textarget,
- GLuint texture, GLint level);
-typedef void (APIENTRY *_glFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget,
- GLuint renderbuffer);
-typedef void (APIENTRY *_glGetFramebufferAttachmentParameteriv) (GLenum target, GLenum attachment, GLenum pname,
- GLint *params);
-typedef void (APIENTRY *_glGenerateMipmap) (GLenum target);
-
-// EXT_GL_framebuffer_blit
-typedef void (APIENTRY *_glBlitFramebufferEXT) (int srcX0, int srcY0, int srcX1, int srcY1,
- int dstX0, int dstY0, int dstX1, int dstY1,
- GLbitfield mask, GLenum filter);
-
-// EXT_GL_framebuffer_multisample
-typedef void (APIENTRY *_glRenderbufferStorageMultisampleEXT) (GLenum target, GLsizei samples,
- GLenum internalformat, GLsizei width, GLsizei height);
-
-// GL_EXT_geometry_shader4
-typedef void (APIENTRY *_glProgramParameteriEXT)(GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRY *_glFramebufferTextureEXT)(GLenum target, GLenum attachment,
- GLuint texture, GLint level);
-typedef void (APIENTRY *_glFramebufferTextureLayerEXT)(GLenum target, GLenum attachment,
- GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRY *_glFramebufferTextureFaceEXT)(GLenum target, GLenum attachment,
- GLuint texture, GLint level, GLenum face);
-
-// ARB_texture_compression
-typedef void (APIENTRY *_glCompressedTexImage2DARB) (GLenum, GLint, GLenum, GLsizei,
- GLsizei, GLint, GLsizei, const GLvoid *);
-
-QT_BEGIN_NAMESPACE
-
-struct QGLExtensionFuncs
-{
- QGLExtensionFuncs() {
-#if !defined(QT_OPENGL_ES_2)
- qt_glProgramStringARB = 0;
- qt_glBindProgramARB = 0;
- qt_glDeleteProgramsARB = 0;
- qt_glGenProgramsARB = 0;
- qt_glProgramLocalParameter4fvARB = 0;
-
- // GLSL
- qt_glCreateShader = 0;
- qt_glShaderSource = 0;
- qt_glShaderBinary = 0;
- qt_glCompileShader = 0;
- qt_glDeleteShader = 0;
- qt_glIsShader = 0;
-
- qt_glCreateProgram = 0;
- qt_glAttachShader = 0;
- qt_glDetachShader = 0;
- qt_glLinkProgram = 0;
- qt_glUseProgram = 0;
- qt_glDeleteProgram = 0;
- qt_glIsProgram = 0;
-
- qt_glGetShaderInfoLog = 0;
- qt_glGetShaderiv = 0;
- qt_glGetShaderSource = 0;
- qt_glGetProgramiv = 0;
- qt_glGetProgramInfoLog = 0;
-
- qt_glGetUniformLocation = 0;
- qt_glUniform4fv = 0;
- qt_glUniform3fv = 0;
- qt_glUniform2fv = 0;
- qt_glUniform1fv = 0;
- qt_glUniform1i = 0;
- qt_glUniform1iv = 0;
- qt_glUniformMatrix2fv = 0;
- qt_glUniformMatrix3fv = 0;
- qt_glUniformMatrix4fv = 0;
- qt_glUniformMatrix2x3fv = 0;
- qt_glUniformMatrix2x4fv = 0;
- qt_glUniformMatrix3x2fv = 0;
- qt_glUniformMatrix3x4fv = 0;
- qt_glUniformMatrix4x2fv = 0;
- qt_glUniformMatrix4x3fv = 0;
-
- qt_glBindAttribLocation = 0;
- qt_glGetAttribLocation = 0;
- qt_glVertexAttrib1fv = 0;
- qt_glVertexAttrib2fv = 0;
- qt_glVertexAttrib3fv = 0;
- qt_glVertexAttrib4fv = 0;
- qt_glVertexAttribPointer = 0;
- qt_glDisableVertexAttribArray = 0;
- qt_glEnableVertexAttribArray = 0;
-
- // Extras for GL2 engine:
- qt_glActiveTexture = 0;
- qt_glStencilOpSeparate = 0;
- qt_glBlendColor = 0;
-
- qt_glActiveStencilFaceEXT = 0;
- qt_glMultiTexCoord4f = 0;
-#else
- qt_glslResolved = false;
-
- qt_glGetProgramBinaryOES = 0;
- qt_glProgramBinaryOES = 0;
-#endif
-
- // FBOs
-#if !defined(QT_OPENGL_ES_2)
- qt_glIsRenderbuffer = 0;
- qt_glBindRenderbuffer = 0;
- qt_glDeleteRenderbuffers = 0;
- qt_glGenRenderbuffers = 0;
- qt_glRenderbufferStorage = 0;
- qt_glGetRenderbufferParameteriv = 0;
- qt_glIsFramebuffer = 0;
- qt_glBindFramebuffer = 0;
- qt_glDeleteFramebuffers = 0;
- qt_glGenFramebuffers = 0;
- qt_glCheckFramebufferStatus = 0;
- qt_glFramebufferTexture2D = 0;
- qt_glFramebufferRenderbuffer = 0;
- qt_glGetFramebufferAttachmentParameteriv = 0;
- qt_glGenerateMipmap = 0;
-#endif
- qt_glBlitFramebufferEXT = 0;
- qt_glRenderbufferStorageMultisampleEXT = 0;
-
- // Buffer objects:
-#if defined(QGL_RESOLVE_BUFFER_FUNCS)
- qt_glBindBuffer = 0;
- qt_glDeleteBuffers = 0;
- qt_glGenBuffers = 0;
- qt_glBufferData = 0;
- qt_glBufferSubData = 0;
- qt_glGetBufferSubData = 0;
- qt_glGetBufferParameteriv = 0;
-#endif
- qt_glMapBufferARB = 0;
- qt_glUnmapBufferARB = 0;
-
- qt_glProgramParameteriEXT = 0;
- qt_glFramebufferTextureEXT = 0;
- qt_glFramebufferTextureLayerEXT = 0;
- qt_glFramebufferTextureFaceEXT = 0;
-#if !defined(QT_OPENGL_ES)
- // Texture compression
- qt_glCompressedTexImage2DARB = 0;
-#endif
-
-#ifndef QT_NO_EGL
- // OES_EGL_image
- //qt_glEGLImageTargetTexture2DOES = 0;
- //qt_glEGLImageTargetRenderbufferStorageOES = 0;
-#endif
- }
-
-
-#if !defined(QT_OPENGL_ES_2)
- _glProgramStringARB qt_glProgramStringARB;
- _glBindProgramARB qt_glBindProgramARB;
- _glDeleteProgramsARB qt_glDeleteProgramsARB;
- _glGenProgramsARB qt_glGenProgramsARB;
- _glProgramLocalParameter4fvARB qt_glProgramLocalParameter4fvARB;
-
- // GLSL definitions
- _glCreateShader qt_glCreateShader;
- _glShaderSource qt_glShaderSource;
- _glShaderBinary qt_glShaderBinary;
- _glCompileShader qt_glCompileShader;
- _glDeleteShader qt_glDeleteShader;
- _glIsShader qt_glIsShader;
-
- _glCreateProgram qt_glCreateProgram;
- _glAttachShader qt_glAttachShader;
- _glDetachShader qt_glDetachShader;
- _glLinkProgram qt_glLinkProgram;
- _glUseProgram qt_glUseProgram;
- _glDeleteProgram qt_glDeleteProgram;
- _glIsProgram qt_glIsProgram;
-
- _glGetShaderInfoLog qt_glGetShaderInfoLog;
- _glGetShaderiv qt_glGetShaderiv;
- _glGetShaderSource qt_glGetShaderSource;
- _glGetProgramiv qt_glGetProgramiv;
- _glGetProgramInfoLog qt_glGetProgramInfoLog;
-
- _glGetUniformLocation qt_glGetUniformLocation;
- _glUniform4fv qt_glUniform4fv;
- _glUniform3fv qt_glUniform3fv;
- _glUniform2fv qt_glUniform2fv;
- _glUniform1fv qt_glUniform1fv;
- _glUniform1i qt_glUniform1i;
- _glUniform1iv qt_glUniform1iv;
- _glUniformMatrix2fv qt_glUniformMatrix2fv;
- _glUniformMatrix3fv qt_glUniformMatrix3fv;
- _glUniformMatrix4fv qt_glUniformMatrix4fv;
- _glUniformMatrix2x3fv qt_glUniformMatrix2x3fv;
- _glUniformMatrix2x4fv qt_glUniformMatrix2x4fv;
- _glUniformMatrix3x2fv qt_glUniformMatrix3x2fv;
- _glUniformMatrix3x4fv qt_glUniformMatrix3x4fv;
- _glUniformMatrix4x2fv qt_glUniformMatrix4x2fv;
- _glUniformMatrix4x3fv qt_glUniformMatrix4x3fv;
-
- _glBindAttribLocation qt_glBindAttribLocation;
- _glGetAttribLocation qt_glGetAttribLocation;
- _glVertexAttrib1fv qt_glVertexAttrib1fv;
- _glVertexAttrib2fv qt_glVertexAttrib2fv;
- _glVertexAttrib3fv qt_glVertexAttrib3fv;
- _glVertexAttrib4fv qt_glVertexAttrib4fv;
- _glVertexAttribPointer qt_glVertexAttribPointer;
- _glDisableVertexAttribArray qt_glDisableVertexAttribArray;
- _glEnableVertexAttribArray qt_glEnableVertexAttribArray;
-
-#else
- bool qt_glslResolved;
-
- _glGetProgramBinaryOES qt_glGetProgramBinaryOES;
- _glProgramBinaryOES qt_glProgramBinaryOES;
-#endif
-
- _glActiveStencilFaceEXT qt_glActiveStencilFaceEXT;
- _glMultiTexCoord4f qt_glMultiTexCoord4f;
-
-#if !defined(QT_OPENGL_ES_2)
- // Extras needed for GL2 engine:
- _glActiveTexture qt_glActiveTexture;
- _glStencilOpSeparate qt_glStencilOpSeparate;
- _glBlendColor qt_glBlendColor;
-
-#endif
-
- // FBOs
-#if !defined(QT_OPENGL_ES_2)
- _glIsRenderbuffer qt_glIsRenderbuffer;
- _glBindRenderbuffer qt_glBindRenderbuffer;
- _glDeleteRenderbuffers qt_glDeleteRenderbuffers;
- _glGenRenderbuffers qt_glGenRenderbuffers;
- _glRenderbufferStorage qt_glRenderbufferStorage;
- _glGetRenderbufferParameteriv qt_glGetRenderbufferParameteriv;
- _glIsFramebuffer qt_glIsFramebuffer;
- _glBindFramebuffer qt_glBindFramebuffer;
- _glDeleteFramebuffers qt_glDeleteFramebuffers;
- _glGenFramebuffers qt_glGenFramebuffers;
- _glCheckFramebufferStatus qt_glCheckFramebufferStatus;
- _glFramebufferTexture2D qt_glFramebufferTexture2D;
- _glFramebufferRenderbuffer qt_glFramebufferRenderbuffer;
- _glGetFramebufferAttachmentParameteriv qt_glGetFramebufferAttachmentParameteriv;
- _glGenerateMipmap qt_glGenerateMipmap;
-#endif
- _glBlitFramebufferEXT qt_glBlitFramebufferEXT;
- _glRenderbufferStorageMultisampleEXT qt_glRenderbufferStorageMultisampleEXT;
-
- // Buffer objects
-#if defined(QGL_RESOLVE_BUFFER_FUNCS)
- _glBindBuffer qt_glBindBuffer;
- _glDeleteBuffers qt_glDeleteBuffers;
- _glGenBuffers qt_glGenBuffers;
- _glBufferData qt_glBufferData;
- _glBufferSubData qt_glBufferSubData;
- _glGetBufferSubData qt_glGetBufferSubData;
- _glGetBufferParameteriv qt_glGetBufferParameteriv;
-#endif
- _glMapBufferARB qt_glMapBufferARB;
- _glUnmapBufferARB qt_glUnmapBufferARB;
-
- // Geometry shaders...
- _glProgramParameteriEXT qt_glProgramParameteriEXT;
- _glFramebufferTextureEXT qt_glFramebufferTextureEXT;
- _glFramebufferTextureLayerEXT qt_glFramebufferTextureLayerEXT;
- _glFramebufferTextureFaceEXT qt_glFramebufferTextureFaceEXT;
-#if !defined(QT_OPENGL_ES)
- // Texture compression
- _glCompressedTexImage2DARB qt_glCompressedTexImage2DARB;
-#endif
-
-#ifndef QT_NO_EGL
- // OES_EGL_image
- //_glEGLImageTargetTexture2DOES qt_glEGLImageTargetTexture2DOES;
- //_glEGLImageTargetRenderbufferStorageOES qt_glEGLImageTargetRenderbufferStorageOES;
-#endif
-};
-
-
-// OpenGL constants
-
-#ifndef GL_ARRAY_BUFFER
-#define GL_ARRAY_BUFFER 0x8892
-#endif
-
-#ifndef GL_STATIC_DRAW
-#define GL_STATIC_DRAW 0x88E4
-#endif
-
-/* NV_texture_rectangle */
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8
-#endif
-
-#ifndef GL_BGRA
-#define GL_BGRA 0x80E1
-#endif
-
-#ifndef GL_RGB16
-#define GL_RGB16 0x8054
-#endif
-
-#ifndef GL_UNSIGNED_SHORT_5_6_5
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#endif
-
-#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#endif
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE 0x809D
-#endif
-
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE 0x812F
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM 0x8370
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS 0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
-#endif
-
-// ARB_fragment_program extension protos
-#ifndef GL_FRAGMENT_PROGRAM_ARB
-#define GL_FRAGMENT_PROGRAM_ARB 0x8804
-#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
-#endif
-
-#ifndef GL_PIXEL_UNPACK_BUFFER_ARB
-#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
-#endif
-
-#ifndef GL_WRITE_ONLY_ARB
-#define GL_WRITE_ONLY_ARB 0x88B9
-#endif
-
-#ifndef GL_STREAM_DRAW_ARB
-#define GL_STREAM_DRAW_ARB 0x88E0
-#endif
-
-// Stencil wrap and two-side defines
-#ifndef GL_STENCIL_TEST_TWO_SIDE_EXT
-#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910
-#endif
-#ifndef GL_INCR_WRAP_EXT
-#define GL_INCR_WRAP_EXT 0x8507
-#endif
-#ifndef GL_DECR_WRAP_EXT
-#define GL_DECR_WRAP_EXT 0x8508
-#endif
-
-#ifndef GL_TEXTURE0
-#define GL_TEXTURE0 0x84C0
-#endif
-
-#ifndef GL_TEXTURE1
-#define GL_TEXTURE1 0x84C1
-#endif
-
-#ifndef GL_DEPTH_COMPONENT16
-#define GL_DEPTH_COMPONENT16 0x81A5
-#endif
-
-#ifndef GL_DEPTH_COMPONENT24_OES
-#define GL_DEPTH_COMPONENT24_OES 0x81A6
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT 0x8D20
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#define GL_RENDERBUFFER_EXT 0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX_EXT 0x8D45
-#define GL_STENCIL_INDEX1_EXT 0x8D46
-#define GL_STENCIL_INDEX4_EXT 0x8D47
-#define GL_STENCIL_INDEX8_EXT 0x8D48
-#define GL_STENCIL_INDEX16_EXT 0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55
-#endif
-
-// GL_EXT_framebuffer_blit
-#ifndef GL_READ_FRAMEBUFFER_EXT
-#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
-#endif
-
-// GL_EXT_framebuffer_multisample
-#ifndef GL_RENDERBUFFER_SAMPLES_EXT
-#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
-#endif
-
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#endif
-
-#ifndef GL_MAX_SAMPLES_EXT
-#define GL_MAX_SAMPLES_EXT 0x8D57
-#endif
-
-#ifndef GL_DRAW_FRAMEBUFFER_EXT
-#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT 0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
-#define GL_DEPTH24_STENCIL8_EXT 0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
-#endif
-
-// ### hm. should be part of the GL 1.2 spec..
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE 0x812F
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_PACK_SKIP_IMAGES 0x806B
-#define GL_PACK_IMAGE_HEIGHT 0x806C
-#define GL_UNPACK_SKIP_IMAGES 0x806D
-#define GL_UNPACK_IMAGE_HEIGHT 0x806E
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_CONSTANT_COLOR 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define GL_CONSTANT_ALPHA 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#define GL_INCR_WRAP 0x8507
-#define GL_DECR_WRAP 0x8508
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#define GL_STREAM_DRAW 0x88E0
-#define GL_STREAM_READ 0x88E1
-#define GL_STREAM_COPY 0x88E2
-#define GL_STATIC_DRAW 0x88E4
-#define GL_STATIC_READ 0x88E5
-#define GL_STATIC_COPY 0x88E6
-#define GL_DYNAMIC_DRAW 0x88E8
-#define GL_DYNAMIC_READ 0x88E9
-#define GL_DYNAMIC_COPY 0x88EA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_FLOAT_VEC2 0x8B50
-#define GL_FLOAT_VEC3 0x8B51
-#define GL_FLOAT_VEC4 0x8B52
-#define GL_INT_VEC2 0x8B53
-#define GL_INT_VEC3 0x8B54
-#define GL_INT_VEC4 0x8B55
-#define GL_BOOL 0x8B56
-#define GL_BOOL_VEC2 0x8B57
-#define GL_BOOL_VEC3 0x8B58
-#define GL_BOOL_VEC4 0x8B59
-#define GL_FLOAT_MAT2 0x8B5A
-#define GL_FLOAT_MAT3 0x8B5B
-#define GL_FLOAT_MAT4 0x8B5C
-#define GL_SAMPLER_1D 0x8B5D
-#define GL_SAMPLER_2D 0x8B5E
-#define GL_SAMPLER_3D 0x8B5F
-#define GL_SAMPLER_CUBE 0x8B60
-#define GL_COMPILE_STATUS 0x8B81
-#define GL_LINK_STATUS 0x8B82
-#define GL_INFO_LOG_LENGTH 0x8B84
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#endif
-
-// Geometry shader defines
-#ifndef GL_GEOMETRY_SHADER_EXT
-# define GL_GEOMETRY_SHADER_EXT 0x8DD9
-# define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA
-# define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB
-# define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC
-# define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-# define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-# define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-# define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B
-# define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-# define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-# define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-# define GL_LINES_ADJACENCY_EXT 0xA
-# define GL_LINE_STRIP_ADJACENCY_EXT 0xB
-# define GL_TRIANGLES_ADJACENCY_EXT 0xC
-# define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD
-# define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-# define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-# define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-# define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-# define GL_PROGRAM_POINT_SIZE_EXT 0x8642
-#endif
-
-#if !defined(QT_OPENGL_ES_2)
-#define glProgramStringARB QGLContextPrivate::extensionFuncs(ctx).qt_glProgramStringARB
-#define glBindProgramARB QGLContextPrivate::extensionFuncs(ctx).qt_glBindProgramARB
-#define glDeleteProgramsARB QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteProgramsARB
-#define glGenProgramsARB QGLContextPrivate::extensionFuncs(ctx).qt_glGenProgramsARB
-#define glProgramLocalParameter4fvARB QGLContextPrivate::extensionFuncs(ctx).qt_glProgramLocalParameter4fvARB
-
-#define glActiveStencilFaceEXT QGLContextPrivate::extensionFuncs(ctx).qt_glActiveStencilFaceEXT
-
-#define glMultiTexCoord4f QGLContextPrivate::extensionFuncs(ctx).qt_glMultiTexCoord4f
-
-#define glActiveTexture QGLContextPrivate::extensionFuncs(ctx).qt_glActiveTexture
-#endif // !defined(QT_OPENGL_ES_2)
-
-
-// FBOs
-#if !defined(QT_OPENGL_ES_2)
-#define glIsRenderbuffer QGLContextPrivate::extensionFuncs(ctx).qt_glIsRenderbuffer
-#define glBindRenderbuffer QGLContextPrivate::extensionFuncs(ctx).qt_glBindRenderbuffer
-#define glDeleteRenderbuffers QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteRenderbuffers
-#define glGenRenderbuffers QGLContextPrivate::extensionFuncs(ctx).qt_glGenRenderbuffers
-#define glRenderbufferStorage QGLContextPrivate::extensionFuncs(ctx).qt_glRenderbufferStorage
-#define glGetRenderbufferParameteriv QGLContextPrivate::extensionFuncs(ctx).qt_glGetRenderbufferParameteriv
-#define glIsFramebuffer QGLContextPrivate::extensionFuncs(ctx).qt_glIsFramebuffer
-#define glBindFramebuffer QGLContextPrivate::extensionFuncs(ctx).qt_glBindFramebuffer
-#define glDeleteFramebuffers QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteFramebuffers
-#define glGenFramebuffers QGLContextPrivate::extensionFuncs(ctx).qt_glGenFramebuffers
-#define glCheckFramebufferStatus QGLContextPrivate::extensionFuncs(ctx).qt_glCheckFramebufferStatus
-#define glFramebufferTexture2D QGLContextPrivate::extensionFuncs(ctx).qt_glFramebufferTexture2D
-#define glFramebufferRenderbuffer QGLContextPrivate::extensionFuncs(ctx).qt_glFramebufferRenderbuffer
-#define glGetFramebufferAttachmentParameteriv QGLContextPrivate::extensionFuncs(ctx).qt_glGetFramebufferAttachmentParameteriv
-#define glGenerateMipmap QGLContextPrivate::extensionFuncs(ctx).qt_glGenerateMipmap
-#endif // QT_OPENGL_ES_2
-#define glBlitFramebufferEXT QGLContextPrivate::extensionFuncs(ctx).qt_glBlitFramebufferEXT
-#define glRenderbufferStorageMultisampleEXT QGLContextPrivate::extensionFuncs(ctx).qt_glRenderbufferStorageMultisampleEXT
-
-
-// Buffer objects
-#if defined(QGL_RESOLVE_BUFFER_FUNCS)
-#define glBindBuffer QGLContextPrivate::extensionFuncs(ctx).qt_glBindBuffer
-#define glDeleteBuffers QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteBuffers
-#define glGenBuffers QGLContextPrivate::extensionFuncs(ctx).qt_glGenBuffers
-#define glBufferData QGLContextPrivate::extensionFuncs(ctx).qt_glBufferData
-#define glBufferSubData QGLContextPrivate::extensionFuncs(ctx).qt_glBufferSubData
-#define glGetBufferSubData QGLContextPrivate::extensionFuncs(ctx).qt_glGetBufferSubData
-#define glGetBufferParameteriv QGLContextPrivate::extensionFuncs(ctx).qt_glGetBufferParameteriv
-#endif
-#define glMapBufferARB QGLContextPrivate::extensionFuncs(ctx).qt_glMapBufferARB
-#define glUnmapBufferARB QGLContextPrivate::extensionFuncs(ctx).qt_glUnmapBufferARB
-
-
-// GLSL
-#if !defined(QT_OPENGL_ES_2)
-
-#define glCreateShader QGLContextPrivate::extensionFuncs(ctx).qt_glCreateShader
-#define glShaderSource QGLContextPrivate::extensionFuncs(ctx).qt_glShaderSource
-#define glShaderBinary QGLContextPrivate::extensionFuncs(ctx).qt_glShaderBinary
-#define glCompileShader QGLContextPrivate::extensionFuncs(ctx).qt_glCompileShader
-#define glDeleteShader QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteShader
-#define glIsShader QGLContextPrivate::extensionFuncs(ctx).qt_glIsShader
-
-#define glCreateProgram QGLContextPrivate::extensionFuncs(ctx).qt_glCreateProgram
-#define glAttachShader QGLContextPrivate::extensionFuncs(ctx).qt_glAttachShader
-#define glDetachShader QGLContextPrivate::extensionFuncs(ctx).qt_glDetachShader
-#define glLinkProgram QGLContextPrivate::extensionFuncs(ctx).qt_glLinkProgram
-#define glUseProgram QGLContextPrivate::extensionFuncs(ctx).qt_glUseProgram
-#define glDeleteProgram QGLContextPrivate::extensionFuncs(ctx).qt_glDeleteProgram
-#define glIsProgram QGLContextPrivate::extensionFuncs(ctx).qt_glIsProgram
-
-#define glGetShaderInfoLog QGLContextPrivate::extensionFuncs(ctx).qt_glGetShaderInfoLog
-#define glGetShaderiv QGLContextPrivate::extensionFuncs(ctx).qt_glGetShaderiv
-#define glGetShaderSource QGLContextPrivate::extensionFuncs(ctx).qt_glGetShaderSource
-#define glGetProgramiv QGLContextPrivate::extensionFuncs(ctx).qt_glGetProgramiv
-#define glGetProgramInfoLog QGLContextPrivate::extensionFuncs(ctx).qt_glGetProgramInfoLog
-
-#define glGetUniformLocation QGLContextPrivate::extensionFuncs(ctx).qt_glGetUniformLocation
-#define glUniform4fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniform4fv
-#define glUniform3fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniform3fv
-#define glUniform2fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniform2fv
-#define glUniform1fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniform1fv
-#define glUniform1i QGLContextPrivate::extensionFuncs(ctx).qt_glUniform1i
-#define glUniform1iv QGLContextPrivate::extensionFuncs(ctx).qt_glUniform1iv
-#define glUniformMatrix2fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix2fv
-#define glUniformMatrix3fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix3fv
-#define glUniformMatrix4fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix4fv
-#define glUniformMatrix2x3fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix2x3fv
-#define glUniformMatrix2x4fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix2x4fv
-#define glUniformMatrix3x2fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix3x2fv
-#define glUniformMatrix3x4fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix3x4fv
-#define glUniformMatrix4x2fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix4x2fv
-#define glUniformMatrix4x3fv QGLContextPrivate::extensionFuncs(ctx).qt_glUniformMatrix4x3fv
-
-#define glBindAttribLocation QGLContextPrivate::extensionFuncs(ctx).qt_glBindAttribLocation
-#define glGetAttribLocation QGLContextPrivate::extensionFuncs(ctx).qt_glGetAttribLocation
-#define glVertexAttrib1fv QGLContextPrivate::extensionFuncs(ctx).qt_glVertexAttrib1fv
-#define glVertexAttrib2fv QGLContextPrivate::extensionFuncs(ctx).qt_glVertexAttrib2fv
-#define glVertexAttrib3fv QGLContextPrivate::extensionFuncs(ctx).qt_glVertexAttrib3fv
-#define glVertexAttrib4fv QGLContextPrivate::extensionFuncs(ctx).qt_glVertexAttrib4fv
-#define glVertexAttribPointer QGLContextPrivate::extensionFuncs(ctx).qt_glVertexAttribPointer
-#define glDisableVertexAttribArray QGLContextPrivate::extensionFuncs(ctx).qt_glDisableVertexAttribArray
-#define glEnableVertexAttribArray QGLContextPrivate::extensionFuncs(ctx).qt_glEnableVertexAttribArray
-
-#else // QT_OPENGL_ES_2
-
-#define glGetProgramBinaryOES QGLContextPrivate::extensionFuncs(ctx).qt_glGetProgramBinaryOES
-#define glProgramBinaryOES QGLContextPrivate::extensionFuncs(ctx).qt_glProgramBinaryOES
-
-#endif // QT_OPENGL_ES_2
-
-
-#if !defined(QT_OPENGL_ES_2)
-#define glStencilOpSeparate QGLContextPrivate::extensionFuncs(ctx).qt_glStencilOpSeparate
-#define glBlendColor QGLContextPrivate::extensionFuncs(ctx).qt_glBlendColor
-#endif
-
-#if defined(QT_OPENGL_ES_2)
-#define glClearDepth glClearDepthf
-#endif
-
-#define glProgramParameteriEXT QGLContextPrivate::extensionFuncs(ctx).qt_glProgramParameteriEXT
-#define glFramebufferTextureEXT QGLContextPrivate::extensionFuncs(ctx).qt_glFramebufferTextureEXT
-#define glFramebufferTextureLayerEXT QGLContextPrivate::extensionFuncs(ctx).qt_glFramebufferTextureLayerEXT
-#define glFramebufferTextureFaceEXT QGLContextPrivate::extensionFuncs(ctx).qt_glFramebufferTextureFaceEXT
-
-#if !defined(QT_OPENGL_ES)
-#define glCompressedTexImage2D QGLContextPrivate::extensionFuncs(ctx).qt_glCompressedTexImage2DARB
-#endif
-
-#ifndef QT_NO_EGL
-// OES_EGL_image
-#define glEGLImageTargetTexture2DOES QGLContextPrivate::extensionFuncs(ctx).qt_glEGLImageTargetTexture2DOES
-#define glEGLImageTargetRenderbufferStorageOES QGLContextPrivate::extensionFuncs(ctx).qt_glEGLImageTargetRenderbufferStorageOES
-#endif
-
-extern bool qt_resolve_framebufferobject_extensions(QGLContext *ctx);
-bool qt_resolve_buffer_extensions(QGLContext *ctx);
-
-bool qt_resolve_version_1_3_functions(QGLContext *ctx);
-bool qt_resolve_version_2_0_functions(QGLContext *ctx);
-bool qt_resolve_stencil_face_extension(QGLContext *ctx);
-bool qt_resolve_frag_program_extensions(QGLContext *ctx);
-
-bool qt_resolve_glsl_extensions(QGLContext *ctx);
-
-#ifndef QT_NO_EGL
-Q_OPENGL_EXPORT bool qt_resolve_eglimage_gl_extensions(QGLContext *ctx);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QGL_EXTENSIONS_P_H
diff --git a/src/gui/extern/Qt3D/scene/CMakeLists.txt b/src/gui/extern/Qt3D/scene/CMakeLists.txt
deleted file mode 100644
index a71295da55c99fcfb82074f6fabbce2d82eb3bf6..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-target_sources( gui
- PRIVATE
- qglscenenode_p.h
- qglsceneformatplugin.h
- qglscenenode.cpp
- qglrendersequencer.cpp
- qglabstractscene.h
- qglrenderordercomparator.h
- qglscenenode.h
- qglsceneformatplugin.cpp
- qglrenderordercomparator.cpp
- qglrenderorder.h
- qglrendersequencer.h
- qglpicknode.h
- qglpicknode.cpp
- qglabstractscene.cpp
- qglrenderstate.h
- qglrenderstate.cpp
- qglrenderorder.cpp
- )
diff --git a/src/gui/extern/Qt3D/scene/qglabstractscene.cpp b/src/gui/extern/Qt3D/scene/qglabstractscene.cpp
deleted file mode 100644
index 9f0df4c7881cf84a159745164f33a191f932f5d8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglabstractscene.cpp
+++ /dev/null
@@ -1,609 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglabstractscene.h"
-#include "qglsceneformatplugin.h"
-#include "qglpicknode.h"
-
-// copied private header
-#include "qfactoryloader_p.h"
-
-#include <QtCore/qfile.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qlibraryinfo.h>
-//#include <QtNetwork/qnetworkreply.h>
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qpluginloader.h>
-#include <QBuffer>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAbstractScene
- \brief The QGLAbstractScene class represents a 3D scene consisting of zero or more QGLSceneNode instances.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- Scenes are typically created by 3D modelling packages and then loaded
- into the application via a QGLSceneFormatPlugin; but they can also be
- constructed programatically. The functions in this
- class provide access to major scene objects so that they can be
- applied or drawn whenever the application decides.
-
- QGLAbstractScene presents a very simple model of a 3D scene. Subclasses
- implement the specific scene graph and object representations in a
- manner specific to the package's format. Subclasses may also provide
- functionality to create new objects at runtime, but this is not required.
-
- The scene is defined to consist of a number of important objects
- of the following types:
-
- \list
- \o Camera objects define a viewing position in world-coordinates and a
- projection that maps 3D world co-ordinates to 2D screen co-ordinates.
- Camera objects should inherit from QGLCamera.
- \o Main objects designate the major elements of the scene besides
- cameras, lights, and effects. Usually they inherit from QGLSceneNode.
- \o Light objects define positions and parameters for lighting the scene.
- Light objects should inherit from QGLLightParameters.
- \o Effect objects define materials, shaders, and textures for use in
- rendering the surface of objects. Normally effects are activated
- automatically when main objects are drawn. But effects can be used
- independently if the 3D format is acting as a library of effects.
- \o Mesh objects define geometry information independently of effects.
- Normally meshes are drawn automatically with an appropriate effect
- when main objects are drawn. But meshes can be used independently
- if the 3D format is acting as a library of meshes. Mesh objects
- should inherit from QGLSceneNode.
- \endlist
-
- Typically, the full scene represented by an external model format
- is not interesting to the application. 3D modelling packages
- regularly insert cameras, lights, effects, and other library
- objects that are useful to the modelling package, but not the
- application. The mainNode() is usually the most interesting
- to applications.
-
- QGLAbstractScene makes it easy to access the major scene elements
- with object(), objects(), and mainNode().
-
- There are many other kinds of objects in the scene that may not
- be accessible via QGLAbstractScene because they are not considered
- "important" enough. For example, a file that contains the data
- for a skateboard object would contain many objects for the board,
- wheels, texturing effects, animations, and so on. The application
- may only be interested in the skateboard as a whole, and not its
- sub-components. The skateboard would be considered an important
- main object in this case, which can be easily accessed and
- incorporated into the application's logic.
-
- Each Subclass needs to provide its own policy for deciding which
- objects are considered "important".
-
- \sa QGLSceneNode, QGLSceneFormatPlugin
-*/
-
-class QGLAbstractScenePrivate
-{
-public:
- QGLAbstractScenePrivate()
- : picking(false), nextPickId(-1), pickNodesDirty(true) {}
- bool picking;
- int nextPickId;
- QList<QGLPickNode*> pickNodes;
- QSet<QGLSceneNode*> pickable;
- bool pickNodesDirty;
-};
-
-/*!
- Constructs a 3D scene and attaches it to \a parent.
-*/
-QGLAbstractScene::QGLAbstractScene(QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLAbstractScenePrivate)
-{
-}
-
-/*!
- Destroys this 3D scene.
-*/
-QGLAbstractScene::~QGLAbstractScene()
-{
-}
-
-/*!
- \internal
-*/
-void QGLAbstractScene::childEvent(QChildEvent *event)
-{
- Q_D(QGLAbstractScene);
- if (event->type() == QEvent::ChildAdded)
- d->pickNodesDirty = true;
-}
-
-/*!
- Sets this scene to be pickable if \a enable is true, otherwise picking
- is disabled. If the scene is set to be pickable, pick nodes are
- generated by calling generatePickNodes().
-
- \sa generatePickNodes(), pickable()
-*/
-void QGLAbstractScene::setPickable(bool enable)
-{
- Q_D(QGLAbstractScene);
- if (enable != d->picking)
- {
- d->picking = enable;
- if (d->picking)
- generatePickNodes();
- }
-}
-
-/*!
- Returns true if this scene is pickable.
-
- \sa setPickable()
-*/
-bool QGLAbstractScene::pickable() const
-{
- Q_D(const QGLAbstractScene);
- return d->picking;
-}
-
-/*!
- Generates QGLPickNode instances for important QGLSceneNode instances that are
- pickable. Objects that are either not important or not pickable can
- be omitted. The default implementation simply generates pick nodes
- for every top level object of type QGLSceneNode.
-
- Sub-classes may implement different schemes for picking. When doing
- so parent the QGLPickNode objects onto the scene, so that they will
- appear in the list returned by pickNodes()
-
- \sa pickNodes(), setPickable()
-*/
-void QGLAbstractScene::generatePickNodes()
-{
- Q_D(QGLAbstractScene);
- QList<QObject *> objs = objects();
- QList<QObject *>::iterator it = objs.begin();
- d->pickNodes.clear();
- for ( ; it != objs.end(); ++it)
- {
- QGLSceneNode *n = qobject_cast<QGLSceneNode *>(*it);
- if (d) {
- if (!d->pickable.contains(n)) {
- n->setPickNode(new QGLPickNode(this));
- d->pickable.insert(n);
- }
- d->pickNodes.append(n->pickNode());
- }
- }
-}
-
-/*!
- Increments and returns the next available pick id for this scene.
-*/
-int QGLAbstractScene::nextPickId()
-{
- return ++d_ptr->nextPickId;
-}
-
-/*!
- Returns a list of the pick nodes that have been parented onto this
- scene.
-
- \sa generatePickNodes()
-*/
-QList<QGLPickNode *> QGLAbstractScene::pickNodes() const
-{
- if (d_ptr->pickNodesDirty)
- {
- const_cast<QGLAbstractScene*>(this)->generatePickNodes();
- d_ptr->pickNodesDirty = false;
- }
- return d_ptr->pickNodes;
-}
-
-/*!
- \fn QList<QObject *> QGLAbstractScene::objects() const
-
- Returns a list of all objects in the scene which are considered
- important.
-
- Important objects will typically be the main mesh object, cameras,
- lights, and other top-level objects. Sub-meshes and effects
- are normally not considered important unless the scene is
- acting as a library of meshes and effects.
-
- \sa objectNames(), object(), mainNode()
-*/
-
-/*!
- Returns a list of the names of all objects in the scene which
- are considered important, and which have non-empty names
- associated with them.
-
- The default implementation calls objects() and then compiles a list
- of all non-empty object names.
-
- \sa objects()
-*/
-QStringList QGLAbstractScene::objectNames() const
-{
- QList<QObject *> objs = objects();
- QStringList names;
- for (int index = 0; index < objs.count(); ++index) {
- QObject *object = objs.at(index);
- if (object) {
- QString name = object->objectName();
- if (!name.isEmpty())
- names += name;
- }
- }
- return names;
-}
-
-/*!
- Returns the scene object that has the specified \a name;
- or null if the object was not found.
-
- The default implementation searches objects() for an object that
- matches \a name.
-
- \sa objects()
-*/
-QObject *QGLAbstractScene::object(const QString& name) const
-{
- if (name.isEmpty())
- return 0;
- QList<QObject *> objs = objects();
- for (int index = 0; index < objs.count(); ++index) {
- QObject *object = objs.at(index);
- if (object && object->objectName() == name)
- return object;
- }
- return 0;
-}
-
-
-/*!
- \fn QGLSceneNode *QGLAbstractScene::mainNode() const
-
- Returns the main mesh node in the scene, or null if the scene
- does not contain a main mesh node.
-
- \sa objects()
-*/
-
-#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
- (QGLSceneFormatFactoryInterface_iid, QLatin1String("/sceneformats")))
-#endif
-
-/*!
- Loads a scene from \a device in the specified \a format using
- the registered scene format plugins. If \a format is an empty
- string, then the format will be autodetected from the filename
- extension of \a device. The \a url specifies the location of
- the data in \a device so that relative resources can be located.
-
- The \a options string is passed to the underlying format loader
- and its meaning and format depend on the loader. For example the
- format string for the .3ds loader accepts the following options:
- \list
- \o ForceSmooth - average normals for a smooth appearance
- \o ForceFaceted - per face normals for a faceted appearance
- \o NativeIndices - map native indices for poorly smoothed models
- \o CorrectNormals - fix inverted normals on models with bad windings
- \o CorrectAcute - fix normals on models that smooth acute angles
- \endlist
-
- The options may be specified globally for the whole model, or just
- for a particular mesh.
-
- In this example smoothing is forced on globally, and native indices
- are used on just the mesh called "BattCoverMesh".
-
- \code
- QString op = "ForceSmooth BattCoverMesh=NativeIndices";
- QString file = "music-player.3ds";
- QGLAbstractScene *scene = QGLAbstractScene::loadScene(file, QString(), op);
- \endcode
-
- Returns the scene object, or null if the scene could not be loaded
- or the \a format was not supported by any of the plugins.
-
- To debug scene loading export the environment variable QT3D_DEBUG_MODEL,
- and (depending on backend implementation) the loader can produce useful
- debugging information on the console.
-
- \sa QGLSceneFormatPlugin
-*/
-QGLAbstractScene *QGLAbstractScene::loadScene
- (QIODevice *device, const QUrl& url, const QString& format, const QString &options)
-{
-#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
-
- QFactoryLoader *l = loader();
- QStringList keys = l->keys();
-
- // If the format is not specified, then use the filename/url extension.
- QString fmt = format;
- if (fmt.isEmpty()) {
- //First try to resolve a file io device
- QFile *file = qobject_cast<QFile *>(device);
- QString name;
- if (file) {
- name = file->fileName();
- } else {
- //Next try to resolve a network io device
- //QNetworkReply *reply = qobject_cast<QNetworkReply *>(device);
- //if (reply)
- // name = reply->url().path();
- //else {
- //otherwise just use the url pathname.
- // name = url.path();
- // }
- }
- int dot = name.lastIndexOf(QLatin1Char('.'));
- QString suffix = name.mid(dot+1).toLower();
- int index = keys.indexOf(suffix);
- if (index >= 0)
- fmt = suffix;
- }
-
- // Find the plugin that handles the format and ask it to create a handler.
- if (QGLSceneFormatFactoryInterface *factory
- = qobject_cast<QGLSceneFormatFactoryInterface*>
- (l->instance(fmt))) {
- QGLSceneFormatHandler *handler = factory->create(device, url, fmt);
- if (handler) {
- handler->setDevice(device);
- handler->setUrl(url);
- handler->setFormat(format);
-
-
- if (!options.isEmpty())
- handler->decodeOptions(options);
-
- QGLAbstractScene *scene = 0;
- if (!device) {
- scene = handler->download();
- } else {
- scene = handler->read();
- }
- return scene;
- }
- }
-
- // If we get here, then the format is not supported by any of the plugins.
-#ifndef QT_NO_DEBUG
- qWarning("Could not create handler for format %s"
- "- check plugins are installed correctly in %s",
- qPrintable(fmt),
- qPrintable(QLibraryInfo::location(QLibraryInfo::PluginsPath)));
-#endif
- return 0;
-#else // QT_NO_LIBRARY || QT_NO_SETTINGS
- Q_UNUSED(device);
- Q_UNUSED(url);
- Q_UNUSED(format);
- return 0;
-#endif // QT_NO_LIBRARY || QT_NO_SETTINGS
-}
-
-/*!
- Loads a scene from the internet in the specified \a format using
- the registered scene format plugins. If \a format is an empty
- string, then the format will be autodetected from the filename
- extension of the \a url, which specifies the location of
- the data online.
-
- The \a options string is passed to the underlying format loader
- and its meaning and format depend on the loader. For example the
- format string for the .3ds loader accepts the following options:
- \list
- \o ForceSmooth - average normals for a smooth appearance
- \o ForceFaceted - per face normals for a faceted appearance
- \o NativeIndices - map native indices for poorly smoothed models
- \o CorrectNormals - fix inverted normals on models with bad windings
- \o CorrectAcute - fix normals on models that smooth acute angles
- \endlist
-
- The options may be specified globally for the whole model, or just
- for a particular mesh.
-
- In this example smoothing is forced on globally, and native indices
- are used on just the mesh called "BattCoverMesh".
-
- \code
- QString op = "ForceSmooth BattCoverMesh=NativeIndices";
- QString url = "http://www.example.url.com/music-player.3ds";
- QGLAbstractScene *scene = QGLAbstractScene::loadScene(url, QString(), op);
- \endcode
-
- Returns the scene object, or null if the scene could not be loaded
- or the \a format was not supported by any of the plugins.
-
- The scene object returned by this will contain only a single stub
- node at the root of the scenegraph, which will be filled out later
- once the asynchronous download of the scene data is complete.
-
- \sa QGLSceneFormatPlugin
-*/
-QGLAbstractScene *QGLAbstractScene::loadScene
- (const QUrl& url, const QString& format, const QString &options)
-{
- return QGLAbstractScene::loadScene(0, url, format, options);
-}
-
-/*!
- Loads a scene from \a fileName in the specified \a format, with the
- supplied \a options, and using the registered scene format plugins.
-
- If \a format is an empty string, then the format will be autodetected
- from the extension of \a fileName.
-
- The \a options string is passed to the underlying format loader
- and its meaning and format depend on the loader. See the doc above
- for loadScene() for details on the 3ds format options.
-
- Returns the scene object, or null if the scene could not be loaded
- or the \a format was not supported by any of the plugins.
-
- \sa QGLSceneFormatPlugin
-*/
-QGLAbstractScene *QGLAbstractScene::loadScene
- (const QString& fileName, const QString& format, const QString &options)
-{
- QUrl fileUrl(fileName);
-
- if (fileUrl.scheme()!="http" && fileUrl.scheme()!="ftp") {
- QFile file(fileName);
- if (!file.open(QIODevice::ReadOnly))
- {
- if (options.contains(QLatin1String("ShowWarnings")))
- qWarning("Could not read %s", qPrintable(fileName));
- return 0;
- }
- QFileInfo fi(fileName);
- QUrl url = QUrl::fromLocalFile(fi.absoluteFilePath());
- return loadScene(&file, url, format, options);
- } else {
- //the following call should initiate network loading on the correct
- //downloader class.
- return loadScene(QUrl(fileName), format, options);
- }
-}
-
-/*!
- \enum QGLAbstractScene::FormatListType
- This enum specifies the format of the list returned by the supportedFormats() function.
-
- \value AsFilter Return a format list that may be used as a filter.
- \value AsSuffix Return a format list that is simply the filename suffixes.
-*/
-
-/*!
- Returns a list of all supported formats known by currently available
- sceneformat plugins, in the format type \a t.
-
- If \a t is QGLAbstractScene::AsFilter then the result may be passed
- to QDir::setNameFilters(), or used in other filters. This is the default.
-
- For example to create a file dialog to load model files use this:
- \code
- QString modelsDir = QDir::toNativeSeperators(QDir::homePath());
- QString filter = tr("Models (%1)").arg(QAbstractScene::supportedFormats().join(" "));
- QString fileName = QFileDialog::getOpenFileName(this,
- tr("Open File"), modelsDir, filter));
- \endcode
-
- Otherwise (when \a t is QGLAbstractScene::AsSuffix) it is simply a list
- of file name suffixes.
-
- Note that this function may be expensive to
- call since it scans for available plugins, and loads each one it
- finds to get an accurate report of formats supported at run-time.
-*/
-QStringList QGLAbstractScene::supportedFormats(QGLAbstractScene::FormatListType t)
-{
- QStringList formats;
- QSet<QString> formatSet;
- QSet<QString> dirSet;
- QStringList pluginPaths = QCoreApplication::libraryPaths();
- QStringList::const_iterator it = pluginPaths.constBegin();
- for ( ; it != pluginPaths.constEnd(); ++it)
- {
- QString path = *it;
- QDir sceneformatDir(path + QLatin1String("/sceneformats"));
- path = sceneformatDir.absolutePath();
- if (!sceneformatDir.exists() || dirSet.contains(path))
- continue;
- dirSet.insert(path);
- sceneformatDir.setFilter(QDir::Files);
- QStringList entries = sceneformatDir.entryList();
- QStringList::const_iterator fit = entries.constBegin();
- for ( ; fit != entries.constEnd(); ++fit)
- {
- QString fi = *fit;
- QPluginLoader loader(sceneformatDir.absoluteFilePath(fi));
- QObject *inst = loader.instance();
- QGLSceneFormatFactoryInterface *iface = qobject_cast<QGLSceneFormatFactoryInterface*>(inst);
- if (iface)
- {
- QStringList formatKeys = iface->keys();
- QStringList::const_iterator kit = formatKeys.constBegin();
- for ( ; kit != formatKeys.constEnd(); ++kit)
- {
- QString k = *kit;
- if (!formatSet.contains(k) && !k.contains("/")) // dont add mime-type keys
- {
- if (t == AsFilter)
- k.prepend("*.");
- formatSet.insert(k);
- formats.append(k);
- }
- }
- }
- }
- }
- return formats;
-}
-
-/*!
- \fn QGLAbstractScene::sceneUpdated()
- \internal
- This signal should be emitted when a network download of a scene has
- been completed.
-
- The user is left to implement the exact mechanism behind the scenes which
- causes this signal to be emitted, and is responsible for the handling
- of the signal.
-*/
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglabstractscene.h b/src/gui/extern/Qt3D/scene/qglabstractscene.h
deleted file mode 100644
index e344ba9e664722ad725cff27a4fb18e613703a21..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglabstractscene.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLABSTRACTSCENE_H
-#define QGLABSTRACTSCENE_H
-
-#include "qt3dglobal.h"
-#include "qglscenenode.h"
-
-#include <QtCore/qstringlist.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLAbstractScenePrivate;
-class QIODevice;
-class QGLPickNode;
-
-class Q_QT3D_EXPORT QGLAbstractScene : public QObject
-{
- Q_OBJECT
-public:
- explicit QGLAbstractScene(QObject *parent = 0);
- virtual ~QGLAbstractScene();
-
- virtual void setPickable(bool enable);
- virtual bool pickable() const;
- virtual void generatePickNodes();
- QList<QGLPickNode *> pickNodes() const;
- int nextPickId();
-
- virtual QList<QObject *> objects() const = 0;
- virtual QStringList objectNames() const;
- virtual QObject *object(const QString& name) const;
- virtual QGLSceneNode *mainNode() const = 0;
-
- static QGLAbstractScene *loadScene
- (const QUrl& url, const QString& format = QString(),
- const QString& options = QString());
- static QGLAbstractScene *loadScene
- (QIODevice *device, const QUrl& url, const QString& format = QString(),
- const QString& options = QString());
- static QGLAbstractScene *loadScene
- (const QString& fileName, const QString& format = QString(),
- const QString& options = QString());
-
- enum FormatListType {
- AsFilter, AsSuffix
- };
-
- static QStringList supportedFormats(FormatListType t = AsFilter);
-
-signals:
- void sceneUpdated();
-
-protected:
- void childEvent(QChildEvent * event);
-
-private:
- QScopedPointer<QGLAbstractScenePrivate> d_ptr;
-
- Q_DISABLE_COPY(QGLAbstractScene)
- Q_DECLARE_PRIVATE(QGLAbstractScene)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/scene/qglpicknode.cpp b/src/gui/extern/Qt3D/scene/qglpicknode.cpp
deleted file mode 100644
index a52a228958fd97ea2f03d4efeca7bbd37864c669..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglpicknode.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglpicknode.h"
-#include "qglabstractscene.h"
-
-#include <QtGui/qevent.h>
-
-/*!
- \class QGLPickNode
- \brief The QGLPickNode class enables picking for objects in a 3D scene.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- QGLPickNode is a QObject sub-class, relatively light-weight, that can
- shadow QSceneObject instances and provide picking capability. The
- QGLPickNode instance receives events sent to it by picking views, such
- as the QGLView class, and emits relevant signals in response.
-
- QGLSceneObjects wanting to support picking, should implement the methods
- \list
- \o QGLSceneNode::pickNode()
- \o QGLSceneNode::setPickNode()
- \endlist
- and also implement rendering such that the QGLPainter has the relevant
- \l{QGLPainter::setObjectPickId()}{pick id function} called.
-
- These functions are already implemented for the QGLSceneNode object type.
-
- Picking can then be simply enabled by calling the QGLAbstractScene function
- setPickable() to turn on picking and generate pick nodes for the relevant
- scene objects.
-
- In order to respond to picking, the view class should simply register the
- picknodes, and connect a relevant slot to the pick nodes signal.
-
- For the QGLView class that code is simply:
- \code
- QList<QGLPickNode *>nodes = manager->pickNodes();
- foreach (QGLPickNode *node, nodes)
- {
- registerObject(node->id(), node);
- connect(node, SIGNAL(clicked()),
- this, SLOT(objectPicked()));
- }
- \endcode
-
- The pick nodes should be unregistered with similar code for the QGLView if
- switching to a different scene.
-
- To be able to recover the relevant QGLSceneNode inside the called slot,
- the object may be set onto the QGLPickNode with the setTarget() function,
- and recovered with target() inside the slot, since the QGLPickNode will
- be the sender() for the slot.
-
- QGLSceneNode already sets itself as the target during the pick enable step.
-
- \sa QGLSceneNode, QGLView
-*/
-
-/*!
- Construct a new QGLPickNode object managed by and parented onto
- the \a parent scene. The nextPickId() function will be called on
- \a parent to assign a pick id to this new node.
-*/
-QGLPickNode::QGLPickNode(QGLAbstractScene *parent) :
- QObject(parent), m_id(-1), m_target(0)
-{
- if (parent)
- m_id = parent->nextPickId();
-}
-
-/*!
- \fn int QGLPickNode::id() const
- Returns the unique id for this node. This value is assigned by
- the parent scene for this node and should be different for every
- node in the scene. Returns -1 if the id has not been set yet.
-
- \sa setId()
-*/
-
-/*!
- \fn void QGLPickNode::setId(int id)
- Sets the unique \a id for this node. Generally this function should not
- be needed, since the constructor causes a unique id to be obtained
- from the parent scene. This function exists mainly for testing
- purposes.
-
- \sa id()
-*/
-
-/*!
- \fn QGLSceneNode *QGLPickNode::target() const
- Returns the QGLSceneNode which is the target of this pick node;
- null if the target has not been set yet.
-
- \sa setTarget()
-*/
-
-/*!
- \fn void QGLPickNode::setTarget(QGLSceneNode *target)
- Sets the \a target for this pick node.
-
- \sa target()
-*/
-
-/*!
- \fn void QGLPickNode::pressed()
- Signal emitted when the scene object for this node has the mouse pressed
- while the cursor is on the object in the scene.
-*/
-
-/*!
- \fn void QGLPickNode::released()
- Signal emitted when the scene object for this node has the mouse released
- while the cursor is on the object in the scene.
-*/
-
-/*!
- \fn void QGLPickNode::clicked()
- Signal emitted when the scene object for this node has the mouse pressed
- and then released while the cursor is on the object in the scene.
-*/
-
-/*!
- \fn void QGLPickNode::doubleClicked()
- Signal emitted when the scene object for this node has the mouse clicked
- twice in succession while the cursor is on the object in the scene.
-*/
-
-/*!
- \fn void QGLPickNode::hoverChanged()
- Signal emitted when the scene object for this node has the mouse moved
- into or out of this object in the scene.
-*/
-
-/*!
- \internal
-*/
-bool QGLPickNode::event(QEvent *e)
-{
- // ripped off from teaservice demo, but not before the same code
- // was ripped off and put in item3d.cpp - those should probably all
- // use this implementation here
- if (e->type() == QEvent::MouseButtonPress)
- {
- QMouseEvent *me = (QMouseEvent *)e;
- if (me->button() == Qt::LeftButton)
- emit pressed();
- }
- else if (e->type() == QEvent::MouseButtonRelease)
- {
- QMouseEvent *me = (QMouseEvent *)e;
- if (me->button() == Qt::LeftButton)
- {
- emit released();
- if (me->x() >= 0) // Positive: inside object, Negative: outside.
- emit clicked();
- }
- }
- else if (e->type() == QEvent::MouseButtonDblClick)
- {
- emit doubleClicked();
- }
- else if (e->type() == QEvent::Enter)
- {
- //m_hovering = true;
- emit hoverChanged();
- }
- else if (e->type() == QEvent::Leave)
- {
- //m_hovering = false;
- emit hoverChanged();
- }
- return QObject::event(e);
-}
diff --git a/src/gui/extern/Qt3D/scene/qglpicknode.h b/src/gui/extern/Qt3D/scene/qglpicknode.h
deleted file mode 100644
index bd836a4bf39dfd99d52182b5a2d5c8fd58231105..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglpicknode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPICKNODE_H
-#define QGLPICKNODE_H
-
-#include <QtCore/qobject.h>
-#include "qt3dglobal.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGLAbstractScene;
-class QGLSceneNode;
-class QEvent;
-
-class Q_QT3D_EXPORT QGLPickNode : public QObject
-{
- Q_OBJECT
-public:
- explicit QGLPickNode(QGLAbstractScene *parent = 0);
- int id() const { return m_id; }
- void setId(int id) { m_id = id; }
-
- QGLSceneNode *target() const { return m_target; }
- void setTarget(QGLSceneNode *target) { m_target = target; }
-
-Q_SIGNALS:
- void pressed();
- void released();
- void clicked();
- void doubleClicked();
- void hoverChanged();
-
-public Q_SLOTS:
-
-protected:
- bool event(QEvent *e);
- int m_id;
- QGLSceneNode *m_target;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLPICKNODE_H
diff --git a/src/gui/extern/Qt3D/scene/qglrenderorder.cpp b/src/gui/extern/Qt3D/scene/qglrenderorder.cpp
deleted file mode 100644
index 7b1f3b494c25d0010c31b8e7e22a1f55109700d0..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderorder.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglrenderorder.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLRenderOrder
- \brief The QGLRenderOrder class represents an order of a scene node during rendering.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- The QGLRenderOrder class works with the QGLRenderSequencer to optimize
- the rendering order of scene nodes.
-
- The class encapsulates the ordering with which QGLSceneNodes appear in the
- rendering of a scene. Every scene node that has the same rendering properties
- maps to the same QGLRenderOrder.
-
- QGLRenderOrder instances are based on a scene node, and the path through
- the scene graph by which the node was reached. This is necessary since the
- same node may appear with different rendering properties in multiple
- different places in the rendering graph.
-
- For example a node holding a model of a pawn chess piece may appear in
- several different places on a board, some with a white material and some
- with a black material.
-
- To capture this concept QGLRenderOrder instances are constructed from a
- pointer to a QGLSceneNode, and a QGLRenderState instance.
-
- A render order then calculates the effective values of its various attributes
- based on both the node, and the state.
-
- Custom render orders may be created by sub-classing QGLRenderOrderComparator
- and reimplementing the following methods:
- \list
- \i isEqualTo()
- \i isLessThan()
- \endlist
-
- By default all nodes which have the same effect type are rendered together,
- and then within that, those nodes which have the same material are
- rendered together.
-
- \sa QGLRenderOrderComparator
-*/
-
-/*!
- \fn QGLRenderOrder::QGLRenderOrder(const QGLSceneNode *node, const QGLRenderState &state)
- Creates a new QGLRenderOrder instance that encapsulates the order in this
- render pass represented by the given \a node and \a state. The \a node
- defaults to NULL, and the \a state defaults to a default constructed
- invalid QGLRenderState.
-*/
-
-/*!
- \fn QGLRenderOrder::~QGLRenderOrder()
- Destroys this QGLRenderOrder and recovers any resources.
-*/
-
-/*!
- Returns a hash value representing the effect set onto the node for
- this render order.
-*/
-uint QGLRenderOrder::effectHash() const
-{
- quint64 result = 0;
- if (effectiveHasEffect())
- {
- QGLAbstractEffect *eff = effectiveUserEffect();
- if (eff)
- result = reinterpret_cast<quint64>(eff);
- else
- result = effectiveStandardEffect() + 1;
- Q_ASSERT(result);
- }
- return qHash(result);
-}
-
-/*!
- Returns true if this QGLRenderOrder is equal to the \a rhs, otherwise
- returns false. Reimplement this function when creating a sub-class of
- QGLRenderOrder.
-
- \sa isLessThan()
-*/
-bool QGLRenderOrder::isEqual(const QGLRenderOrder &rhs) const
-{
- if (this == &rhs)
- return true;
- bool result = false;
- bool thisHasEffect = effectiveHasEffect();
- bool thatHasEffect = rhs.effectiveHasEffect();
- if (thisHasEffect && thatHasEffect)
- {
- QGLAbstractEffect *eff = effectiveUserEffect();
- if (eff)
- result = (eff == rhs.effectiveUserEffect());
- else
- result = (effectiveStandardEffect() == rhs.effectiveStandardEffect());
- }
- else
- {
- result = (thisHasEffect == thatHasEffect);
- }
- if (result)
- {
- result = (effectiveMaterial() == rhs.effectiveMaterial());
- }
- if (result)
- {
- result = (effectiveBackMaterial() == rhs.effectiveBackMaterial());
- }
- return result;
-}
-
-/*!
- Returns true if this QGLRenderOrder is less than the \a rhs, otherwise
- returns false. Reimplement this function when creating a sub-class of
- QGLRenderOrder.
-
- The default implementation sorts first by effect, second by material (front
- then back).
-
- Sorting by material is ordered by pointer comparison.
-
- Sorting by effect is based on the following order, from lowest to
- highest:
- \list
- \o No effect - hasEffect() == true
- \o Standard effect - ordered by numerical value, eg QGL::FlatColor < QGL::LitMaterial
- \o User effect - ordered by pointer comparison
- \endlist
- So a node with \c{hasEffect() == false} node is \i{less than} a node with
- a custom user effect, for example.
-
- \sa isEqual()
-*/
-bool QGLRenderOrder::isLessThan(const QGLRenderOrder &rhs) const
-{
- bool result = false;
- bool thisHasEffect = effectiveHasEffect();
- bool thatHasEffect = rhs.effectiveHasEffect();
- if (thisHasEffect && thatHasEffect)
- {
- QGLAbstractEffect *eff = effectiveUserEffect();
- if (eff)
- result = (eff < rhs.effectiveUserEffect());
- else
- result = !rhs.effectiveUserEffect() &&
- (effectiveStandardEffect() < rhs.effectiveStandardEffect());
- }
- else
- {
- result = !thisHasEffect;
- }
- if (!result)
- {
- result = (effectiveMaterial() < rhs.effectiveMaterial());
- }
- if (!result)
- {
- result = (effectiveBackMaterial() < rhs.effectiveBackMaterial());
- }
- return result;
-}
-
-/*!
- \fn bool QGLRenderOrder::isValid() const
- Returns true if this is a valid QGLRenderOrder, that is it was
- initialized with a non-null QGLSceneNode.
-*/
-
-/*!
- \fn bool QGLRenderOrder::operator!=(const QGLRenderOrder &rhs) const
- Returns true if this QGLRenderOrder is not equal to the \a rhs, otherwise
- returns false. This function simply returns \c{!isEqual(rhs)}.
-*/
-
-/*!
- \fn bool QGLRenderOrder::bool operator==(const QGLRenderOrder &rhs) const
- Returns true if this QGLRenderOrder is equal to the \a rhs, otherwise
- returns false. This function simply returns \c{isEqual(rhs)}.
-*/
-
-/*!
- \fn bool QGLRenderOrder::operator<(const QGLRenderOrder &rhs) const
- Returns true if this QGLRenderOrder is less than to the \a rhs, otherwise
- returns false. This function simply returns \c{isLessThan(rhs)}.
-*/
-
-/*!
- \fn const QGLSceneNode *QGLRenderOrder::node() const
- Returns a pointer to the scene node for which the render order is held by
- this QGLRenderOrder instance. This is simply the value passed to the
- constructor.
-*/
-
-/*!
- \fn QGLRenderState QGLRenderOrder::state() const
- Returns a pointer to the render state for this order. This is simply the
- value passed to the constructor.
-*/
-
-/*!
- \fn void QGLRenderOrder::setState(const QGLRenderState &state)
- Sets the \a state for this order.
-*/
-
-/*!
- \fn QGLAbstractEffect *QGLRenderOrder::effectiveUserEffect() const
- Returns the effective user effect of the node set for this render
- order, taking into account any effect inherited from parent nodes
- as specified by the render state().
-
- \sa state(), effectiveHasEffect()
-*/
-
-/*!
- \fn QGL::StandardEffect QGLRenderOrder::effectiveStandardEffect() const
- Returns the effective standard effect of the node set for this render
- order, taking into account any effect inherited from parent nodes
- as specified by the render state().
-
- \sa state(), effectiveHasEffect()
-*/
-
-/*!
- \fn QGLMaterial *QGLRenderOrder::effectiveMaterial() const
- Returns the effective material of the node set for this render
- order, taking into account any effect inherited from parent nodes
- as specified by the render state().
-
- \sa state(), effectiveBackMaterial()
-*/
-
-/*!
- \fn QGLMaterial *QGLRenderOrder::effectiveBackMaterial() const
- Returns the effective back material of the node set for this render
- order, taking into account any effect inherited from parent nodes
- as specified by the render state().
-
- \sa state(), effectiveMaterial()
-*/
-
-/*!
- \fn bool QGLRenderOrder::effectiveHasEffect() const
- Returns the effective value of whether an effect is set on the node
- set for this render order, taking into account any effect inherited
- from parent nodes as specified by the render state().
-
- \sa state()
-*/
-
-/*!
- \fn uint qHash(const QGLRenderOrder &order)
- \relates QGLRenderOrder
- Returns a hash value representation of the \a order.
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGLRenderOrder &order)
-{
- if (order.isValid())
- dbg << "QGLRenderOrder for node:" << order.node()
- << "-- effect hash:" << order.effectHash()
- << "-- material:" << order.node()->material()
- << "-- back material:" << order.node()->backMaterial();
- else
- dbg << "QGLRenderOrder -- invalid";
- return dbg;
-}
-
-#endif
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglrenderorder.h b/src/gui/extern/Qt3D/scene/qglrenderorder.h
deleted file mode 100644
index 67bf8923f67f7d70c468e585f46838824ddc4134..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderorder.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLRENDERORDER_H
-#define QGLRENDERORDER_H
-
-#include "qglscenenode.h"
-#include "qglrenderstate.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLRenderOrder
-{
-public:
- explicit QGLRenderOrder(const QGLSceneNode *node = 0, const QGLRenderState &state = QGLRenderState())
- : m_node(node)
- , m_state(state)
- {
- }
- ~QGLRenderOrder() {}
-
- uint effectHash() const;
- bool isEqual(const QGLRenderOrder &rhs) const;
- bool isLessThan(const QGLRenderOrder &rhs) const;
- inline bool isValid() const;
-
- inline bool operator!=(const QGLRenderOrder &rhs) const;
- inline bool operator==(const QGLRenderOrder &rhs) const;
- inline bool operator<(const QGLRenderOrder &rhs) const;
-
- inline const QGLSceneNode *node() const;
- inline void setState(const QGLRenderState &state);
- inline QGLRenderState state() const;
- inline QGLAbstractEffect *effectiveUserEffect() const;
- inline QGL::StandardEffect effectiveStandardEffect() const;
- inline QGLMaterial *effectiveMaterial() const;
- inline QGLMaterial *effectiveBackMaterial() const;
- inline bool effectiveHasEffect() const;
-private:
- const QGLSceneNode *m_node;
- QGLRenderState m_state;
-};
-
-
-inline bool QGLRenderOrder::isValid() const
-{
- return m_node;
-}
-
-inline bool QGLRenderOrder::operator!=(const QGLRenderOrder &rhs) const
-{
- return !isEqual(rhs);
-}
-
-inline bool QGLRenderOrder::operator==(const QGLRenderOrder &rhs) const
-{
- return isEqual(rhs);
-}
-
-inline bool QGLRenderOrder::operator<(const QGLRenderOrder &rhs) const
-{
- return isLessThan(rhs);
-}
-
-inline const QGLSceneNode *QGLRenderOrder::node() const
-{
- return m_node;
-}
-
-inline QGLRenderState QGLRenderOrder::state() const
-{
- return m_state;
-}
-
-inline void QGLRenderOrder::setState(const QGLRenderState &state)
-{
- m_state = state;
-}
-
-inline QGLAbstractEffect *QGLRenderOrder::effectiveUserEffect() const
-{
- QGLAbstractEffect *result = 0;
- if (m_node)
- {
- if (m_node->userEffect())
- result = m_node->userEffect();
- else if (m_state.userEffect())
- result = m_state.userEffect();
- }
- return result;
-}
-
-inline QGL::StandardEffect QGLRenderOrder::effectiveStandardEffect() const
-{
- QGL::StandardEffect result = QGL::FlatColor;
- if (m_node)
- {
- if (m_node->hasEffect())
- result = m_node->effect();
- else if (m_state.hasEffect())
- result = m_state.standardEffect();
- }
- return result;
-}
-
-inline QGLMaterial *QGLRenderOrder::effectiveMaterial() const
-{
- QGLMaterial *result = 0;
- if (m_node)
- {
- if (m_node->material())
- result = m_node->material();
- else if (m_state.material())
- result = m_state.material();
- }
- return result;
-}
-
-inline QGLMaterial *QGLRenderOrder::effectiveBackMaterial() const
-{
- QGLMaterial *result = 0;
- if (m_node)
- {
- if (m_node->backMaterial())
- result = m_node->backMaterial();
- else if (m_state.backMaterial())
- result = m_state.backMaterial();
- }
- return result;
-}
-
-inline bool QGLRenderOrder::effectiveHasEffect() const
-{
- bool result = false;
- if (m_node)
- {
- if (m_node->hasEffect())
- result = true;
- else
- result = m_state.hasEffect();
- }
- return result;
-}
-
-inline uint qHash(const QGLRenderOrder &order)
-{
- quint64 result = order.effectHash();
- return result ^ reinterpret_cast<quint64>(order.effectiveMaterial());
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-#include <QtCore/qdebug.h>
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLRenderOrder &order);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLRENDERORDER_H
diff --git a/src/gui/extern/Qt3D/scene/qglrenderordercomparator.cpp b/src/gui/extern/Qt3D/scene/qglrenderordercomparator.cpp
deleted file mode 100644
index 46682bb5d72c19c56144d4e465eb83c892e11369..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderordercomparator.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglrenderordercomparator.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLRenderOrderComparator
- \brief The QGLRenderOrderComparator class compares QGLRenderOrder instances.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- The QGLRenderOrderComparator class works with the QGLRenderSequencer and
- QGLRenderOrder classes to optimize the rendering order of scene nodes.
-
- This class is responsible for comparing QGLRenderOrder instances for
- the QGLRenderSequencer.
-
- Custom render orders may be created by sub-classing QGLRenderOrderComparator
- and reimplementing the following method:
- \list
- \i bool operator()(const QGLRenderOrder &lhs, const QGLRenderOrder &rhs)
- \endlist
-
- Then set an instance of your class onto QGLPainter:
-
- \code
- void MyView::initializeGL(QGLPainter *painter)
- {
- painter->renderSequencer()->setRenderOrderComparator(new MyRenderOrderComparator);
- }
-
- void MyView::paintGL(QGLPainter *painter)
- {
- // draw uses QGLRenderOrder sub-class instances from m_renderOrderFactory
- complexScene->draw(painter);
- }
- \endcode
-
- See the QGLRenderOrder class documentation for more details.
-
- \sa QGLRenderOrder
-*/
-
-/*!
- \fn QGLRenderOrderComparator::QGLRenderOrderComparator()
- Construct a new QGLRenderOrderComparator.
-*/
-
-/*!
- \fn QGLRenderOrderComparator::~QGLRenderOrderComparator()
- Destroys this QGLRenderOrderComparator, recovering any resources.
-*/
-
-/*!
- Returns true if the \a lhs render order is less than the \a rhs;
- otherwise returns false.
-
- Reimplement this function when creating custom render orders.
-*/
-bool QGLRenderOrderComparator::isLessThan(const QGLRenderOrder &lhs, const QGLRenderOrder &rhs)
-{
- bool result = false;
- bool lhsHasEffect = lhs.effectiveHasEffect();
- bool rhsHasEffect = rhs.effectiveHasEffect();
- if (lhsHasEffect && rhsHasEffect)
- {
- QGLAbstractEffect *eff = lhs.effectiveUserEffect();
- if (eff)
- result = (eff < rhs.effectiveUserEffect());
- else
- result = !rhs.effectiveUserEffect() &&
- (lhs.effectiveStandardEffect() < rhs.effectiveStandardEffect());
- }
- else
- {
- result = !lhsHasEffect;
- }
- if (!result)
- {
- result = (lhs.effectiveMaterial() < rhs.effectiveMaterial());
- }
- if (!result)
- {
- result = (lhs.effectiveBackMaterial() < rhs.effectiveBackMaterial());
- }
- return result;
-}
-
-/*!
- Returns true if the \a lhs render order is equal to the \a rhs;
- otherwise returns false.
-
- Reimplement this function when creating custom render orders.
-*/
-bool QGLRenderOrderComparator::isEqualTo(const QGLRenderOrder &lhs, const QGLRenderOrder &rhs)
-{
- bool result = false;
- bool lhsHasEffect = lhs.effectiveHasEffect();
- bool rhsHasEffect = rhs.effectiveHasEffect();
- if (lhsHasEffect && rhsHasEffect)
- {
- QGLAbstractEffect *eff = lhs.effectiveUserEffect();
- if (eff)
- result = (eff == rhs.effectiveUserEffect());
- else
- result = (lhs.effectiveStandardEffect() == rhs.effectiveStandardEffect());
- }
- else
- {
- result = (lhsHasEffect == rhsHasEffect);
- }
- if (result)
- {
- result = (lhs.effectiveMaterial() == rhs.effectiveMaterial());
- }
- if (result)
- {
- result = (lhs.effectiveBackMaterial() == rhs.effectiveBackMaterial());
- }
- return result;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglrenderordercomparator.h b/src/gui/extern/Qt3D/scene/qglrenderordercomparator.h
deleted file mode 100644
index 687b8633e28e5472bd9acff4d9c0ca09ab71bc36..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderordercomparator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLRenderOrderComparator_H
-#define QGLRenderOrderComparator_H
-
-#include "qglrenderorder.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLSceneNode;
-
-class Q_QT3D_EXPORT QGLRenderOrderComparator
-{
-public:
- QGLRenderOrderComparator() {}
- virtual ~QGLRenderOrderComparator() {}
-
- virtual bool isLessThan(const QGLRenderOrder &lhs, const QGLRenderOrder &rhs);
- virtual bool isEqualTo(const QGLRenderOrder &lhs, const QGLRenderOrder &rhs);
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLRenderOrderComparator_H
diff --git a/src/gui/extern/Qt3D/scene/qglrendersequencer.cpp b/src/gui/extern/Qt3D/scene/qglrendersequencer.cpp
deleted file mode 100644
index 521ace238d036ed2b0c61f5932c2291707fddae3..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrendersequencer.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglrendersequencer.h"
-#include "qglrenderorder.h"
-#include "qglpainter.h"
-#include "qglrenderordercomparator.h"
-#include "qglrenderstate.h"
-
-#include <QtCore/qstack.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLRenderSequencer
- \brief The QGLRenderSequencer class orders the rendering of QGLSceneNode instances.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- The QGLRenderSequencer class works with the QGLRenderOrderComparator and
- QGLRenderOrder classes to optimize the rendering order of scene nodes.
-
- In general instances of this class are managed by QGLPainter and it should
- not be necessary to explicitly create or manipulate them.
-
- The render sequencer works by tracking instances of QGLRenderOrder objects
- in a queue. As the scene graph is traversed during a call to a top-level
- node's QGLSceneNode::draw() function, the sequencer adds one QGLRenderOrder
- to the queue for each unique combination of rendering attributes.
-
- The top level scene graph node loops once for each unique combination - it
- does this in QGLSceneNode::draw() by calling nextInSequence(). At
- each iteration, a current QGLRenderOrder is maintained, and only nodes
- matching that order - as determined by \l{QGLRenderOrder::operator==()} -
- are rendered in that pass. Non-matching nodes are added to a queue in the
- order specified by \l{QGLRenderOrder::operator<()}.
-
-
- Once an iteration/pass of
- the scene graph is done, the next order is pulled from the front of the queue
- and the current QGLRenderOrder is set to it.
-
- Since the rendering attributes at a node are a function both of that node,
- and attributes inherited from its parents, and since a given node may appear
- multiple times at different places in the scene, it can thus have different
- attributes and orders in each place. So there is no one-to-one mapping
- between nodes and attributes.
-
- To deal with this, QGLRenderOrder mappings are discovered during rendering.
- There is no discovery pass. First, the initial QGLRenderOrder is lazily set
- when the first geometry is actually drawn to the GPU - latching in that order
- as the first current order. From that point, orders discovered that are
- distinct from the current one are skipped in this rendering pass - by returning
- false from renderInSequence() - and are instead added to the queue for rendering
- on a subsequent pass.
-
- When the final pass has been made, renderInSequence() returns false to the
- top level QGLSceneNode, indicating that looping over passes is complete.
-
- \sa QGLRenderOrder
-*/
-
-class QGLRenderSequencerPrivate
-{
-public:
- QGLRenderSequencerPrivate(QGLPainter *painter);
- ~QGLRenderSequencerPrivate();
- QGLSceneNode *top;
- QLinkedList<QGLRenderOrder> queue;
- QStack<QGLRenderState> stack;
- QSet<QGLRenderOrder> exclude;
- QGLRenderOrder current;
- QGLPainter *painter;
- QGLRenderOrderComparator *compare;
- bool latched;
-};
-
-QGLRenderSequencerPrivate::QGLRenderSequencerPrivate(QGLPainter *painter)
- : top(0)
- , current(QGLRenderOrder())
- , painter(painter)
- , compare(new QGLRenderOrderComparator)
- , latched(false)
-{
-}
-
-QGLRenderSequencerPrivate::~QGLRenderSequencerPrivate()
-{
- delete compare;
-}
-
-/*!
- Construct a new QGLRenderSequencer for the \a painter.
-*/
-QGLRenderSequencer::QGLRenderSequencer(QGLPainter *painter)
- : d(new QGLRenderSequencerPrivate(painter))
-{
-}
-
-/*!
- Sets the render sequencer to operate on \a painter.
-*/
-void QGLRenderSequencer::setPainter(QGLPainter *painter)
-{
- d->painter = painter;
-}
-
-/*!
- Returns the current top node of the rendering tree, or NULL if the
- sequencer has been reset.
-*/
-QGLSceneNode *QGLRenderSequencer::top() const
-{
- return d->top;
-}
-
-/*!
- Sets the current top node of the rendering tree to \a top.
-*/
-void QGLRenderSequencer::setTop(QGLSceneNode *top)
-{
- d->top = top;
-}
-
-/*!
- Reset this sequencer to start from the top of the scene graph again.
- After this call the top() function will return NULL, and any scene
- node passed to the renderInSequence() function will be treated as the
- top of the scene graph. Also effects and materials will be ignored
- until latched in - QGLPainter::draw() will call latch() to achieve this.
-
- \sa top()
-*/
-void QGLRenderSequencer::reset()
-{
- d->top = 0;
- d->latched = false;
- d->exclude.clear();
- d->stack.clear();
- d->current = QGLRenderOrder();
-}
-
-/*!
- Returns true if there is a next rendering state in the queue; and if there
- is a new order will be pulled from the queue, and its rendering attributes
- - materials, effects and so on - will be applied to the painter for this
- sequencer. Returns false when no more rendering states are queued and
- scene is completely rendered.
-*/
-bool QGLRenderSequencer::nextInSequence()
-{
- bool nextAvailable = true;
- if (d->queue.size() > 0)
- {
- // process thru next render order
- d->current = d->queue.takeFirst();
- }
- else
- {
- // end top level loop
- nextAvailable = false;
- }
- return nextAvailable;
-}
-
-/*!
- Returns true, when this \a node should be rendered, in the order dictated
- by QGLRenderOrder objects generated by the current render order Comparator.
- The \a node must be non-NULL.
-
- When this function returns false, indicating that rendering should be
- skipped for the current pass, a check is made to ensure that a state object
- for this nodes rendering attributes is queued up for a later pass.
-
- To customize the ordering, reimplement QGLRenderOrder and
- QGLRenderOrderComparator; then set the custom Comparator onto the current
- painter using setcompare().
-
- \sa reset(), top(), nextInSequence()
-*/
-bool QGLRenderSequencer::renderInSequence(QGLSceneNode *node)
-{
- Q_ASSERT(node);
- Q_ASSERT(d->top);
- bool doRender = true;
- QGLRenderState state;
- if (!d->stack.empty())
- state = d->stack.top();
- QGLRenderOrder o(node, state);
- if (!d->current.isValid())
- d->current = o;
- if (d->latched && !d->compare->isEqualTo(o, d->current))
- {
- if (!d->exclude.contains(o))
- insertNew(o);
- doRender = false;
- }
- else
- {
- if (!d->latched)
- d->exclude.insert(o);
- }
- return doRender;
-}
-
-/*!
- Marks the render state for the \a node as started for this rendering pass. Call
- this before rendering \a node, or any child nodes of \a node.
-
- Once the rendering state is no longer valid, call endState().
-
- To actually apply the effective state, as inherited from previous calls to
- beginState() call the applyState() function.
-
- \sa endState(), applyState()
-*/
-void QGLRenderSequencer::beginState(QGLSceneNode *node)
-{
- QGLRenderState state;
- if (!d->stack.empty())
- state = d->stack.top();
- state.updateFrom(node);
- d->stack.push(state);
-}
-
-/*!
- Marks the render state for the \a node as done for this rendering pass.
-
- If a node has called beginState(), then this function must be called to maintain
- the rendering stack. If this function call is not matched by a previous
- beginState() call undefined behaviour may result. In debug mode it may assert.
-
- \sa beginState(), applyState()
-*/
-void QGLRenderSequencer::endState(QGLSceneNode *node)
-{
-#ifndef QT_NO_DEBUG_STREAM
- const QGLSceneNode *n = d->stack.top().node();
- Q_UNUSED(n);
- Q_UNUSED(node);
- Q_ASSERT(n == node);
-#endif
- d->stack.pop();
-}
-
-/*!
- Applies the current rendering state to the painter for this sequencer.
-
- \sa beginState(), endState()
-*/
-void QGLRenderSequencer::applyState()
-{
- d->latched = true;
- QGLRenderState s = d->stack.top();
- if (s.hasEffect() && !d->painter->isPicking())
- {
- if (s.userEffect())
- {
- if (d->painter->userEffect() != s.userEffect())
- d->painter->setUserEffect(s.userEffect());
- }
- else
- {
- if (d->painter->userEffect() ||
- d->painter->standardEffect() != s.standardEffect())
- d->painter->setStandardEffect(s.standardEffect());
- }
- }
- if (s.material() && !d->painter->isPicking())
- {
- QGLMaterial *mat = s.material();
- if (1) //FIXME: d->painter->faceMaterial(QGL::FrontFaces) != mat)
- {
- d->painter->setFaceMaterial(QGL::FrontFaces, mat);
- int texUnit = 0;
- for (int i = 0; i < mat->textureLayerCount(); ++i)
- {
- QGLTexture2D *tex = mat->texture(i);
- if (tex)
- {
- d->painter->glActiveTexture(GL_TEXTURE0 + texUnit);
- tex->bind();
- ++texUnit;
- }
- }
- }
- }
- if (s.backMaterial() && !d->painter->isPicking())
- {
- QGLMaterial *mat = s.backMaterial();
- if (1) //FIXME: d->painter->faceMaterial(QGL::FrontFaces) != mat)
- {
- d->painter->setFaceMaterial(QGL::BackFaces, mat);
- int texUnit = 0;
- for (int i = 0; i < mat->textureLayerCount(); ++i)
- {
- QGLTexture2D *tex = mat->texture(i);
- if (tex)
- {
- d->painter->glActiveTexture(GL_TEXTURE0 + texUnit);
- tex->bind();
- ++texUnit;
- }
- }
- }
- }
-}
-
-void QGLRenderSequencer::insertNew(const QGLRenderOrder &order)
-{
- QLinkedList<QGLRenderOrder>::iterator it = d->queue.begin();
- for ( ; it != d->queue.end(); ++it)
- {
- const QGLRenderOrder o = *it;
- if (d->compare->isLessThan(order, o))
- break;
- }
- d->queue.insert(it, order);
- d->exclude.insert(order);
-}
-
-/*!
- Returns the current render order comparator. By default this is an
- instance of the base class QGLRenderOrderComparator.
-
- \sa setComparator()
-*/
-QGLRenderOrderComparator *QGLRenderSequencer::comparator() const
-{
- return d->compare;
-}
-
-/*!
- Sets the current render order \a comparator. This is only needed if a
- custom rendering order is to be created. The argument \a comparator
- must be non-null, or undefined behaviour will result.
-
- Any existing current comparator is destroyed.
-
- \sa renderInSequence(), comparator()
-*/
-void QGLRenderSequencer::setComparator(QGLRenderOrderComparator *comparator)
-{
- Q_ASSERT(comparator);
- delete d->compare;
- d->compare = comparator;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglrendersequencer.h b/src/gui/extern/Qt3D/scene/qglrendersequencer.h
deleted file mode 100644
index 999cad41bcd988d344127f8c623f9227dced3461..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrendersequencer.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLRENDERSEQUENCER_H
-#define QGLRENDERSEQUENCER_H
-
-#include <QtCore/qlinkedlist.h>
-#include <QtCore/qset.h>
-
-#include "qglrenderorder.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLSceneNode;
-class QGLPainter;
-class QGLRenderOrderComparator;
-class QGLRenderSequencerPrivate;
-
-class Q_QT3D_EXPORT QGLRenderSequencer
-{
-public:
- explicit QGLRenderSequencer(QGLPainter *painter);
- void setPainter(QGLPainter *painter);
- bool renderInSequence(QGLSceneNode *node);
- bool nextInSequence();
- void beginState(QGLSceneNode *node);
- void endState(QGLSceneNode *node);
- void reset();
- QGLSceneNode *top() const;
- void setTop(QGLSceneNode *top);
- QGLRenderOrderComparator *comparator() const;
- void setComparator(QGLRenderOrderComparator *comparator);
- void applyState();
-private:
- void insertNew(const QGLRenderOrder &order);
-
- QGLRenderSequencerPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QGLRENDERSEQUENCER_H
diff --git a/src/gui/extern/Qt3D/scene/qglrenderstate.cpp b/src/gui/extern/Qt3D/scene/qglrenderstate.cpp
deleted file mode 100644
index 1885336e3737f6338e801318618013507e79f83c..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderstate.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglrenderstate.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLRenderState
- \brief The QGLRenderState class encapsulates the states of a rendering pass.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- The QGLRenderState class works with the QGLRenderOrder class to optimize
- the rendering order of scene nodes.
-
- In general instances of this class are managed by the render sequencer
- and it should not be necessary to explicitly create or manipulate them.
-
- A QGLRenderState instance encapsulates rendering properties for a given
- path through the rendering process. The state includes properties such as
- effects, and materials; which may either be directly set on a scene node,
- or inherited from its parents.
-
- QGLRenderState may be subclassed in advanced applications to provide a
- different inheritance pattern for rendering properties - reimplement the
- updateFrom() function to do this. The default implementation simply sets
- an effect on the state if the argument node has an effect (found by
- calling the QGLSceneNode::hasEffect() function), and sets a material on
- the state if the node has a non-null material; otherwise the existing
- state is left as it is.
-
- The render sequencer will ensure that the relevant render state is set
- onto the painter at the beginning of the pass which renders all nodes
- with that state.
-
- \sa QGLRenderOrder
-*/
-
-class QGLRenderStatePrivate : public QSharedData
-{
-public:
- QGLRenderStatePrivate();
- ~QGLRenderStatePrivate();
- QGLRenderStatePrivate *clone() const;
-
- QBasicAtomicInt ref;
-
- bool hasEffect;
- QGLMaterial *material;
- QGLMaterial *backMaterial;
- QGL::StandardEffect standardEffect;
- QGLAbstractEffect *userEffect;
- const QGLSceneNode *node;
-};
-
-QGLRenderStatePrivate::QGLRenderStatePrivate()
- : hasEffect(false)
- , material(0)
- , backMaterial(0)
- , standardEffect(QGL::FlatColor)
- , userEffect(0)
- , node(0)
-{
- ref = 0;
-}
-
-QGLRenderStatePrivate::~QGLRenderStatePrivate()
-{
-}
-
-QGLRenderStatePrivate *QGLRenderStatePrivate::clone() const
-{
- QGLRenderStatePrivate *r = new QGLRenderStatePrivate;
- r->hasEffect = hasEffect;
- r->material = material;
- r->backMaterial = backMaterial;
- r->standardEffect = standardEffect;
- r->userEffect = userEffect;
- r->node = node;
- return r;
-}
-
-/*!
- Creates a new QGLRenderState empty of any values.
-*/
-QGLRenderState::QGLRenderState()
- : d(0)
-{
-}
-
-/*!
- Creates a new QGLRenderState as a copy of \a other
-*/
-QGLRenderState::QGLRenderState(const QGLRenderState &other)
- : d(other.d)
-{
- if (d)
- d->ref.ref();
-}
-
-/*!
- Destroys this QGLRenderState recovering and resources.
-*/
-QGLRenderState::~QGLRenderState()
-{
- if (d && !d->ref.deref())
- delete d;
-}
-
-/*!
- Assigns this QGLRenderState to be a copy of \a rhs.
-*/
-QGLRenderState &QGLRenderState::operator=(const QGLRenderState &rhs)
-{
- if (d != rhs.d)
- {
- if (d && !d->ref.deref())
- delete d;
- d = rhs.d;
- if (d)
- d->ref.ref();
- }
- return *this;
-}
-
-/*!
- Sets the values of this QGLRenderState from the \a node, where
- the node has a value. For example if the \a node has an effect
- but no material, then this state will have its effect changed to
- that of the node, but this state's material will be unchanged.
-*/
-void QGLRenderState::updateFrom(const QGLSceneNode *node)
-{
- detach();
- if (node->hasEffect())
- {
- d->hasEffect = true;
- if (node->userEffect())
- d->userEffect = node->userEffect();
- else
- d->standardEffect = node->effect();
- }
- if (node->material())
- d->material = node->material();
- if (node->backMaterial())
- d->backMaterial = node->backMaterial();
- d->node = node;
-}
-
-/*!
- Returns the user effect stored on this QGLRenderState, or null if no
- user effect has been set. The default value is null.
-*/
-QGLAbstractEffect *QGLRenderState::userEffect() const
-{
- QGLAbstractEffect *e = 0;
- if (d)
- e = d->userEffect;
- return e;
-}
-
-/*!
- Returns the standard effect stored on this QGLRenderState. The
- default value is QGL::FlatColor. To determine if an effect has
- been specifically set call hasEffect().
-*/
-QGL::StandardEffect QGLRenderState::standardEffect() const
-{
- QGL::StandardEffect e = QGL::FlatColor;
- if (d)
- e = d->standardEffect;
- return e;
-}
-
-/*!
- Returns true is there is a valid effect on this QGLRenderState. The
- default value is false.
-*/
-bool QGLRenderState::hasEffect() const
-{
- bool r = false;
- if (d)
- r = d->hasEffect;
- return r;
-}
-
-/*!
- Returns the material stored on this QGLRenderState, or null if no
- material has been set. The default value is null.
-*/
-QGLMaterial *QGLRenderState::material() const
-{
- QGLMaterial *m = 0;
- if (d)
- m = d->material;
- return m;
-}
-
-/*!
- Returns the back material stored on this QGLRenderState, or null if no
- back material has been set. The default value is null.
-*/
-QGLMaterial *QGLRenderState::backMaterial() const
-{
- QGLMaterial *m = 0;
- if (d)
- m = d->backMaterial;
- return m;
-}
-
-/*!
- Returns the node used to populate this QGLRenderState.
-*/
-const QGLSceneNode *QGLRenderState::node() const
-{
- const QGLSceneNode *s = 0;
- if (d)
- s = d->node;
- return s;
-}
-
-/*!
- Returns true if this is a valid representation of a render state, that
- is if it has ever been updated from a node; and false otherwise.
-*/
-bool QGLRenderState::isValid() const
-{
- if (d && d->node)
- return true;
- return false;
-}
-
-/*!
- \fn bool QGLRenderState::operator==(const QGLRenderState &rhs) const
- Returns true if this state is equal to \a rhs, that is if each of the
- materials, effects and values are equal to those of \a rhs.
-*/
-void QGLRenderState::detach()
-{
- if (!d) // lazy creation of data block
- {
- d = new QGLRenderStatePrivate;
- d->ref.ref();
- }
- else
- {
- if (d->ref > 1) // being shared, must detach
- {
- QGLRenderStatePrivate *temp = d->clone();
- d->ref.deref();
- d = temp;
- d->ref.ref();
- }
- }
-}
-
-/*!
- Returns a hash value representing this state.
-*/
-uint QGLRenderState::hash() const
-{
- const QByteArray bytes((const char *)d, sizeof(d));
- return qHash(bytes);
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLRenderState &order)
-{
- dbg << "QGLRenderState" << &order << "-- user effect:" << order.userEffect()
- << "-- standardEffect:" << order.standardEffect()
- << "-- hasEffect:" << order.hasEffect()
- << "-- material:" << order.material()
- << "-- back material:" << order.backMaterial()
- << "-- node:" << order.node();
- return dbg;
-}
-
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglrenderstate.h b/src/gui/extern/Qt3D/scene/qglrenderstate.h
deleted file mode 100644
index 9bfc34402c8bad424f10d106af562109012dbdf2..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglrenderstate.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLRENDERSTATE_H
-#define QGLRENDERSTATE_H
-
-#include "qglnamespace.h"
-#include "qglscenenode.h"
-
-#include <QtCore/qshareddata.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLAbstractEffect;
-class QGLMaterial;
-
-class QGLRenderStatePrivate;
-
-class Q_QT3D_EXPORT QGLRenderState
-{
-public:
- QGLRenderState();
- QGLRenderState(const QGLRenderState &other);
- virtual ~QGLRenderState();
- QGLRenderState &operator=(const QGLRenderState &rhs);
- virtual void updateFrom(const QGLSceneNode *node);
- QGLAbstractEffect *userEffect() const;
- QGL::StandardEffect standardEffect() const;
- bool hasEffect() const;
- QGLMaterial *material() const;
- QGLMaterial *backMaterial() const;
- const QGLSceneNode *node() const;
- uint hash() const;
- bool operator==(const QGLRenderState &rhs) const
- {
- if (userEffect() != rhs.userEffect())
- return false;
- if (standardEffect() != rhs.standardEffect())
- return false;
- if (hasEffect() != rhs.hasEffect())
- return false;
- if (material() != rhs.material())
- return false;
- if (backMaterial() != rhs.backMaterial())
- return false;
- return true;
- }
- bool isValid() const;
-private:
- void detach();
- QGLRenderStatePrivate *d;
-};
-
-inline uint qHash(const QGLRenderState &s)
-{
- return s.hash();
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-#include <QtCore/qdebug.h>
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLRenderState &order);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QGLRENDERSTATE_H
diff --git a/src/gui/extern/Qt3D/scene/qglsceneformatplugin.cpp b/src/gui/extern/Qt3D/scene/qglsceneformatplugin.cpp
deleted file mode 100644
index 0691b00349cc000db93243f5d10204e35b2108ca..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglsceneformatplugin.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglsceneformatplugin.h"
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLSceneFormatHandler
- \brief The QGLSceneFormatHandler class defines the common format I/O interface for loading 3D scene formats.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- \sa QGLSceneFormatPlugin
-*/
-
-class QGLSceneFormatHandlerPrivate
-{
-public:
- QGLSceneFormatHandlerPrivate()
- {
- device = 0;
- m_scene = 0;
- }
-
- QIODevice *device;
- QString format;
- QUrl url;
- QGLAbstractScene *m_scene;
-};
-
-/*!
- Constructs a 3D scene format handler.
-*/
-QGLSceneFormatHandler::QGLSceneFormatHandler()
-{
- d_ptr = new QGLSceneFormatHandlerPrivate();
-}
-
-/*!
- Destroys this 3D scene format handler.
-*/
-QGLSceneFormatHandler::~QGLSceneFormatHandler()
-{
- delete d_ptr;
-}
-
-/*!
- Returns the device currently assigned to the 3D scene format handler.
- Returns null if no device has been assigned.
-
- \sa setDevice()
-*/
-QIODevice *QGLSceneFormatHandler::device() const
-{
- return d_ptr->device;
-}
-
-/*!
- Sets the device for this 3D scene format handler to \a device.
- The handler will use this device when reading 3D scenes.
-
- The device can only be set once and must be set before calling
- read(). If you need to read multiple files, construct multiple
- instances of the appropriate QGLSceneFormatHandler subclass.
-
- \sa device()
-*/
-void QGLSceneFormatHandler::setDevice(QIODevice *device)
-{
- d_ptr->device = device;
-}
-
-/*!
- Returns the format that is currently assigned to this 3D scene
- format handler. Returns an empty string if no format has been assigned.
-
- \sa setFormat()
-*/
-QString QGLSceneFormatHandler::format() const
-{
- return d_ptr->format;
-}
-
-/*!
- Sets the format of this 3D scene format handler to \a format.
-
- \sa format()
-*/
-void QGLSceneFormatHandler::setFormat(const QString& format)
-{
- d_ptr->format = format;
-}
-
-/*!
- Returns the url of the data provided by device(). This is
- typically used when the data in device() refers to additional
- files that need to be located relative to the original
- directory.
-
- \sa setUrl()
-*/
-QUrl QGLSceneFormatHandler::url() const
-{
- return d_ptr->url;
-}
-
-/*!
- Sets the \a url of the data provided by device().
-
- \sa url()
-*/
-void QGLSceneFormatHandler::setUrl(const QUrl& url)
-{
- d_ptr->url = url;
-}
-
-/*!
- Decodes and applies \a options to this handler. Generally this will be
- called by the QGLAbstractScene::loadScene() method prior to reading
- the model data with read() or download(). Exactly what the string value may contain
- and the meaning of the encoded options depends on each individual plugin.
-
- This default implementation simply does nothing.
-*/
-void QGLSceneFormatHandler::decodeOptions(const QString &options)
-{
- Q_UNUSED(options);
-}
-
-/*!
- \fn QGLAbstractScene *QGLSceneFormatHandler::read()
-
- Reads a 3D scene from device() and returns it. Returns null if
- the format of device() is invalid and a scene could not be read.
-*/
-
-/*!
- \fn QGLAbstractScene *QGLSceneFormatHandler::download()
-
- Reads a 3D scene from a url and returns a stub to it which can be used
- the application, and will be updated with the full scene later.
-
- Returns NULL if the scene could not be created.
-*/
-
-/*!
- \class QGLSceneFormatFactoryInterface
- \brief The QGLSceneFormatFactoryInterface class provides the factory interface for QGLSceneFormatPlugin.
- \internal
-*/
-
-/*!
- \class QGLSceneFormatPlugin
- \brief The QGLSceneFormatPlugin class defines an interface for loading 3D object and scene formats.
- \ingroup qt3d
- \ingroup qt3d::scene
-
- \sa QGLSceneFormatHandler
-*/
-
-/*!
- Constructs a 3D scene format plugin with the given \a parent. This is
- invoked automatically by the Q_EXPORT_PLUGIN2() macro.
-*/
-QGLSceneFormatPlugin::QGLSceneFormatPlugin(QObject *parent)
- : QObject(parent)
-{
- //do nothing
-}
-
-/*!
- Destroys this 3D scene format plugin. This is invoked automatically
- when the plugin is unloaded.
-*/
-QGLSceneFormatPlugin::~QGLSceneFormatPlugin()
-{
- //do nothing
-}
-
-/*!
- Initiates download of the specified scene. The scene must have been
- previously specified with URL, options, format, and so on. This
- function will then create a QGLAbstractDownloadManager instance and
- submit the network request for the scene.
-
- The resultant data will be handled by the downloadComplete() slot.
-*/
-void QGLSceneFormatHandler::downloadScene()
-{
-}
-
-/*!
- Set the pointer for the scene \a theScene currently being processed.
- This is specifically used during network loading.
-*/
-void QGLSceneFormatHandler::setScene(QGLAbstractScene *theScene)
-{
- d_ptr->m_scene = theScene;
-}
-
-/*!
- Get the pointer for the scene currently being processed. This is
- specifically used during network loading.
-*/
-QGLAbstractScene * QGLSceneFormatHandler::getScene() const
-{
- return d_ptr->m_scene;
-}
-
-/*!
- This function should be called when the download of a remotely hosted
- scene is complete. The \a sceneData will contain the relevant data for
- the scene.
-
- The user is required to reimplement this if they intend to support network
- loading of scenes in their plugin.
-*/
-void QGLSceneFormatHandler::downloadComplete(QByteArray sceneData)
-{
- Q_UNUSED(sceneData);
- //unused - re-implement if you intend to support network
- //loading of model files.
-}
-
-/*!
- Called at the end of the read() and download() functions, this function
- completes any extra cleanup required, and sets the QGLSceneFormatHandler
- it belongs to as being ready for deletion when the main event loop is next
- processed.
-*/
-void QGLSceneFormatHandler::finalize()
- {
- deleteLater();
- }
-
-/*!
- \fn QStringList QGLSceneFormatPlugin::keys() const
-
- Returns the list of format keys this plugin supports. These keys
- are usually the names of the 3D scene formats that are implemented in
- the plugin (e.g., "3ds", "obj", etc). The returned elements must
- be in lower case.
-
- \sa create()
-*/
-
-/*!
- \fn QGLSceneFormatHandler *QGLSceneFormatPlugin::create(QIODevice *device, const QUrl& url, const QString &format) const
-
- Creates and returns a QGLSceneFormatHandler for handling the data in
- \a device according to \a format. The \a url specifies the original
- location of the data for resolving relative resource references.
-
- \sa keys()
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglsceneformatplugin.h b/src/gui/extern/Qt3D/scene/qglsceneformatplugin.h
deleted file mode 100644
index 9b3f1f0a5fd5317bf27ca43f43d2898f285a22ef..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglsceneformatplugin.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSCENEFORMATPLUGIN_H
-#define QGLSCENEFORMATPLUGIN_H
-
-#include "qt3dglobal.h"
-#include <QObject>
-#include <QtCore/qplugin.h>
-#include <QtCore/qfactoryinterface.h>
-#include <QtCore/qurl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLAbstractScene;
-class QGLSceneFormatHandlerPrivate;
-
-class Q_QT3D_EXPORT QGLSceneFormatHandler : public QObject
-{
- Q_OBJECT
-public:
- QGLSceneFormatHandler();
- virtual ~QGLSceneFormatHandler();
-
- QIODevice *device() const;
- void setDevice(QIODevice *device);
-
- QString format() const;
- void setFormat(const QString& format);
-
- QUrl url() const;
- void setUrl(const QUrl& url);
-
- virtual QGLAbstractScene *read() = 0;
- virtual QGLAbstractScene *download() = 0;
-
- virtual void decodeOptions(const QString &options);
-
- void finalize();
-
- void downloadScene();
-
-public slots:
- virtual void downloadComplete(QByteArray sceneData);
-protected:
- void setScene(QGLAbstractScene *theScene);
- QGLAbstractScene * getScene() const;
-
-private:
- QGLSceneFormatHandlerPrivate *d_ptr;
-};
-
-struct Q_QT3D_EXPORT QGLSceneFormatFactoryInterface : public QFactoryInterface
-{
- virtual QGLSceneFormatHandler *create(QIODevice *device, const QUrl& url, const QString &format = QString()) const = 0;
-};
-
-#define QGLSceneFormatFactoryInterface_iid \
- "com.trolltech.Qt.QGLSceneFormatFactoryInterface"
-Q_DECLARE_INTERFACE(QGLSceneFormatFactoryInterface, QGLSceneFormatFactoryInterface_iid)
-
-class Q_QT3D_EXPORT QGLSceneFormatPlugin : public QObject, public QGLSceneFormatFactoryInterface
-{
- Q_OBJECT
- Q_INTERFACES(QGLSceneFormatFactoryInterface:QFactoryInterface)
-public:
- explicit QGLSceneFormatPlugin(QObject *parent = 0);
- virtual ~QGLSceneFormatPlugin();
-
- virtual QStringList keys() const = 0;
- virtual QGLSceneFormatHandler *create(QIODevice *device, const QUrl& url, const QString &format = QString()) const = 0;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/scene/qglscenenode.cpp b/src/gui/extern/Qt3D/scene/qglscenenode.cpp
deleted file mode 100644
index 1f0e63842b411eed847d7a06c63448fac945ecd1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglscenenode.cpp
+++ /dev/null
@@ -1,1895 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglabstractscene.h"
-#include "qglscenenode.h"
-#include "qglscenenode_p.h"
-#include "qglpicknode.h"
-#include "qglpainter.h"
-#include "qgeometrydata.h"
-#include "qglmaterialcollection.h"
-#include "qglrendersequencer.h"
-#include "qglabstracteffect.h"
-#include "qgraphicstransform3d.h"
-
-#ifndef QT_NO_DEBUG_STREAM
-#include "qglmaterialcollection.h"
-#include "qgltexture2d.h"
-#endif
-
-#include <QtGui/qmatrix4x4.h>
-#if !defined(QT_NO_THREAD)
-#include <QtCore/qthread.h>
-#include <QtGui/qapplication.h>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLSceneNode
- \brief The QGLSceneNode class defines a node in a 3D scene.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::scene
-
- QGLSceneNode represents one component of a scene. The QGLSceneNode
- class manages materials, effects and transformations for itself and
- for its child nodes.
-
- As a general approach to 3D applications, a tree of QGLSceneNodes may
- be constructed, geometry added to them, materials and transformations
- applied, all during application initialization; and then by simply
- calling the draw() function the scene is easily rendered for each frame.
-
- \section1 Geometry
-
- Multiple QGLSceneNodes can reference the same geometry, whilst
- applying different transformations and treatments to it. Since
- QGLSceneNode is a QObject sub class it cannot be copied directly, so
- instead use the clone() function for this purpose.
-
- A scene node allows referencing into sub-parts of geometry, via the start
- and count properties.
-
- The start index is an offset into the geometry at which drawing will start.
- The default start index is 0, so that drawing will start from the beginning
- of the geometry. The count dictates how many vertices will be drawn. The
- default count is 0, which instructs the underlying geometry to draw all
- vertices.
-
- A node may have no geometry, that is \c{geometry().count() == 0}. This is
- useful for example to have one node controlling or collecting together
- several child nodes to be manipulated as a unit.
-
- \section1 Materials
-
- Also a node may have a local material. This allows drawing the same geometry
- with different materials (which includes different textures).
-
- When accessing a QGLSceneNode via QML, or for simple applications, the
- pointer based material functions are convenient and intuitive, saving the
- trouble of adding the material pointer to the correct palette:
- \list
- \i material()
- \i setMaterial()
- \i backMaterial()
- \i setBackMaterial()
- \endlist
-
- For more complex applications; for example building model loaders, or for
- larger scenes; where you need to explicitly manage materials via a palette,
- use the index based functions:
- \list
- \i materialIndex()
- \i setMaterialIndex()
- \i backMaterialIndex()
- \i setBackMaterialIndex()
- \endlist
-
- The behaviour of both with respect to faces is the same - if a material()
- is specified but no backMaterial() is specified, then the material() is
- applied to both faces; if both material() and backMaterial() are non-null
- then they are applied to their specific faces.
-
- \section1 Transformations
-
- Typically the local transformation matrix is set by the process that
- constructed the node: in the case of an imported model, it is likely
- to have been specified by the model file. To make individual changes
- to the location or orientation of this node, use the position() and
- transforms() properties.
-
- \section1 Scene Graph
-
- Use childNodes() to obtain the list of child nodes, and add and remove
- child nodes by the addNode() and removeNode() methods. If a QGLSceneNode
- is constructed with a QGLSceneNode parent, then addNode() will be
- called implicitly on the parent.
-
- A child may be a child multiple times, a child may be under more than one
- parent, and several parents may reference the same child. There is however
- no protection against cycles, so a child must not be a parent of itself,
- even if indirectly.
-
- A child node for the purposes of rendering means a child added via the
- addNode() method. The default QGLSceneNode constructor will check to
- see if its parent is a QGLSceneNode and add itself via the addNode()
- function if it is.
-
- To help debug a scene, use the qDumpScene() function to get a printout
- on stderr of the entire structure of the scene below the argument node.
-
- \section1 Debugging Lighting Normals
-
- The ViewNormals option is an advanced feature for use when inspecting
- and debugging models or geometry in a scene. The lighting normals
- are displayed as a straight line from the vertex pointing in
- the direction of the lighting normal. This is useful for
- example to show where normals are inverted or wrongly
- calculated.
-
- The setting of the ViewNormals flag is not propagated to child nodes,
- instead set the flag to true for the node or nodes where its
- needed. To set the flag on all child nodes use code like:
-
- \code
- foreach (QGLSceneNode *node, scene.allChildren())
- node->setNormalViewEnabled(true);
- \endcode
-
- \image spiky-teapot.png
-
- \sa QGLAbstractScene
-*/
-
-/*!
- \enum QGLSceneNode::Option
- This enum defines option flags for QGLSceneNode. By default the none of the flags
- are set, so the options() function returns QGLSceneNode::NoOptions
-
- \value NoOptions Do not enable any QGLSceneNode options.
- \value CullBoundingBox Perform a cull using boundingBox() before
- attempting to draw the geometry().
- \value ViewNormals Enables the display of lighting normals for
- debugging purposes.
- \value ReportCulling Send a signal when an object is displayed or culled.
- \value HideNode Hide this node so it, and all its children, are excluded from rendering.
- \sa setOptions()
-*/
-
-/*!
- Constructs a new scene node and attaches it to \a parent. If parent is
- a QGLSceneNode then this node is added to it as a child.
-*/
-QGLSceneNode::QGLSceneNode(QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLSceneNodePrivate())
-{
- QGLSceneNode *sceneParent = qobject_cast<QGLSceneNode*>(parent);
- if (sceneParent)
- sceneParent->addNode(this);
-}
-
-/*!
- \internal
- Used by clone().
-*/
-QGLSceneNode::QGLSceneNode(QGLSceneNodePrivate *d, QObject *parent)
- : QObject(parent)
- , d_ptr(d)
-{
- QGLSceneNode *sceneParent = qobject_cast<QGLSceneNode*>(parent);
- if (sceneParent)
- sceneParent->addNode(this);
-}
-
-/*!
- Constructs a new scene node referencing \a geometry and attaches it to
- \a parent. If parent is a QGLSceneNode then this node is added to it
- as a child.
-*/
-QGLSceneNode::QGLSceneNode(const QGeometryData &geometry, QObject *parent)
- : QObject(parent)
- , d_ptr(new QGLSceneNodePrivate())
-{
- Q_D(QGLSceneNode);
- d->geometry = geometry;
- QGLSceneNode *sceneParent = qobject_cast<QGLSceneNode*>(parent);
- if (sceneParent)
- sceneParent->addNode(this);
-}
-
-/*!
- Destroys this scene node.
-*/
-QGLSceneNode::~QGLSceneNode()
-{
- Q_D(QGLSceneNode);
-
- // Detach ourselves from our children. The children will be
- // deleted separately when their QObject::parent() deletes them.
- for (int index = 0; index < d->childNodes.count(); ++index)
- d->childNodes.at(index)->d_ptr->parentNodes.removeOne(this);
-
- // Detach ourselves from our remaining parents, and notify them
- // to update their bounding boxes. This won't be needed if we
- // are recursively destroying a tree of nodes because the parent
- // already detached from this node above.
- for (int index = 0; index < d->parentNodes.count(); ++index) {
- QGLSceneNode *parent = d->parentNodes.at(index);
- parent->d_ptr->childNodes.removeOne(this);
- parent->invalidateBoundingBox();
- }
-}
-
-/*!
- \property QGLSceneNode::options
- \brief Various option flags effecting rendering
-
- This property containst several flags that modify normal rendering and
- culling on a QGLSceneNode. See \l Options for a full description of the
- available flags.
-
- \sa setOption(), Options
-*/
-
-/*!
- Returns the drawing options associated with this node.
- The default is 0 (no options set).
-
- \sa setOptions(), setOption()
-*/
-QGLSceneNode::Options QGLSceneNode::options() const
-{
- Q_D(const QGLSceneNode);
- return d->options;
-}
-
-/*!
- \qmlproperty enumeration QGLSceneNode::options
-
- Defines the settings of various options configurabled on
- nodes in the mesh.
-
- \list
- \o NoOptions Use no options. This is the default.
- \o CullBoundingBox Use the camera position to cull the whole node if possible.
- \o ViewNormals Turn on normals debugging mode visually depict lighting normals.
- \o ReportCulling Send a signal when an object is displayed or culled.
- \endlist
-*/
-
-/*!
- Sets the drawing \a options associated with this node.
-
- \sa options(), setOption()
-*/
-void QGLSceneNode::setOptions(QGLSceneNode::Options options)
-{
- Q_D(QGLSceneNode);
- if (d->options != options) {
- d->options = options;
- emit updated();
- }
-}
-
-/*!
- Enables or disables \a option according to \a value.
-
- \sa options(), setOptions()
-*/
-void QGLSceneNode::setOption(QGLSceneNode::Option option, bool value)
-{
- Q_D(QGLSceneNode);
- QGLSceneNode::Options opts = d->options;
- if (value)
- opts |= option;
- else
- opts &= ~option;
- if (d->options != opts) {
- d->options = opts;
- emit updated();
- }
-}
-
-/*!
- Returns the geometry associated with this node, or a null QGeometryData
- if no geometry has been associated with it.
-
- \sa setGeometry()
-*/
-QGeometryData QGLSceneNode::geometry() const
-{
- Q_D(const QGLSceneNode);
- return d->geometry;
-}
-
-/*!
- Sets the geometry associated with this node to be \a geometry.
- Typically the \a geometry will be some type of mesh object. The
- default implementation of the QGLSceneNode::draw() method will call
- the geometry's draw() method.
-
- \sa geometry()
-*/
-void QGLSceneNode::setGeometry(QGeometryData geometry)
-{
- Q_D(QGLSceneNode);
- d->geometry = geometry;
- emit updated();
-}
-
-/*!
- Returns a bounding box for the portion of the geometry referenced by
- this scene node. If the value of start() is 0, and count() is the same
- as geometry()->size() then the bounding box will be the same as
- geometry()->boundingBox(). However if the scene node only references
- some part of the geometry, a bounding box for this section is calculated.
-
- If this scene node has child nodes then the bounding box will be the
- calculated union of the bounding box for this nodes geometry (if any) and
- the bounding boxes of the children.
-
- The calculated value is cached and returned on subsequent calls, but
- could be expensive to calculate initially.
-*/
-QBox3D QGLSceneNode::boundingBox() const
-{
- Q_D(const QGLSceneNode);
- if (d->boxValid)
- return d->bb;
- d->bb = QBox3D();
- if (d->geometry.count() > 0)
- {
- if (d->start == 0 && (d->count == d->geometry.count() || d->count == 0))
- {
- d->bb = d->geometry.boundingBox();
- }
- else
- {
- QGL::IndexArray indices = d->geometry.indices();
- for (int i = d->start; i < (d->start + d->count); ++i)
- {
- int ix = indices.at(i);
- d->bb.unite(d->geometry.vertexAt(ix));
- }
- }
- }
- QList<QGLSceneNode*>::const_iterator it = d->childNodes.constBegin();
- for ( ; it != d->childNodes.constEnd(); ++it)
- {
- QGLSceneNode *n = *it;
- QBox3D b = n->boundingBox();
- d->bb.unite(b);
- }
- d->bb.transform(transform());
- d->boxValid = true;
- return d->bb;
-}
-
-// Calculate the resulting matrix from the position, local transform,
-// and list of transforms.
-QMatrix4x4 QGLSceneNode::transform() const
-{
- Q_D(const QGLSceneNode);
- QMatrix4x4 m;
- if (!d->translate.isNull())
- m.translate(d->translate);
- if (!d->localTransform.isIdentity())
- m *= d->localTransform;
- for (int index = d->transforms.size() - 1; index >= 0; --index)
- d->transforms.at(index)->applyTo(&m);
- return m;
-}
-
-/*!
- Returns the local transform associated with this node. If no
- local transform has been explicitly set, this method returns a
- QMatrix4x4 set to the identity matrix.
-
- The local transform is typically set during model loading or
- geometry construction, and is a feature of the geometry.
-
- In general to change the location or orientation of the node
- use the position() or transforms() properties instead.
-
- \sa setLocalTransform(), position(), transforms()
-*/
-QMatrix4x4 QGLSceneNode::localTransform() const
-{
- Q_D(const QGLSceneNode);
- return d->localTransform;
-}
-
-/*!
- Sets the local transform associated with this node to be \a transform.
- The default implementation of the QGLSceneNode::draw() method will
- apply this transform to the QGLPainter before drawing any geometry.
-
- \sa localTransform()
-*/
-void QGLSceneNode::setLocalTransform(const QMatrix4x4 &transform)
-{
- Q_D(QGLSceneNode);
- if (d->localTransform != transform)
- {
- d->localTransform = transform;
- emit updated();
- invalidateTransform();
- }
-}
-
-/*!
- \property QGLSceneNode::position
- \brief The amounts of x, y and z axis translation for this node.
-
- Since most nodes are situated relative to \c{(0, 0, 0)} when imported as
- part of a model or constructed programatically, the translation is
- effectively the position of the model in the scene.
-
- The x, y and z axis translations can also be specified individually as
- separate properties \l x, \l y, and \l z
-
- \sa x(), y(), z()
-*/
-QVector3D QGLSceneNode::position() const
-{
- Q_D(const QGLSceneNode);
- return d->translate;
-}
-
-void QGLSceneNode::setPosition(const QVector3D &p)
-{
- Q_D(QGLSceneNode);
- if (p != d->translate)
- {
- d->translate = p;
- emit updated();
- invalidateTransform();
- }
-}
-
-/*!
- \property QGLSceneNode::x
- \brief The amount of x axis translation for this node.
-
- \sa position()
-*/
-qreal QGLSceneNode::x() const
-{
- Q_D(const QGLSceneNode);
- return d->translate.x();
-}
-
-void QGLSceneNode::setX(qreal x)
-{
- Q_D(QGLSceneNode);
- if (x != d->translate.x())
- {
- d->translate.setX(x);
- emit updated();
- invalidateTransform();
- }
-}
-
-/*!
- \property QGLSceneNode::y
- \brief The amount of y axis translation for this node.
-
- \sa position()
-*/
-qreal QGLSceneNode::y() const
-{
- Q_D(const QGLSceneNode);
- return d->translate.y();
-}
-
-void QGLSceneNode::setY(qreal y)
-{
- Q_D(QGLSceneNode);
- if (y != d->translate.y())
- {
- d->translate.setY(y);
- emit updated();
- invalidateTransform();
- }
-}
-
-/*!
- \property QGLSceneNode::z
- \brief The amount of z axis translation for this node.
-
- \sa position()
-*/
-qreal QGLSceneNode::z() const
-{
- Q_D(const QGLSceneNode);
- return d->translate.z();
-}
-
-void QGLSceneNode::setZ(qreal z)
-{
- Q_D(QGLSceneNode);
- if (z != d->translate.z())
- {
- d->translate.setZ(z);
- emit updated();
- invalidateTransform();
- }
-}
-
-/*!
- Returns the list of transformations to apply to this node.
- The default is the empty list.
-
- The transformations are applied to the node itself, so a
- QGraphicsScale3D followed by a QGraphicsTranslation3D will
- first scale the node in its local co-ordinate system,
- and then translate the node a new location.
-
- In the mathematical sense, the transformations are applied to
- the modelview matrix in the reverse order in which they appear
- in this list.
-
- The position() is applied after all other transformations
- have been applied.
-
- \sa setTransforms(), addTransform(), position()
-*/
-QList<QGraphicsTransform3D *> QGLSceneNode::transforms() const
-{
- Q_D(const QGLSceneNode);
- return d->transforms;
-}
-
-/*!
- Sets the list of transformations to apply to this node to \a transforms.
-
- The transformations are applied to the node itself, so a
- QGraphicsScale3D followed by a QGraphicsTranslation3D will
- first scale the node in its local co-ordinate system,
- and then translate the node a new location.
-
- In the mathematical sense, the transformations are applied to
- the modelview matrix in the reverse order in which they appear
- in \a transforms.
-
- The position() is applied after all other transformations
- have been applied.
-
- \sa transforms(), addTransform(), position()
-*/
-void QGLSceneNode::setTransforms(const QList<QGraphicsTransform3D *> &transforms)
-{
- Q_D(QGLSceneNode);
- for (int index = 0; index < d->transforms.size(); ++index) {
- QGraphicsTransform3D *transform = d->transforms.at(index);
- disconnect(transform, SIGNAL(transformChanged()), this, SLOT(transformChanged()));
- }
- d->transforms.clear();
- for (int index = 0; index < transforms.size(); ++index) {
- QGraphicsTransform3D *transform = transforms.at(index);
- if (transform) {
- connect(transform, SIGNAL(transformChanged()), this, SLOT(transformChanged()));
- d->transforms.append(transform);
- }
- }
- emit updated();
- invalidateTransform();
-}
-
-/*!
- Adds a single \a transform to this node, to be applied to the
- node after all current members of transformations() have been applied.
-
- In the mathematical sense, \a transform is applied to the modelview
- matrix before the current members of transformations() are applied
- in reverse order.
-
- \sa transforms(), setTransforms()
-*/
-void QGLSceneNode::addTransform(QGraphicsTransform3D *transform)
-{
- Q_D(QGLSceneNode);
- if (!transform)
- return; // Avoid nulls getting into the transform list.
- connect(transform, SIGNAL(transformChanged()), this, SLOT(transformChanged()));
- d->transforms.append(transform);
- emit updated();
- invalidateTransform();
-}
-
-/*!
- \internal
-*/
-void QGLSceneNode::transformChanged()
-{
- invalidateTransform();
- emit updated();
-}
-
-/*!
- Returns the drawing mode to use to render geometry(). The default
- is QGL::Triangles.
-
- \sa setDrawingMode()
-*/
-QGL::DrawingMode QGLSceneNode::drawingMode() const
-{
- Q_D(const QGLSceneNode);
- return d->drawingMode;
-}
-
-/*!
- Sets the drawing \a mode to use to render geometry().
-
- Note: this function changes the drawing mode, but the underlying
- geometry() still consists of the triangles that were added.
- Thus, this function is only useful for converting the drawing mode
- into QGL::Points to display the geometry() as a point cloud
- instead of a triangle mesh. The other enums from QGL::DrawingMode
- will give unpredictable results.
-
- \sa drawingMode()
-*/
-void QGLSceneNode::setDrawingMode(QGL::DrawingMode mode)
-{
- Q_D(QGLSceneNode);
- if (d->drawingMode != mode)
- {
- d->drawingMode = mode;
- emit updated();
- }
-}
-
-/*!
- Returns the drawing width for this node.
-
- Drawing width is used only when drawing lines or points (ie. when
- the drawing mode is points, lines, line-strips, etc).
-
- \sa drawingMode()
-*/
-qreal QGLSceneNode::drawingWidth() const
-{
- Q_D(const QGLSceneNode);
- return d->drawingWidth;
-}
-
-/*!
- Sets the drawing \a width to the given value.
-
- Drawing width is used only when drawing lines or points (ie. when
- the drawing mode is points, lines, line-strips, etc).
-
- \sa drawingMode()
-*/
-void QGLSceneNode::setDrawingWidth(qreal width)
-{
- Q_D(QGLSceneNode);
- d->drawingWidth = width;
-}
-
-
-/*!
- Returns the local effect associated with this node. The default value
- is QGL::FlatColor. If the value of hasEffect() is false, then this
- the value of effect() is ignored.
-
- \sa setEffect(), hasEffect()
-*/
-QGL::StandardEffect QGLSceneNode::effect() const
-{
- Q_D(const QGLSceneNode);
- return d->localEffect;
-}
-
-/*!
- Sets the local effect associated with this node to be \a effect. hasEffect()
- will return true after calling this method.
-
- The QGLSceneNode::draw() function will ensure that \a effect is applied to the
- QGLPainter before drawing any geometry.
-
- \sa effect(), hasEffect()
-*/
-void QGLSceneNode::setEffect(QGL::StandardEffect effect)
-{
- Q_D(QGLSceneNode);
- if (d->localEffect != effect || !d->hasEffect) {
- d->localEffect = effect;
- d->hasEffect = true;
- emit updated();
- }
-}
-
-/*!
- Returns the user effect associated with this node, or NULL if one is not
- set. The default value is NULL. If the value of hasEffect() is false,
- then this effect is ignored.
-
- \sa setUserEffect(), hasEffect()
-*/
-QGLAbstractEffect *QGLSceneNode::userEffect() const
-{
- Q_D(const QGLSceneNode);
- return d->customEffect;
-}
-
-/*!
- Sets the local effect associated with this node to be the custom
- \a effect. hasEffect() will return true after calling this method.
-
- This custom effect will supersede any standard effect.
-
- The default implementation of QGLSceneNode::apply() will set this effect
- during initialization of the model.
-
- The default implementation of the QGLSceneNode::draw() method will
- ensure that \a effect is applied to the QGLPainter before drawing
- any geometry.
-
- \sa userEffect(), hasEffect()
-*/
-void QGLSceneNode::setUserEffect(QGLAbstractEffect *effect)
-{
- Q_D(QGLSceneNode);
- if (d->customEffect != effect || !d->hasEffect) {
- d->customEffect = effect;
- d->hasEffect = true;
- emit updated();
- }
-}
-
-
- /*!
- Returns true if the local effect on this node is enabled, otherwise
- returns false.
-
- \sa setEffectEnabled(), setEffect()
- */
-bool QGLSceneNode::hasEffect() const
-{
- Q_D(const QGLSceneNode);
- return d->hasEffect;
-}
-
-/*!
- Sets whether the current value of effect() or userEffect() will be
- applied to the QGLPainter prior to drawing. If \a enabled is true,
- then the effect is applied, otherwise it is not.
-
- \sa setEffect(), effect(), hasEffect()
-*/
-void QGLSceneNode::setEffectEnabled(bool enabled)
-{
- Q_D(QGLSceneNode);
- if (d->hasEffect != enabled) {
- d->hasEffect = enabled;
- emit updated();
- }
-}
-
-/*!
- Returns the starting index within geometry() that should be used
- to render fragments for this scene node. The default value is 0,
- indicating that the 0'th logical vertex in geometry() is the start.
-
- \sa setStart(), count()
-*/
-int QGLSceneNode::start() const
-{
- Q_D(const QGLSceneNode);
- return d->start;
-}
-
-/*!
- Sets the \a start index within geometry() that should be used
- to render fragments for this scene node.
-
- \sa start(), setCount()
-*/
-void QGLSceneNode::setStart(int start)
-{
- Q_D(QGLSceneNode);
- if (start != d->start)
- {
- d->start = start;
- emit updated();
- invalidateBoundingBox();
- }
-}
-
-/*!
- Returns the count of the vertices to render from geometry()
- for this scene node. The default is zero, meaning that this node
- uses all vertices from start() up to the last logical vertex
- in the underlying geometry().
-
- \sa setCount(), start()
-*/
-int QGLSceneNode::count() const
-{
- Q_D(const QGLSceneNode);
- return d->count;
-}
-
-/*!
- Sets the \a count of the vertices to render from geometry()
- for this scene node.
-
- \sa count(), setStart()
-*/
-void QGLSceneNode::setCount(int count)
-{
- Q_D(QGLSceneNode);
- if (count != d->count)
- {
- d->count = count;
- emit updated();
- invalidateBoundingBox();
- }
-}
-
-/*!
- Returns the material index for this scene node.
-
- \sa setMaterialIndex()
-*/
-int QGLSceneNode::materialIndex() const
-{
- Q_D(const QGLSceneNode);
- return d->material;
-}
-
-/*!
- Sets the material index for this scene node to \a material.
-
- \sa materialIndex()
-*/
-void QGLSceneNode::setMaterialIndex(int material)
-{
- Q_D(QGLSceneNode);
- if (d->material != material) {
- d->material = material;
- emit updated();
- }
-}
-
-/*!
- Returns the back material index for this scene node.
-
- \sa setBackMaterialIndex()
-*/
-int QGLSceneNode::backMaterialIndex() const
-{
- Q_D(const QGLSceneNode);
- return d->backMaterial;
-}
-
-/*!
- Sets the back material index for this scene node to \a material.
-
- \sa materialIndex()
-*/
-void QGLSceneNode::setBackMaterialIndex(int material)
-{
- Q_D(QGLSceneNode);
- if (d->backMaterial != material) {
- d->backMaterial = material;
- emit updated();
- }
-}
-
-/*!
- \property QGLSceneNode::material
- \brief This property is a pointer to a QGLMaterial instance for this node.
-
- This material is applied to all faces if the backMaterial() property
- is set to null, which is the default. If the backMaterial() property is non-null
- then this material is only applied to the front faces.
-
- To apply a material to the back faces use the backMaterial() property.
-
- Getting this property is exactly equivalent to
- \c{palette()->material(materialIndex())}.
-
- Setting this property causes the material if not already in this nodes palette to be
- added, and then the corresponding index to be set for this scene node.
-
- Setting this property is equivalent to:
- \code
- int index = d->palette->indexOf(material);
- if (index == -1)
- index = d->palette->addMaterial(material);
- setMaterialIndex(index);
- \endcode
-
- If setting this property, when no palette exists one is created, as a
- convenience - but this is suitable only for experimental code and for
- \bold{very small numbers of nodes}. In debug mode a warning is
- printed in this case.
-
- Generally one common palette should be created, and set on each node. This
- also allows nodes to share materials and their textures.
-
- \sa materialIndex(), setMaterialIndex()
-*/
-QGLMaterial *QGLSceneNode::material() const
-{
- Q_D(const QGLSceneNode);
- if (d->palette)
- return d->palette->material(d->material);
- return 0;
-}
-
-void QGLSceneNode::setMaterial(QGLMaterial *material)
-{
- Q_D(QGLSceneNode);
- if (!d->palette)
- d->palette = new QGLMaterialCollection(this);
- int ix = d->palette->indexOf(material);
- if (ix == -1)
- ix = d->palette->addMaterial(material);
- setMaterialIndex(ix);
-}
-
-/*!
- \property QGLSceneNode::backMaterial
- \brief This property is a pointer to any QGLMaterial instance for this node's back faces.
-
- This material is applied to the back faces, if non-null. The default value
- of this property is null. When this property is null, any non-null material
- set on the material() property will be applied to front and back faces.
-
- To apply a material to the front faces use the material() property.
-
- Getting this property is exactly equivalent to
- \c{palette()->material(backMaterialIndex())}.
-
- Setting this property causes the material if not already in this nodes palette to be
- added, and then the corresponding index to be set for this scene node.
-
- Setting this property is exactly equivalent to:
- \code
- int index = d->palette->indexOf(material);
- if (index == -1)
- index = d->palette->addMaterial(material);
- setBackMaterialIndex(index);
- \endcode
-*/
-QGLMaterial *QGLSceneNode::backMaterial() const
-{
- Q_D(const QGLSceneNode);
- if (d->palette)
- return d->palette->material(d->backMaterial);
- return 0;
-}
-
-void QGLSceneNode::setBackMaterial(QGLMaterial *material)
-{
- Q_D(QGLSceneNode);
- if (!d->palette)
- d->palette = new QGLMaterialCollection(this);
- int ix = d->palette->indexOf(material);
- if (ix == -1)
- ix = d->palette->addMaterial(material);
- setBackMaterialIndex(ix);
-}
-/*!
- Returns the palette of materials used by this scene node, or NULL
- if no palette has been set.
-
- \sa setPalette()
-*/
-QGLMaterialCollection *QGLSceneNode::palette() const
-{
- Q_D(const QGLSceneNode);
- return d->palette;
-}
-
-/*!
- Sets the palette of materials for this scene node to \a palette.
-
- \sa palette()
-*/
-void QGLSceneNode::setPalette(QGLMaterialCollection *palette)
-{
- Q_D(QGLSceneNode);
- if (d->palette != palette) {
- d->palette = palette;
- emit updated();
- }
-}
-
-/*!
- Returns a list of the child nodes for this node. This list is not
- recursively generated, it includes only the nodes which are
- immediate children of this node.
-
- \sa allChildren()
-*/
-QList<QGLSceneNode*> QGLSceneNode::children() const
-{
- Q_D(const QGLSceneNode);
- return d->childNodes;
-}
-
-/*!
- Returns a list including recursively all child nodes under
- this node. Each child node only appears once, even if it is included
- multiple times in the scene graph.
-
- \sa children()
-*/
-QList<QGLSceneNode*> QGLSceneNode::allChildren() const
-{
- Q_D(const QGLSceneNode);
- QList<QGLSceneNode*> allSceneNodes;
- QList<QGLSceneNode*> gather;
- QList<QGLSceneNode*>::const_iterator it = d->childNodes.constBegin();
- for ( ; it != d->childNodes.constEnd(); ++it)
- if (!gather.contains(*it))
- gather.append(*it);
- while (gather.count() > 0)
- {
- QGLSceneNode *node = gather.takeFirst();
- if (!allSceneNodes.contains(node))
- {
- allSceneNodes.append(node);
- gather.append(node->children());
- }
- }
- return allSceneNodes;
-}
-
-/*!
- Adds the \a node to the list of child nodes for this node.
-
- This function does nothing if \a node is null or is already a child
- of this node. If the \a node is the node itself, a warning about an
- attempt to add a node to itself is printed, and no add takes place.
-
- If the aim is to have the same geometry displayed several times under a
- given node, each time with different transformations, use the clone()
- call to create copies of the node and then apply the transformations to
- the copies.
-
- Alternatively, create modifier nodes with the transformations and add the
- geometry bearing node to each with addNode():
- \code
- QGLBuilder builder;
- builder << CarWheel(5.0f); // some car wheel geometry
- QGLSceneNode wheel = builder.finalizedSceneNode();
- QGLSceneNode frontLeft = new QGLSceneNode(m_sceneRoot);
- frontLeft->addNode(wheel);
- frontLeft->setPosition(QVector3D(1.0f, 2.0f, 0.0f));
- QGLSceneNode frontRight = new QGLSceneNode(m_sceneRoot);
- frontRight->addNode(wheel);
- frontRight->setPosition(QVector3D(-1.0f, 2.0f, 0.0f));
- QGLSceneNode backLeft = new QGLSceneNode(m_sceneRoot);
- backLeft->addNode(wheel);
- backLeft->setPosition(QVector3D(1.0f, -2.0f, 0.0f));
- QGLSceneNode backRight = new QGLSceneNode(m_sceneRoot);
- backRight->addNode(wheel);
- backRight->setPosition(QVector3D(-1.0f, -2.0f, 0.0f));
- \endcode
-
- Because a child node can be validly added to many different nodes,
- calling addNode() does not normally affect the QObject::parent()
- ownership. However, if \a node does not currently have a
- QObject::parent(), the parent will be set to this node.
-
- \sa removeNode(), clone(), addNodes()
-*/
-void QGLSceneNode::addNode(QGLSceneNode *node)
-{
- Q_D(QGLSceneNode);
- bool alreadyAdded = node && node->d_ptr->parentNodes.contains(this);
- if (!node || node == this || alreadyAdded)
- return; // Invalid node, or already under this parent.
- invalidateBoundingBox();
- d->childNodes.append(node);
- node->d_ptr->parentNodes.append(this);
- if (!node->parent())
- node->setParent(this);
- connect(node, SIGNAL(updated()), this, SIGNAL(updated()));
- emit updated();
-}
-
-/*!
- Adds the members of \a nodes to the list of child nodes
- for this node.
-
- \sa addNode(), removeNodes()
-*/
-void QGLSceneNode::addNodes(const QList<QGLSceneNode *> &nodes)
-{
- Q_D(QGLSceneNode);
- for (int index = 0; index < nodes.count(); ++index) {
- QGLSceneNode *node = nodes.at(index);
- if (!node || node->d_ptr->parentNodes.contains(this))
- continue; // Invalid node, or already under this parent.
- d->childNodes.append(node);
- node->d_ptr->parentNodes.append(this);
- if (!node->parent())
- node->setParent(this);
- connect(node, SIGNAL(updated()), this, SIGNAL(updated()));
- }
- invalidateBoundingBox();
- emit updated();
-}
-
-/*!
- Removes the child node matching \a node from this node.
-
- If the QObject::parent() ownership of \a node was set to this
- node, then its parent will be changed to another parent node if it
- had multiple parents.
-
- If \a node had only a single parent, then its parent will be set to null,
- effectively detaching it from the QObject ownership rules of the scene
- graph. The caller is then responsible for deleting \a node.
-
- If the QObject::parent() of \a node was not a scene node parent,
- then it will be left unmodified.
-
- \sa addNode(), removeNodes()
-*/
-void QGLSceneNode::removeNode(QGLSceneNode *node)
-{
- Q_D(QGLSceneNode);
- if (!node || !node->d_ptr->parentNodes.contains(this))
- return; // Invalid node or not attached to this parent.
- d->childNodes.removeOne(node);
- node->d_ptr->parentNodes.removeOne(this);
- if (node->parent() == this) {
- // Transfer QObject ownership to another parent, or null.
- if (!node->d_ptr->parentNodes.isEmpty())
- node->setParent(node->d_ptr->parentNodes[0]);
- else
- node->setParent(0);
- }
- disconnect(node, SIGNAL(updated()), this, SIGNAL(updated()));
- invalidateBoundingBox();
- emit updated();
-}
-
-/*!
- Removes the members of \a nodes from the list of child nodes
- for this node.
-
- \sa removeNode(), addNodes()
-*/
-void QGLSceneNode::removeNodes(const QList<QGLSceneNode *> &nodes)
-{
- Q_D(QGLSceneNode);
- for (int index = 0; index < nodes.count(); ++index) {
- QGLSceneNode *node = nodes.at(index);
- if (!node || !node->d_ptr->parentNodes.contains(this))
- continue; // Invalid node or not attached to this parent.
- d->childNodes.removeOne(node);
- node->d_ptr->parentNodes.removeOne(this);
- if (node->parent() == this) {
- // Transfer QObject ownership to another parent, or null.
- if (!node->d_ptr->parentNodes.isEmpty())
- node->setParent(node->d_ptr->parentNodes[0]);
- else
- node->setParent(0);
- }
- disconnect(node, SIGNAL(updated()), this, SIGNAL(updated()));
- }
- invalidateBoundingBox();
- emit updated();
-}
-
-void QGLSceneNode::invalidateBoundingBox() const
-{
- Q_D(const QGLSceneNode);
- d->boxValid = false;
- d->invalidateParentBoundingBox();
-}
-
-void QGLSceneNode::invalidateTransform() const
-{
- invalidateBoundingBox();
-}
-
-void QGLSceneNode::drawNormalIndicators(QGLPainter *painter)
-{
- Q_D(QGLSceneNode);
- QVector3DArray verts;
- QGL::IndexArray indices = d->geometry.indices();
- for (int i = d->start; i < (d->start + d->count); ++i)
- {
- int ix = indices[i];
- QVector3D a = d->geometry.vertexAt(ix);
- QVector3D b = a + d->geometry.normalAt(ix);
- verts.append(a, b);
- }
- painter->setVertexAttribute(QGL::Position, QGLAttributeValue(verts));
- glLineWidth(2.0f);
- painter->draw(QGL::Lines, verts.size());
-}
-
-const QGLMaterial *QGLSceneNode::setPainterMaterial(int material, QGLPainter *painter,
- QGL::Face faces, bool &changedTex)
-{
- Q_D(QGLSceneNode);
- QGLMaterial *mat = d->palette->material(material);
- const QGLMaterial *saveMat = 0;
- if (painter->faceMaterial(faces) != mat)
- {
- saveMat = painter->faceMaterial(faces);
- painter->setFaceMaterial(faces, mat);
- int texUnit = 0;
- for (int i = 0; i < mat->textureLayerCount(); ++i)
- {
- QGLTexture2D *tex = mat->texture(i);
- if (tex)
- {
- painter->glActiveTexture(GL_TEXTURE0 + texUnit);
- tex->bind();
- changedTex = true;
- ++texUnit;
- }
- }
- }
- return saveMat;
-}
-
-/*!
- Draws the geometry of the node onto the \a painter.
-
- This is the function which performs the actual drawing step in the
- draw function below.
-
- \list
- \o calls draw(start, count) on this nodes geometry object (if any)
- \endlist
-
- Override this function to perform special processing on this node,
- after transformation & culling are applied and before sequencing of
- materials & effects are done; but just before (or after) the
- actual draw step.
-
- This default implementation simply draws the nodes geometry onto
- the painter.
-
- Example:
- \code
- void MySpecialNode::geometryDraw(QGLPainter *painter)
- {
- // at this point the node has survived culling, the model-view
- // matrix is transformed into this nodes frame of reference,
- // materials & effects have been applied as this node appears
- // in its place in the render sequence
-
- doMySpecialProcessing();
-
- // call parent implementation to do actual draw
- QGLSceneNode::geometryDraw(painter);
- }
- \endcode
-*/
-void QGLSceneNode::drawGeometry(QGLPainter *painter)
-{
- Q_D(QGLSceneNode);
- if (d->count && d->geometry.count() > 0)
- d->geometry.draw(painter, d->start, d->count, d->drawingMode, d->drawingWidth);
-}
-
-/*!
- Draws this scene node and its children on the \a painter.
-
- In detail this function:
- \list
- \o ensures the effect specified by effect() is current on the painter
- \o sets the nodes materials onto the painter, if valid materials are present
- \o moves the model-view to the x, y, z position
- \o applies any local transforms() that may be set for this node
- \o calls draw() for all the child nodes
- \o calls draw(start, count) on this nodes geometry object (if any)
- \o restores the geometry's original materials if they were changed
- \o restores the model-view matrix if any local transform was applied
- \endlist
-
- Note that the draw() method does \bold not restore the effect. If the first
- step above results in a change to the current QGL::Standard effect then it
- will remain set to that effect. In general any painting method should
- ensure the effect it requires is current.
-
- The way draw is implemented ensures that this nodes effects, materials and
- transformations will apply by default to its child nodes. Transformations
- are cumulative, but effects and materials override those of any parent node.
-
- Note that if the HideNode option is set for this node, neither it nor its
- children will be drawn.
-*/
-void QGLSceneNode::draw(QGLPainter *painter)
-{
- Q_D(QGLSceneNode);
- if (d->options & HideNode)
- return;
- bool wasTransformed = false;
-
- QGLRenderSequencer *seq = painter->renderSequencer();
-
- if (seq->top() != this)
- {
- QMatrix4x4 m = transform();
-
- if (!m.isIdentity())
- {
- painter->modelViewMatrix().push();
- painter->modelViewMatrix() *= m;
- wasTransformed = true;
- }
-
- if (d->options & CullBoundingBox)
- {
- QBox3D bb = boundingBox();
- if (bb.isFinite() && !bb.isNull() && painter->isCullable(bb))
- {
- if (!d->culled && d->options & ReportCulling)
- {
- d->culled = true;
- emit culled();
- }
- if (wasTransformed)
- painter->modelViewMatrix().pop();
- return;
- }
- else
- {
- if (d->culled && d->options & ReportCulling)
- {
- d->culled = false;
- emit displayed();
- }
- }
- }
- }
-
- if (seq->top() == NULL)
- {
- seq->setTop(this);
- while (true)
- {
- draw(painter); // recursively draw myself for each state
- if (!seq->nextInSequence())
- break;
- }
- seq->reset();
- }
- else
- {
- bool stateEntered = false;
- if (d->childNodes.size() > 0)
- {
- seq->beginState(this);
- stateEntered = true;
- QList<QGLSceneNode*>::iterator cit = d->childNodes.begin();
- for ( ; cit != d->childNodes.end(); ++cit)
- (*cit)->draw(painter);
- }
-
- if (d->count && (d->geometry.count() > 0) && seq->renderInSequence(this))
- {
- bool idSaved = false;
- int id = -1;
- if (d->pickNode && painter->isPicking())
- {
- idSaved = true;
- id = painter->objectPickId();
- painter->setObjectPickId(d->pickNode->id());
- }
-
- if (!stateEntered)
- {
- stateEntered = true;
- seq->beginState(this);
- }
- seq->applyState();
-
- drawGeometry(painter);
-
- if (idSaved)
- painter->setObjectPickId(id);
-
- if (d->options & ViewNormals)
- drawNormalIndicators(painter);
- }
- if (stateEntered)
- seq->endState(this);
- }
- if (wasTransformed)
- painter->modelViewMatrix().pop();
-}
-
-/*!
- Returns the pick node for this scene node, if one was set; otherwise
- NULL (0) is returned.
-
- \sa setPickNode()
-*/
-QGLPickNode *QGLSceneNode::pickNode() const
-{
- Q_D(const QGLSceneNode);
- return d->pickNode;
-}
-
-/*!
- Sets the pick node for this scene node to \a node.
-
- \sa pickNode()
-*/
-void QGLSceneNode::setPickNode(QGLPickNode *node)
-{
- Q_D(QGLSceneNode);
- // TODO - resolve recursive picking - not supported by
- // color based pick AFAICT
- d->pickNode = node;
- if (node)
- node->setTarget(this);
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry, child nodes, and
- have all effects, transforms and other properties copied from this node.
- The only property that is not copied is pickNode().
-
- \sa cloneNoChildren()
-*/
-QGLSceneNode *QGLSceneNode::clone(QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = new QGLSceneNode
- (new QGLSceneNodePrivate(d), parent ? parent : this->parent());
- for (int index = 0; index < d->transforms.size(); ++index)
- node->addTransform(d->transforms.at(index)->clone(node));
- node->addNodes(d->childNodes);
- return node;
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry, and
- have all effects, transforms and other properties copied from this node.
- The children() and pickNodes() are not cloned.
-
- \sa clone()
-*/
-QGLSceneNode *QGLSceneNode::cloneNoChildren(QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = new QGLSceneNode
- (new QGLSceneNodePrivate(d), parent ? parent : this->parent());
- for (int index = 0; index < d->transforms.size(); ++index)
- node->addTransform(d->transforms.at(index)->clone(node));
- return node;
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry and
- have all effects, transforms and other properties copied from this node.
-
- The copy returned will have the same child nodes, except all child nodes
- whose objectName() is equal to \a name.
-
- \sa clone(), only()
-*/
-QGLSceneNode *QGLSceneNode::allExcept(const QString &name, QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = cloneNoChildren(parent);
- for (int index = 0; index < d->childNodes.count(); ++index) {
- QGLSceneNode *child = d->childNodes.at(index);
- if (child->objectName() != name)
- node->addNode(child);
- }
- return node;
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry and
- have all effects, transforms and other properties copied from this node.
-
- The copy returned will have only one child node. This child node will be
- the first child node of this one which has its objectName() equal to \a name.
-
- \sa clone(), allExcept()
-*/
-QGLSceneNode *QGLSceneNode::only(const QString &name, QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = cloneNoChildren(parent);
- for (int index = 0; index < d->childNodes.count(); ++index) {
- QGLSceneNode *child = d->childNodes.at(index);
- if (child->objectName() == name) {
- node->addNode(child);
- break;
- }
- }
- return node;
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry and
- have all effects, transforms and other properties copied from this node.
-
- The copy returned will have the same child nodes, except all child nodes
- whose objectName() is in the list of \a names.
-
- \sa clone(), only()
-*/
-QGLSceneNode *QGLSceneNode::allExcept(const QStringList &names, QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = cloneNoChildren(parent);
- QSet<QString> chk = QSet<QString>::fromList(names);
- for (int index = 0; index < d->childNodes.count(); ++index) {
- QGLSceneNode *child = d->childNodes.at(index);
- if (!chk.contains(child->objectName()))
- node->addNode(child);
- }
- return node;
-}
-
-/*!
- Creates a new QGLSceneNode that is a copy of this scene node, with
- \a parent as the parent of the new copy. If parent is NULL then parent
- is set to this nodes parent.
-
- The copy will reference the same underlying geometry and
- have all effects, transforms and other properties copied from this node.
-
- The copy returned will have only the child nodes from this
- whose objectName() is in the list of \a names.
-
- \sa clone(), allExcept()
-*/
-QGLSceneNode *QGLSceneNode::only(const QStringList &names, QObject *parent) const
-{
- Q_D(const QGLSceneNode);
- QGLSceneNode *node = cloneNoChildren(parent);
- QSet<QString> chk = QSet<QString>::fromList(names);
- for (int index = 0; index < d->childNodes.count(); ++index) {
- QGLSceneNode *child = d->childNodes.at(index);
- if (chk.contains(child->objectName()))
- node->addNode(child);
- }
- return node;
-}
-
-/*!
- \fn QGLSceneNode::updated()
- Signals that some property of this scene node, or one of its children,
- has changed in a manner that will require that the node be redrawn.
-*/
-
-/*!
- \fn QGLSceneNode::culled()
- Signals that the node was culled due to falling wholly outside the view
- frustum. This signal can only fire if both QGLSceneNode::CullBoundingBox
- and QGLSceneNode::ReportCulling options are both set.
-*/
-
-/*!
- \fn QGLSceneNode::displayed()
- Signals that the node was displayed - or at least its geometry was sent
- to the GPU for rendering, since the GPU might still clip or occlude the
- node. This signal can only fire if both QGLSceneNode::CullBoundingBox
- and QGLSceneNode::ReportCulling options are both set.
-*/
-
-/*!
- \relates QGLSceneNode
- Print a description of \a node, and all its descendants, to the console.
- This function uses qDebug for its output, so in the case of Windows the
- output will go to the debug window. If QT_NO_DEBUG_OUTPUT or QT_NO_DEBUG
- has been defined, (as in release mode) this function will exit without
- doing anything.
-
- If \a detailed is true (which it is by default) then all the properties
- of each node are printed, including materials, geometry and transforms.
-
- If \a detailed is false, then just one line is printed with the name and
- some identifying information including a unique id for the node.
-
- The \a indent and \a loop parameters are used internally.
-*/
-void qDumpScene(QGLSceneNode *node, bool detailed, int indent, const QSet<QGLSceneNode *> &loop)
-{
-#if defined(QT_NO_DEBUG_STREAM) || defined(QT_NO_DEBUG) || defined(QT_NO_DEBUG_OUTPUT)
- Q_UNUSED(node);
- Q_UNUSED(detailed);
- Q_UNUSED(indent);
- Q_UNUSED(loop);
-#else
-#if !defined(QT_NO_THREAD)
- QCoreApplication *app = QApplication::instance();
- QThread *appThread = 0;
- if (app)
- appThread = QApplication::instance()->thread();
-#endif
- QSet<QGLSceneNode *> lp = loop;
- lp.insert(node);
- QString ind;
- ind.fill(QLatin1Char(' '), indent * 4);
- if (detailed)
- {
- qDebug("\n%s ======== Node: %p - %s =========", qPrintable(ind), node,
- qPrintable(node->objectName()));
- }
- else
- {
- qDebug("\n%s Node: %p - %s", qPrintable(ind), node,
- qPrintable(node->objectName()));
- return;
- }
-#if !defined(QT_NO_THREAD)
- if (appThread && appThread != node->thread())
- qDebug("\n%s from thread: %p", qPrintable(ind), node->thread());
-#endif
- qDebug("%s start: %d count: %d children:", qPrintable(ind), node->start(), node->count());
- {
- QList<QGLSceneNode*> children = node->children();
- QList<QGLSceneNode*>::const_iterator it = children.constBegin();
- for (int i = 0; it != children.constEnd(); ++it, ++i)
- qDebug("%s %d: %p ", qPrintable(ind), i, *it);
- }
- if (!node->position().isNull())
- {
- QVector3D p = node->position();
- qDebug("%s position: (%0.4f, %0.4f, %0.4f)", qPrintable(ind),
- p.x(), p.y(), p.z());
- }
- if (node->localTransform().isIdentity())
- {
- qDebug("%s local transform: identity", qPrintable(ind));
- }
- else
- {
- qDebug("%s local transform:", qPrintable(ind));
- QMatrix4x4 m = node->localTransform();
- for (int i = 0; i < 4; ++i)
- qDebug("%s %0.4f %0.4f %0.4f %0.4f",
- qPrintable(ind), m(i, 0), m(i, 1), m(i, 2), m(i, 3));
- }
- QList<QGraphicsTransform3D*> tx = node->transforms();
- if (tx.size() > 0)
- qDebug("%s transforms list:", qPrintable(ind));
- for (int i = 0; i < tx.size(); ++i)
- {
- const QMetaObject *obj = tx.at(i)->metaObject();
- qDebug("%s %s", qPrintable(ind), obj->className());
- }
- if (!node->geometry().isEmpty())
- {
- qDebug("%s geometry: %d indexes, %d vertices",
- qPrintable(ind), node->geometry().count(), node->geometry().count(QGL::Position));
- }
- else
- {
- qDebug("%s geometry: NULL", qPrintable(ind));
- }
- if (node->materialIndex() != -1)
- {
- qDebug("%s material: %d", qPrintable(ind), node->materialIndex());
- QGLMaterial *mat = node->material();
- QGLMaterialCollection *pal = node->palette();
- if (pal)
- qDebug("%s palette: %p", qPrintable(ind), pal);
- else
- qDebug("%s no palette", qPrintable(ind));
- if (pal)
- {
- mat = pal->material(node->materialIndex());
- if (mat)
- qDebug("%s mat name from pal: %s ", qPrintable(ind),
- qPrintable(pal->material(node->materialIndex())->objectName()));
- else
- qDebug("%s indexed material %d does not exist in palette!",
- qPrintable(ind), node->materialIndex());
- }
- if (mat)
- {
- QString mat_spx = QString(QLatin1String(" Amb: %1 - Diff: %2 - Spec: %3 - Shin: %4"))
- .arg((mat->ambientColor().name()))
- .arg(mat->diffuseColor().name())
- .arg(mat->specularColor().name())
- .arg(mat->shininess());
- if (mat->objectName().isEmpty())
- qDebug("%s material pointer %p: %s", qPrintable(ind), mat, qPrintable(mat_spx));
- else
- qDebug("%s \"%s\": %s", qPrintable(ind),
- qPrintable(mat->objectName()), qPrintable(mat_spx));
- for (int i = 0; i < mat->textureLayerCount(); ++i)
- {
- if (mat->texture(i) != 0)
- {
- QGLTexture2D *tex = mat->texture(i);
- if (tex->objectName().isEmpty())
- qDebug("%s texture %p", qPrintable(ind), tex);
- else
- qDebug("%s texture %s", qPrintable(ind),
- qPrintable(tex->objectName()));
- QSize sz = tex->size();
- qDebug(" - size: %d (w) x %d (h)", sz.width(), sz.height());
- }
- }
- }
- else
- {
- qDebug("%s - could not find indexed material!!", qPrintable(ind));
- }
- }
- else
- {
- qDebug("%s material: NONE", qPrintable(ind));
- }
-
- if (node->hasEffect())
- {
- if (node->userEffect())
- {
- qDebug("%s user effect %p", qPrintable(ind),
- node->userEffect());
- }
- else
- {
- switch (node->effect())
- {
- case QGL::FlatColor:
- qDebug("%s flat color effect", qPrintable(ind)); break;
- case QGL::FlatPerVertexColor:
- qDebug("%s flat per vertex color effect", qPrintable(ind)); break;
- case QGL::FlatReplaceTexture2D:
- qDebug("%s flat replace texture 2D effect", qPrintable(ind)); break;
- case QGL::FlatDecalTexture2D:
- qDebug("%s flat decal texture 2D effect", qPrintable(ind)); break;
- case QGL::LitMaterial:
- qDebug("%s lit material effect", qPrintable(ind)); break;
- case QGL::LitDecalTexture2D:
- qDebug("%s lit decal texture 2D effect", qPrintable(ind)); break;
- case QGL::LitModulateTexture2D:
- qDebug("%s lit modulate texture 2D effect", qPrintable(ind)); break;
- }
- }
- }
- else
- {
- qDebug("%s no effect set", qPrintable(ind));
- }
- QList<QGLSceneNode*> children = node->children();
- QList<QGLSceneNode*>::const_iterator it = children.constBegin();
- for ( ; it != children.constEnd(); ++it)
- if (!lp.contains(*it))
- qDumpScene(*it, indent + 1);
-#endif
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGLSceneNode &node)
-{
- dbg << &node << "\n start:" << node.start() << " count:" << node.count();
- QList<QGLSceneNode*> children = node.children();
- QList<QGLSceneNode*>::const_iterator it = children.constBegin();
- for ( ; it != children.constEnd(); ++it)
- dbg << "\n child:" << *it;
-
- if (node.localTransform().isIdentity())
- dbg << "\n local transform: identity";
- else
- dbg << "\n local transform:\n" << node.localTransform();
-
- if (node.geometry().count() > 0)
- {
- QGLMaterial *mat = node.material();
- QString mdesc;
- if (mat)
- mdesc = mat->objectName();
- dbg << "\n geometry:" << node.geometry();
- dbg << "\n material" << node.material() << ": " << mat << mdesc;
- }
- else
- {
- dbg << "\n geometry: NULL";
- dbg << "\n material" << node.material();
- }
-
- if (node.hasEffect())
- {
- if (node.userEffect())
- {
- dbg << "\n user effect";
- }
- else
- {
- switch (node.effect())
- {
- case QGL::FlatColor:
- dbg << "\n flat color effect"; break;
- case QGL::FlatPerVertexColor:
- dbg << "\n flat per vertex color effect"; break;
- case QGL::FlatReplaceTexture2D:
- dbg << "\n flat replace texture 2D effect"; break;
- case QGL::FlatDecalTexture2D:
- dbg << "\n flat decal texture 2D effect"; break;
- case QGL::LitMaterial:
- dbg << "\n lit material effect"; break;
- case QGL::LitDecalTexture2D:
- dbg << "\n lit decal texture 2D effect"; break;
- case QGL::LitModulateTexture2D:
- dbg << "\n lit modulate texture 2D effect"; break;
- }
- }
- }
- else
- {
- dbg << "\n no effect set";
- }
- return dbg;
-}
-
-#endif // QT_NO_DEBUG_STREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/scene/qglscenenode.h b/src/gui/extern/Qt3D/scene/qglscenenode.h
deleted file mode 100644
index f0c7c35f668b19323177da425ad68d46464479b2..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglscenenode.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSCENENODE_H
-#define QGLSCENENODE_H
-
-#include <QtCore/qobject.h>
-
-#include "qgeometrydata.h"
-#include "qglmaterialcollection.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLSceneNodePrivate;
-class QGLAbstractEffect;
-class QGLPickNode;
-class QGraphicsTransform3D;
-
-class Q_QT3D_EXPORT QGLSceneNode : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QGLSceneNode)
- Q_ENUMS(Option)
- Q_FLAGS(Options)
- Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY updated)
- Q_PROPERTY(qreal x READ x WRITE setX NOTIFY updated)
- Q_PROPERTY(qreal y READ y WRITE setY NOTIFY updated)
- Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY updated)
- Q_PROPERTY(QGLMaterial *material READ material WRITE setMaterial NOTIFY updated)
- Q_PROPERTY(QGLMaterial *backMaterial READ backMaterial WRITE setBackMaterial NOTIFY updated)
- Q_PROPERTY(Options options READ options WRITE setOptions NOTIFY updated)
-public:
- explicit QGLSceneNode(QObject *parent = 0);
- explicit QGLSceneNode(const QGeometryData &geometry, QObject *parent = 0);
- virtual ~QGLSceneNode();
-
- enum Option
- {
- NoOptions = 0x0000,
- CullBoundingBox = 0x0001,
- ViewNormals = 0x0002,
- ReportCulling = 0x0004,
- HideNode = 0x0008
- };
- Q_DECLARE_FLAGS(Options, Option)
-
- QGLSceneNode::Options options() const;
- void setOptions(QGLSceneNode::Options options);
- void setOption(QGLSceneNode::Option option, bool value);
-
- QGeometryData geometry() const;
- void setGeometry(QGeometryData);
-
- QBox3D boundingBox() const;
-
- QMatrix4x4 localTransform() const;
- void setLocalTransform(const QMatrix4x4 &);
- QVector3D position() const;
- void setPosition(const QVector3D &p);
- qreal x() const;
- void setX(qreal x);
- qreal y() const;
- void setY(qreal y);
- qreal z() const;
- void setZ(qreal z);
-
- QList<QGraphicsTransform3D *> transforms() const;
- void setTransforms(const QList<QGraphicsTransform3D *> &transforms);
- void addTransform(QGraphicsTransform3D *transform);
-
- QGL::DrawingMode drawingMode() const;
- void setDrawingMode(QGL::DrawingMode mode);
-
- qreal drawingWidth() const;
- void setDrawingWidth(qreal width);
-
- QGL::StandardEffect effect() const;
- void setEffect(QGL::StandardEffect);
-
- QGLAbstractEffect *userEffect() const;
- void setUserEffect(QGLAbstractEffect *effect);
-
- bool hasEffect() const;
- void setEffectEnabled(bool);
-
- int start() const;
- void setStart(int start);
-
- int count() const;
- void setCount(int count);
-
- int materialIndex() const;
- void setMaterialIndex(int material);
- int backMaterialIndex() const;
- void setBackMaterialIndex(int material);
-
- QGLMaterial *material() const;
- void setMaterial(QGLMaterial *material);
- QGLMaterial *backMaterial() const;
- void setBackMaterial(QGLMaterial *material);
-
- QGLMaterialCollection *palette() const;
- void setPalette(QGLMaterialCollection *palette);
-
- QList<QGLSceneNode*> allChildren() const;
- QList<QGLSceneNode *> children() const;
-
- void addNode(QGLSceneNode *node);
- void addNodes(const QList<QGLSceneNode *> &nodes);
- void removeNode(QGLSceneNode *node);
- void removeNodes(const QList<QGLSceneNode *> &nodes);
-
- virtual void draw(QGLPainter *painter);
-
- QGLPickNode *pickNode() const;
- void setPickNode(QGLPickNode *node);
-
- Q_INVOKABLE QGLSceneNode *clone(QObject *parent = 0) const;
- Q_INVOKABLE QGLSceneNode *cloneNoChildren(QObject *parent = 0) const;
- Q_INVOKABLE QGLSceneNode *allExcept(const QString &name, QObject *parent = 0) const;
- Q_INVOKABLE QGLSceneNode *only(const QString &name, QObject *parent = 0) const;
- Q_INVOKABLE QGLSceneNode *allExcept(const QStringList &names, QObject *parent = 0) const;
- Q_INVOKABLE QGLSceneNode *only(const QStringList &names, QObject *parent = 0) const;
-
-Q_SIGNALS:
- void updated();
- void culled();
- void displayed();
-
-protected:
- virtual void drawGeometry(QGLPainter *painter);
-
-private Q_SLOTS:
- void transformChanged();
-
-private:
- QMatrix4x4 transform() const;
- void invalidateBoundingBox() const;
- void invalidateTransform() const;
- void drawNormalIndicators(QGLPainter *painter);
- const QGLMaterial *setPainterMaterial(int material, QGLPainter *painter,
- QGL::Face faces, bool &changedTex);
-
- Q_DISABLE_COPY(QGLSceneNode)
-
- QScopedPointer<QGLSceneNodePrivate> d_ptr;
-
- QGLSceneNode(QGLSceneNodePrivate *d, QObject *parent);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLSceneNode::Options)
-
-Q_QT3D_EXPORT void qDumpScene(QGLSceneNode *, bool detailed = true, int indent = 0, const QSet<QGLSceneNode*> &loop = QSet<QGLSceneNode*>());
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLSceneNode &node);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/scene/qglscenenode_p.h b/src/gui/extern/Qt3D/scene/qglscenenode_p.h
deleted file mode 100644
index b66559ff0ccb6b8335fdeee828a2a1bdb79db31b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/scene/qglscenenode_p.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSCENENODE_P_H
-#define QGLSCENENODE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglnamespace.h"
-#include "qglscenenode.h"
-#include "qgraphicstransform3d.h"
-
-#include <QtGui/qmatrix4x4.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qset.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLAbstractEffect;
-class QGLPickNode;
-
-class QGLSceneNodePrivate
-{
-public:
- QGLSceneNodePrivate()
- : palette(0)
- , localEffect(QGL::FlatColor) // 0 - zero
- , customEffect(0)
- , hasEffect(false)
- , material(-1)
- , backMaterial(-1)
- , start(0)
- , count(0)
- , options(0)
- , pickNode(0)
- , boxValid(false)
- , drawingMode(QGL::Triangles)
- , culled(false)
- {
- }
-
- // This constructor is used by QGLSceneNode::clone().
- QGLSceneNodePrivate(const QGLSceneNodePrivate *other)
- : geometry(other->geometry)
- , palette(other->palette)
- , localTransform(other->localTransform)
- , translate(other->translate)
- , localEffect(other->localEffect)
- , customEffect(other->customEffect)
- , hasEffect(other->hasEffect)
- , material(other->material)
- , backMaterial(other->backMaterial)
- , start(other->start)
- , count(other->count)
- , options(other->options)
- , pickNode(0) // Explicitly not cloned.
- , bb(other->bb)
- , boxValid(other->boxValid)
- , drawingMode(other->drawingMode)
- , drawingWidth(1.0)
- , culled(other->culled)
- {
- }
-
- inline void invalidateParentBoundingBox() const
- {
- QList<QGLSceneNode*>::const_iterator it = parentNodes.constBegin();
- for ( ; it != parentNodes.constEnd(); ++it)
- (*it)->invalidateBoundingBox();
- }
-
- QGeometryData geometry;
- QGLMaterialCollection *palette;
- QMatrix4x4 localTransform;
- QVector3D translate;
- QList<QGraphicsTransform3D *> transforms;
- QGL::StandardEffect localEffect;
- QGLAbstractEffect *customEffect;
- QList<QGLSceneNode*> childNodes;
- QList<QGLSceneNode*> parentNodes;
- bool hasEffect;
- int material;
- int backMaterial;
- int start;
- int count;
- QGLSceneNode::Options options;
- QGLPickNode *pickNode;
- mutable QBox3D bb;
- mutable bool boxValid;
- QGL::DrawingMode drawingMode;
- qreal drawingWidth;
- bool culled;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLSCENENODE_P_H
diff --git a/src/gui/extern/Qt3D/surfaces/CMakeLists.txt b/src/gui/extern/Qt3D/surfaces/CMakeLists.txt
deleted file mode 100644
index 7ca057784fc6c0cef3184d0397fe25e7b3cbf257..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-target_sources( gui
- PRIVATE
- qgldrawbuffersurface.cpp
- qglabstractsurface.h
- qglpaintersurface.cpp
- qglwidgetsurface.h
- qglpaintersurface_p.h
- qglsubsurface.h
- qglframebufferobjectsurface.cpp
- qglmaskedsurface.cpp
- qglwidgetsurface.cpp
- qglpixelbuffersurface.cpp
- qglsubsurface.cpp
- qglframebufferobjectsurface.h
- qglcontextsurface.cpp
- qglcontextsurface_p.h
- qglmaskedsurface_p.h
- qglabstractsurface.cpp
- qgldrawbuffersurface_p.h
- qglpixelbuffersurface.h
- )
diff --git a/src/gui/extern/Qt3D/surfaces/qglabstractsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglabstractsurface.cpp
deleted file mode 100644
index 2852a03d028287867e0bdb6212ba2499af429cb8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglabstractsurface.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglabstractsurface.h"
-#include "qglcontextsurface_p.h"
-#include "qglframebufferobjectsurface.h"
-#include "qglpixelbuffersurface.h"
-#include "qglsubsurface.h"
-#include "qglwidgetsurface.h"
-#include <QtGui/qpaintdevice.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLAbstractSurface
- \brief The QGLAbstractSurface class represents an OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-
- OpenGL can be used to draw into a number of different surface types:
- windows, pixel buffers (pbuffers), framebuffer objects, and so on.
- It is also possible to use only part of a surface by setting
- the \c{glViewport()} to restrict drawing to that part. An example
- of a subsurface may be the left or right eye image of a stereoscopic
- pair that is rendered into the two halves of a window.
-
- Activating a surface for OpenGL drawing, and deactivating it afterwards
- can be quite varied across surface types. Sometimes it is enough
- to just make a QGLContext current and set the \c{glViewport()}.
- Other times a context must be made current, followed by binding a
- framebuffer object, and finally setting the \c{glViewport()}.
-
- QGLAbstractSurface and its subclasses simplify the activation and
- deactivation of surfaces by encapsulating the logic needed to
- use a particular kind of surface into activate() and deactivate()
- respectively.
-
- Normally surfaces are activated by calling QGLPainter::pushSurface()
- as in the following example of switching drawing to a framebuffer
- object:
-
- \code
- QGLPainter painter;
- painter.begin(widget);
- QGLFramebufferObjectSurface surface(fbo);
- painter.pushSurface(&surface);
- ... // draw into the fbo
- painter.popSurface();
- ... // draw into the widget
- \endcode
-
- QGLPainter maintains a stack of surfaces, starting with the paint
- device specified to QGLPainter::begin() (usually a widget).
- The QGLPainter::pushSurface() function calls deactivate() on the
- current surface, activate() on the new surface, and then adjusts the
- \c{glViewport()} to match the value of viewportGL() for the new surface.
- When QGLPainter::popSurface() is called, the previous surface
- is re-activated and the \c{glViewport()} changed accordingly.
-
- \sa QGLFramebufferObjectSurface, QGLWidgetSurface, QGLSubsurface
- \sa QGLPixelBufferSurface, QGLPainter::pushSurface()
-*/
-
-/*!
- \enum QGLAbstractSurface::SurfaceType
- This enum defines the type of a QGLAbstractSurface.
-
- \value Widget Instance of QGLWidgetSurface.
- \value FramebufferObject Instance of QGLFramebufferObjectSurface.
- \value PixelBuffer Instance of QGLPixelBufferSurface.
- \value Subsurface Instance of QGLSubsurface.
- \value User First user-defined surface type for use by applications.
-*/
-
-/*!
- \fn QGLAbstractSurface::QGLAbstractSurface(int surfaceType)
-
- Constructs an OpenGL drawing surface of the specified \a surfaceType.
-*/
-
-/*!
- Destroys this OpenGL drawing surface.
-*/
-QGLAbstractSurface::~QGLAbstractSurface()
-{
-}
-
-/*!
- \fn int QGLAbstractSurface::surfaceType() const
-
- Returns the type of this surface.
-*/
-
-/*!
- \fn QPaintDevice *QGLAbstractSurface::device() const
-
- Returns the raw device that this surface will draw on.
-
- If the surface is an instance of QGLSubsurface, then this will
- return the device of the surface that underlies the subsurface.
- The viewportRect() defines the region to render into.
-
- \sa viewportRect()
-*/
-
-/*!
- \fn bool QGLAbstractSurface::activate(QGLAbstractSurface *prevSurface)
-
- Activate this surface by making its context current, and binding
- the associated framebuffer object, if any.
-
- If \a prevSurface is null, then that surface has just been deactivated
- in the process of switching to this surface. This may allow activate()
- to optimize the transition to avoid unnecessary state changes.
-
- Returns true if the surface was activated; false otherwise.
-
- \sa deactivate(), switchTo()
-*/
-
-/*!
- \fn void QGLAbstractSurface::deactivate(QGLAbstractSurface *nextSurface)
-
- Deactivate this surface from the current context, but leave the
- context current. Typically this will release the framebuffer
- object associated with the surface.
-
- If \a nextSurface is null, then that surface will be activated next
- in the process of switching away from this surface. This may allow
- deactivate() to optimize the transition to avoid unnecessary state
- changes.
-
- \sa activate(), switchTo()
-*/
-
-/*!
- Returns the rectangle of the surface device() that is occupied by
- the viewport for this surface. The origin is at the top-left.
-
- This function calls viewportGL() and then flips the rectangle
- upside down using the height of device() so that the origin
- is at the top-left instead of the bottom-right.
-
- \sa viewportGL(), device()
-*/
-QRect QGLAbstractSurface::viewportRect() const
-{
- QRect view = viewportGL();
- QPaintDevice *dev = device();
- int height;
- if (dev->devType() == QInternal::Widget)
- height = static_cast<QWidget *>(dev)->height();
- else
- height = dev->height();
- return QRect(view.x(), height - (view.y() + view.height()),
- view.width(), view.height());
-}
-
-/*!
- \fn QRect QGLAbstractSurface::viewportGL() const
-
- Returns the rectangle of the surface device() that is occupied by
- the viewport for this surface. The origin is at the bottom-left,
- which makes the value suitable for passing to \c{glViewport()}:
-
- \code
- QRect viewport = surface->viewportGL();
- glViewport(viewport.x(), viewport.y(), viewport.width(), viewport.height());
- \endcode
-
- Normally the viewport rectangle is the full extent of the device(),
- but it could be smaller if the application only wishes to draw
- into a subpart of the device(). An example would be rendering left
- and right stereo eye images into the two halves of a QGLWidget.
- The eye surfaces would typically be instances of QGLSubsurface.
-
- \sa viewportRect(), device()
-*/
-
-/*!
- Returns the aspect ratio of viewportGL() after correcting for the
- DPI of device().
-
- The return value is used to correct perspective and orthographic
- projections for the aspect ratio of the drawing surface. Subclasses
- may override this function to adjust the return value if the DPI of
- device() is not sufficient to determine the aspect ratio.
-*/
-qreal QGLAbstractSurface::aspectRatio() const
-{
- // Get the size of the current viewport.
- QSize size = viewportGL().size();
- if (size.width() == 0 || size.height() == 0 ||
- size.width() == size.height())
- return 1.0f;
-
- // Use the device's DPI setting to determine the pixel aspect ratio.
- QPaintDevice *device = this->device();
- int dpiX = device->logicalDpiX();
- int dpiY = device->logicalDpiY();
- if (dpiX <= 0 || dpiY <= 0)
- dpiX = dpiY = 1;
-
- // Return the final aspect ratio based on viewport and pixel size.
- return ((qreal)(size.width() * dpiY)) / ((qreal)(size.height() * dpiX));
-}
-
-/*!
- Switches from this surface to \a nextSurface by calling deactivate()
- on this surface and activate() on \a nextSurface.
-
- Returns true if \a nextSurface was activated, or false otherwise.
- If \a nextSurface could not be activated, then this surface will
- remain activated.
-
- \sa activate(), deactivate()
-*/
-bool QGLAbstractSurface::switchTo(QGLAbstractSurface *nextSurface)
-{
- if (nextSurface) {
- deactivate(nextSurface);
- if (nextSurface->activate(this))
- return true;
- activate();
- return false;
- } else {
- deactivate();
- return true;
- }
-}
-
-/*!
- Creates an OpenGL drawing surface for the specified paint \a device.
- Returns null if it is not possible to create a surface for \a device.
-
- \sa createSurfaceForContext()
-*/
-QGLAbstractSurface *QGLAbstractSurface::createSurfaceForDevice
- (QPaintDevice *device)
-{
- Q_ASSERT(device);
- switch (device->devType()) {
- case QInternal::Widget: {
- QGLWidget *glw = qobject_cast<QGLWidget *>
- (static_cast<QWidget *>(device));
- if (glw)
- return new QGLWidgetSurface(glw);
- else
- return 0;
- }
- case QInternal::Pbuffer:
- return new QGLPixelBufferSurface(static_cast<QGLPixelBuffer *>(device));
- case QInternal::FramebufferObject:
- return new QGLFramebufferObjectSurface
- (static_cast<QGLFramebufferObject *>(device));
- default:
- return 0;
- }
-}
-
-/*!
- Creates an OpenGL drawing surface for the paint device
- underlying \a context. If the paint device is not recognized,
- then a generic surface will be created that makes \a context
- current when the surface is activated.
-
- \sa createSurfaceForDevice()
-*/
-QGLAbstractSurface *QGLAbstractSurface::createSurfaceForContext
- (const QGLContext *context)
-{
- Q_ASSERT(context);
- QGLAbstractSurface *surface = createSurfaceForDevice(context->device());
- if (!surface)
- surface = new QGLContextSurface(context);
- return surface;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglabstractsurface.h b/src/gui/extern/Qt3D/surfaces/qglabstractsurface.h
deleted file mode 100644
index 11f11ab1518704e020f3856609facb43c00dd25c..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglabstractsurface.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLABSTRACTSURFACE_H
-#define QGLABSTRACTSURFACE_H
-
-#include "qt3dglobal.h"
-#include <QtOpenGL/qgl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLAbstractSurface
-{
-public:
- virtual ~QGLAbstractSurface();
-
- enum SurfaceType
- {
- Widget,
- FramebufferObject,
- PixelBuffer,
- Subsurface,
- User = 1000
- };
-
- int surfaceType() const { return m_type; }
-
- virtual QPaintDevice *device() const = 0;
- virtual bool activate(QGLAbstractSurface *prevSurface = 0) = 0;
- virtual void deactivate(QGLAbstractSurface *nextSurface = 0) = 0;
- virtual QRect viewportGL() const = 0;
- QRect viewportRect() const;
- virtual qreal aspectRatio() const;
-
- bool switchTo(QGLAbstractSurface *nextSurface);
-
- static QGLAbstractSurface *createSurfaceForDevice(QPaintDevice *device);
- static QGLAbstractSurface *createSurfaceForContext(const QGLContext *context);
-
-protected:
- QGLAbstractSurface(int surfaceType) : m_type(surfaceType) {}
-
-private:
- int m_type;
-
- Q_DISABLE_COPY(QGLAbstractSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglcontextsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglcontextsurface.cpp
deleted file mode 100644
index 7e3e0b9195f2a73d130d888ba742f426cfe6c0c1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglcontextsurface.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcontextsurface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QPaintDevice *QGLContextSurface::device() const
-{
- return m_context->device();
-}
-
-bool QGLContextSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_UNUSED(prevSurface);
- if (QGLContext::currentContext() != m_context)
- const_cast<QGLContext *>(m_context)->makeCurrent();
- return true;
-}
-
-void QGLContextSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- Q_UNUSED(nextSurface);
-}
-
-QRect QGLContextSurface::viewportGL() const
-{
- QPaintDevice *device = m_context->device();
- return QRect(0, 0, device->width(), device->height());
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglcontextsurface_p.h b/src/gui/extern/Qt3D/surfaces/qglcontextsurface_p.h
deleted file mode 100644
index 9b98cc1c92b9709a6ca22648522a058d59233e9a..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglcontextsurface_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCONTEXTSURFACE_P_H
-#define QGLCONTEXTSURFACE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLContextSurface : public QGLAbstractSurface
-{
-public:
- explicit QGLContextSurface(const QGLContext *context)
- : QGLAbstractSurface(502)
- , m_context(context) {}
- ~QGLContextSurface() {}
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface);
- void deactivate(QGLAbstractSurface *nextSurface);
- QRect viewportGL() const;
-
-private:
- const QGLContext *m_context;
-
- Q_DISABLE_COPY(QGLContextSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface.cpp b/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface.cpp
deleted file mode 100644
index 6e80fad7f1ddc67c342188ea65ee25398aba3406..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgldrawbuffersurface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QPaintDevice *QGLDrawBufferSurface::device() const
-{
- return m_surface->device();
-}
-
-bool QGLDrawBufferSurface::activate(QGLAbstractSurface *prevSurface)
-{
- if (!m_surface->activate(prevSurface))
- return false;
-#if defined(GL_BACK_LEFT) && defined(GL_BACK_RIGHT)
- glDrawBuffer(m_buffer);
-#endif
- return true;
-}
-
-void QGLDrawBufferSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- m_surface->deactivate(nextSurface);
-}
-
-QRect QGLDrawBufferSurface::viewportGL() const
-{
- return m_surface->viewportGL();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface_p.h b/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface_p.h
deleted file mode 100644
index a6ac58de84db172c47e67802ad973ffecad00740..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qgldrawbuffersurface_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLDRAWBUFFERSURFACE_P_H
-#define QGLDRAWBUFFERSURFACE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLDrawBufferSurface : public QGLAbstractSurface
-{
-public:
- QGLDrawBufferSurface(QGLAbstractSurface *surface, GLenum buffer)
- : QGLAbstractSurface(500)
- , m_surface(surface), m_buffer(buffer) {}
- ~QGLDrawBufferSurface() {}
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface);
- void deactivate(QGLAbstractSurface *nextSurface);
- QRect viewportGL() const;
-
-private:
- QGLAbstractSurface *m_surface;
- GLenum m_buffer;
-
- Q_DISABLE_COPY(QGLDrawBufferSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.cpp
deleted file mode 100644
index 3ea256443fe360d34a95f1d6e710ad183ce3dc0e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglframebufferobjectsurface.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLFramebufferObjectSurface
- \brief The QGLFramebufferObjectSurface class represents a framebuffer object that is being used as an OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-*/
-
-class QGLFramebufferObjectSurfacePrivate
-{
-public:
- QGLFramebufferObjectSurfacePrivate
- (QGLFramebufferObject *fbo, const QGLContext *ctx)
- : framebufferObject(fbo), context(ctx) {}
-
- QGLFramebufferObject *framebufferObject;
- const QGLContext *context;
-};
-
-/*!
- Constructs a default framebuffer object surface. This constructor
- should be followed by a call to setFramebufferObject().
-*/
-QGLFramebufferObjectSurface::QGLFramebufferObjectSurface()
- : QGLAbstractSurface(QGLAbstractSurface::FramebufferObject)
- , d_ptr(new QGLFramebufferObjectSurfacePrivate(0, 0))
-{
-}
-
-/*!
- Constructs a framebuffer object surface for \a fbo and \a context.
- If \a context is null, then the framebuffer will be bound to the
- current context when activate() is called.
-*/
-QGLFramebufferObjectSurface::QGLFramebufferObjectSurface
- (QGLFramebufferObject *fbo, const QGLContext *context)
- : QGLAbstractSurface(QGLAbstractSurface::FramebufferObject)
- , d_ptr(new QGLFramebufferObjectSurfacePrivate(fbo, context))
-{
-}
-
-/*!
- Destroys this framebuffer object surface.
-*/
-QGLFramebufferObjectSurface::~QGLFramebufferObjectSurface()
-{
-}
-
-/*!
- Returns the context that owns framebufferObject(); or null
- if the framebufferObject() should be assumed to be owned by
- the current context when activate() is called.
-
- \sa setContext(), framebufferObject()
-*/
-const QGLContext *QGLFramebufferObjectSurface::context() const
-{
- Q_D(const QGLFramebufferObjectSurface);
- return d->context;
-}
-
-/*!
- Sets the \a context that owns framebufferObject().
-
- When activate() is called, it checks to see if \a context is sharing
- with the current context. If it is, then the framebufferObject()
- is directly bound to the current context. Otherwise, \a context
- is made current and then framebufferObject() is bound.
-
- If \a context is null, then framebufferObject() will be bound
- to whatever the current context is when activate() is called.
-
- \sa context()
-*/
-void QGLFramebufferObjectSurface::setContext(const QGLContext *context)
-{
- Q_D(QGLFramebufferObjectSurface);
- d->context = context;
-}
-
-/*!
- Returns the framebuffer object for this surface, or null if
- it has not been set yet.
-
- \sa setFramebufferObject(), context()
-*/
-QGLFramebufferObject *QGLFramebufferObjectSurface::framebufferObject() const
-{
- Q_D(const QGLFramebufferObjectSurface);
- return d->framebufferObject;
-}
-
-/*!
- Sets the framebuffer object for this surface to \a fbo.
-
- \sa framebufferObject()
-*/
-void QGLFramebufferObjectSurface::setFramebufferObject
- (QGLFramebufferObject *fbo)
-{
- Q_D(QGLFramebufferObjectSurface);
- d->framebufferObject = fbo;
-}
-
-/*!
- \reimp
-*/
-QPaintDevice *QGLFramebufferObjectSurface::device() const
-{
- Q_D(const QGLFramebufferObjectSurface);
- return d->framebufferObject;
-}
-
-/*!
- \reimp
-*/
-bool QGLFramebufferObjectSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_UNUSED(prevSurface);
- Q_D(QGLFramebufferObjectSurface);
- if (d->context) {
- if (!QGLContext::areSharing(QGLContext::currentContext(), d->context))
- const_cast<QGLContext *>(d->context)->makeCurrent();
- } else {
- // If we don't have a current context, then something is wrong.
- Q_ASSERT(QGLContext::currentContext());
- }
- if (d->framebufferObject)
- return d->framebufferObject->bind();
- return false;
-}
-
-/*!
- \reimp
-*/
-void QGLFramebufferObjectSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- Q_D(QGLFramebufferObjectSurface);
- if (d->framebufferObject) {
- if (nextSurface && nextSurface->surfaceType() == FramebufferObject) {
- // If we are about to switch to another fbo that is on the
- // same context, then don't bother doing the release().
- // This saves an unnecessary glBindFramebuffer(0) call.
- if (static_cast<QGLFramebufferObjectSurface *>(nextSurface)
- ->context() == d->context)
- return;
- }
- d->framebufferObject->release();
- }
-}
-
-/*!
- \reimp
-*/
-QRect QGLFramebufferObjectSurface::viewportGL() const
-{
- Q_D(const QGLFramebufferObjectSurface);
- if (d->framebufferObject)
- return QRect(QPoint(0, 0), d->framebufferObject->size());
- else
- return QRect();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.h b/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.h
deleted file mode 100644
index 553902a602a3796a12f9ba0eee85a65dd8457617..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglframebufferobjectsurface.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLFRAMEBUFFEROBJECTSURFACE_H
-#define QGLFRAMEBUFFEROBJECTSURFACE_H
-
-#include "qglabstractsurface.h"
-#include <QtOpenGL/qglframebufferobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLFramebufferObjectSurfacePrivate;
-
-class Q_QT3D_EXPORT QGLFramebufferObjectSurface : public QGLAbstractSurface
-{
-public:
- QGLFramebufferObjectSurface();
- explicit QGLFramebufferObjectSurface
- (QGLFramebufferObject *fbo, const QGLContext *context = 0);
- ~QGLFramebufferObjectSurface();
-
- const QGLContext *context() const;
- void setContext(const QGLContext *context);
-
- QGLFramebufferObject *framebufferObject() const;
- void setFramebufferObject(QGLFramebufferObject *fbo);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface = 0);
- void deactivate(QGLAbstractSurface *nextSurface = 0);
- QRect viewportGL() const;
-
-private:
- QScopedPointer<QGLFramebufferObjectSurfacePrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLFramebufferObjectSurface)
- Q_DISABLE_COPY(QGLFramebufferObjectSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglmaskedsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglmaskedsurface.cpp
deleted file mode 100644
index 8bcba2f1174720156119b9ce9e5cea01373541cf..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglmaskedsurface.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglmaskedsurface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLMaskedSurface
- \brief The QGLMaskedSurface class represents a masked copy of another OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
- \internal
-
- Masked surfaces are typically used to render red-cyan anaglyph images
- into an underlying surface(). For the left eye image, the mask()
- is set to RedMask | AlphaMask. Then for the right eye image, the mask()
- is set to GreenMask | BlueMask.
-*/
-
-/*!
- \enum QGLMaskedSurface::BufferMaskBit
- This enum defines the channels to mask with QGLMaskedSurface.
-
- \value RedMask Allow the red channel to be written to the color buffer.
- \value GreenMask Allow the green channel to be written to the color buffer.
- \value BlueMask Allow the blue channel to be written to the color buffer.
- \value AlphaMask Allow the alpha channel to be written to the color buffer.
-*/
-
-class QGLMaskedSurfacePrivate
-{
-public:
- QGLMaskedSurfacePrivate
- (QGLAbstractSurface *surf = 0,
- QGLMaskedSurface::BufferMask msk = QGLMaskedSurface::RedMask |
- QGLMaskedSurface::GreenMask |
- QGLMaskedSurface::BlueMask |
- QGLMaskedSurface::AlphaMask)
- : surface(surf), mask(msk) {}
-
- QGLAbstractSurface *surface;
- QGLMaskedSurface::BufferMask mask;
-};
-
-#define MaskedSurfaceType 501
-
-/*!
- Constructs a masked OpenGL drawing surface with surface() initially
- set to null and mask() initially set to allow all channels to be
- written to the color buffer.
-*/
-QGLMaskedSurface::QGLMaskedSurface()
- : QGLAbstractSurface(MaskedSurfaceType)
- , d_ptr(new QGLMaskedSurfacePrivate)
-{
-}
-
-/*!
- Constructs a masked OpenGL drawing surface that applies \a mask
- to \a surface when activate() is called.
-*/
-QGLMaskedSurface::QGLMaskedSurface
- (QGLAbstractSurface *surface, QGLMaskedSurface::BufferMask mask)
- : QGLAbstractSurface(MaskedSurfaceType)
- , d_ptr(new QGLMaskedSurfacePrivate(surface, mask))
-{
-}
-
-/*!
- Destroys this masked OpenGL drawing surface.
-*/
-QGLMaskedSurface::~QGLMaskedSurface()
-{
-}
-
-/*!
- Returns the underlying surface that mask() will be applied to
- when activate() is called.
-
- \sa setSurface(), mask()
-*/
-QGLAbstractSurface *QGLMaskedSurface::surface() const
-{
- Q_D(const QGLMaskedSurface);
- return d->surface;
-}
-
-/*!
- Sets the underlying \a surface that mask() will be applied to
- when activate() is called.
-
- \sa surface(), setMask()
-*/
-void QGLMaskedSurface::setSurface(QGLAbstractSurface *surface)
-{
- Q_D(QGLMaskedSurface);
- d->surface = surface;
-}
-
-/*!
- Returns the color mask to apply to surface() when activate()
- is called.
-
- \sa setMask(), surface()
-*/
-QGLMaskedSurface::BufferMask QGLMaskedSurface::mask() const
-{
- Q_D(const QGLMaskedSurface);
- return d->mask;
-}
-
-/*!
- Sets the color \a mask to apply to surface() when activate()
- is called.
-
- \sa mask(), setSurface()
-*/
-void QGLMaskedSurface::setMask(QGLMaskedSurface::BufferMask mask)
-{
- Q_D(QGLMaskedSurface);
- d->mask = mask;
-}
-
-/*!
- \reimp
-*/
-QPaintDevice *QGLMaskedSurface::device() const
-{
- Q_D(const QGLMaskedSurface);
- return d->surface ? d->surface->device() : 0;
-}
-
-/*!
- \reimp
-*/
-bool QGLMaskedSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_D(const QGLMaskedSurface);
- if (!d->surface || !d->surface->activate(prevSurface))
- return false;
- glColorMask((d->mask & RedMask) != 0, (d->mask & GreenMask) != 0,
- (d->mask & BlueMask) != 0, (d->mask & AlphaMask) != 0);
- return true;
-}
-
-/*!
- \reimp
-*/
-void QGLMaskedSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- Q_D(QGLMaskedSurface);
- if (d->surface)
- d->surface->deactivate(nextSurface);
- if (nextSurface && nextSurface->surfaceType() == MaskedSurfaceType) {
- // If we are about to switch to another masked surface for
- // the same underlying surface, then don't bother calling
- // glColorMask() for this one.
- QGLMaskedSurface *next = static_cast<QGLMaskedSurface *>(nextSurface);
- if (d->surface == next->surface())
- return;
- }
- glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-/*!
- \reimp
-*/
-QRect QGLMaskedSurface::viewportGL() const
-{
- Q_D(const QGLMaskedSurface);
- return d->surface ? d->surface->viewportGL() : QRect();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglmaskedsurface_p.h b/src/gui/extern/Qt3D/surfaces/qglmaskedsurface_p.h
deleted file mode 100644
index cd284407cb52ad13c12e0a3e4daec11c188c508e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglmaskedsurface_p.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLMASKEDSURFACE_H
-#define QGLMASKEDSURFACE_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLMaskedSurfacePrivate;
-
-class QGLMaskedSurface : public QGLAbstractSurface
-{
-public:
- enum BufferMaskBit
- {
- RedMask = 0x0001,
- GreenMask = 0x0002,
- BlueMask = 0x0004,
- AlphaMask = 0x0008
- };
- Q_DECLARE_FLAGS(BufferMask, BufferMaskBit)
-
- QGLMaskedSurface();
- QGLMaskedSurface
- (QGLAbstractSurface *surface, QGLMaskedSurface::BufferMask mask);
- ~QGLMaskedSurface();
-
- QGLAbstractSurface *surface() const;
- void setSurface(QGLAbstractSurface *surface);
-
- QGLMaskedSurface::BufferMask mask() const;
- void setMask(QGLMaskedSurface::BufferMask mask);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface = 0);
- void deactivate(QGLAbstractSurface *nextSurface = 0);
- QRect viewportGL() const;
-
-private:
- QScopedPointer<QGLMaskedSurfacePrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLMaskedSurface)
- Q_DISABLE_COPY(QGLMaskedSurface)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLMaskedSurface::BufferMask)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglpaintersurface.cpp b/src/gui/extern/Qt3D/surfaces/qglpaintersurface.cpp
deleted file mode 100644
index d15757d60abd1bcd21bb2774d49ed90c5c0809b0..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglpaintersurface.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglpaintersurface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QPaintDevice *QGLPainterSurface::device() const
-{
- return m_painter->device();
-}
-
-bool QGLPainterSurface::activate(QGLAbstractSurface *prevSurface)
-{
- if (m_painterContext != QGLContext::currentContext())
- const_cast<QGLContext *>(m_painterContext)->makeCurrent();
- if (!prevSurface)
- m_painter->beginNativePainting();
- return true;
-}
-
-void QGLPainterSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- if (!nextSurface)
- m_painter->endNativePainting();
-}
-
-QRect QGLPainterSurface::viewportGL() const
-{
- QPaintDevice *device = m_painter->device();
- return QRect(0, 0, device->width(), device->height());
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglpaintersurface_p.h b/src/gui/extern/Qt3D/surfaces/qglpaintersurface_p.h
deleted file mode 100644
index 39c28486ee765d564a3425eeb6565e14919791fe..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglpaintersurface_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPAINTERSURFACE_P_H
-#define QGLPAINTERSURFACE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLPainterSurface : public QGLAbstractSurface
-{
-public:
- explicit QGLPainterSurface(QPainter *painter)
- : QGLAbstractSurface(503)
- , m_painter(painter), m_painterContext(QGLContext::currentContext()) {}
- ~QGLPainterSurface() {}
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface);
- void deactivate(QGLAbstractSurface *nextSurface);
- QRect viewportGL() const;
-
-private:
- QPainter *m_painter;
- const QGLContext *m_painterContext;
-
- Q_DISABLE_COPY(QGLPainterSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.cpp b/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.cpp
deleted file mode 100644
index deb6a3a6488e5bd57e6b40126af92a230763e37f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglpixelbuffersurface.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLPixelBufferSurface
- \brief The QGLPixelBufferSurface class represents a pixel buffer that is being used as an OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-*/
-
-/*!
- Constructs a default pixel buffer surface. This constructor
- should be followed by a call to setPixelBuffer().
-*/
-QGLPixelBufferSurface::QGLPixelBufferSurface()
- : QGLAbstractSurface(QGLAbstractSurface::PixelBuffer)
- , m_pbuffer(0)
-{
-}
-
-/*!
- Constructs a pixel buffer surface for \a pbuffer.
-*/
-QGLPixelBufferSurface::QGLPixelBufferSurface(QGLPixelBuffer *pbuffer)
- : QGLAbstractSurface(QGLAbstractSurface::PixelBuffer)
- , m_pbuffer(pbuffer)
-{
-}
-
-/*!
- Destroys this pixel buffer surface.
-*/
-QGLPixelBufferSurface::~QGLPixelBufferSurface()
-{
-}
-
-/*!
- Returns the pixel buffer for this surface, or null if
- it has not been set yet.
-
- \sa setPixelBuffer()
-*/
-QGLPixelBuffer *QGLPixelBufferSurface::pixelBuffer() const
-{
- return m_pbuffer;
-}
-
-/*!
- Sets the framebuffer object for this surface to \a pbuffer.
-
- \sa pixelBuffer()
-*/
-void QGLPixelBufferSurface::setPixelBuffer
- (QGLPixelBuffer *pbuffer)
-{
- m_pbuffer = pbuffer;
-}
-
-/*!
- \reimp
-*/
-QPaintDevice *QGLPixelBufferSurface::device() const
-{
- return m_pbuffer;
-}
-
-/*!
- \reimp
-*/
-bool QGLPixelBufferSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_UNUSED(prevSurface);
- if (m_pbuffer)
- return m_pbuffer->makeCurrent();
- else
- return false;
-}
-
-/*!
- \reimp
-*/
-void QGLPixelBufferSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- // Nothing to do here - leave the context current.
- Q_UNUSED(nextSurface);
-}
-
-/*!
- \reimp
-*/
-QRect QGLPixelBufferSurface::viewportGL() const
-{
- if (m_pbuffer)
- return QRect(0, 0, m_pbuffer->width(), m_pbuffer->height());
- else
- return QRect();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.h b/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.h
deleted file mode 100644
index 1ad1effce723968d6d32691d31b27adbccfb1b58..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglpixelbuffersurface.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLPIXELBUFFERSURFACE_H
-#define QGLPIXELBUFFERSURFACE_H
-
-#include "qglabstractsurface.h"
-#include <QtOpenGL/qglpixelbuffer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QGLPixelBufferSurface : public QGLAbstractSurface
-{
-public:
- QGLPixelBufferSurface();
- explicit QGLPixelBufferSurface(QGLPixelBuffer *pbuffer);
- ~QGLPixelBufferSurface();
-
- QGLPixelBuffer *pixelBuffer() const;
- void setPixelBuffer(QGLPixelBuffer *pbuffer);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface = 0);
- void deactivate(QGLAbstractSurface *nextSurface = 0);
- QRect viewportGL() const;
-
-private:
- QGLPixelBuffer *m_pbuffer;
-
- Q_DISABLE_COPY(QGLPixelBufferSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglsubsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglsubsurface.cpp
deleted file mode 100644
index c981a62c7a9ae2bf56f698503c5c515d5f0b10ff..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglsubsurface.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglsubsurface.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLSubsurface
- \brief The QGLSubsurface class represents a sub-surface of another OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-*/
-
-class QGLSubsurfacePrivate
-{
-public:
- QGLSubsurfacePrivate() : surface(0) {}
- QGLSubsurfacePrivate(QGLAbstractSurface *surf, const QRect &rgn)
- : surface(surf), region(rgn) {}
-
- QGLAbstractSurface *surface;
- QRect region;
-};
-
-/*!
- Constructs a new subsurface. This constructor should be followed
- by calls to setSurface() and setRegion().
-*/
-QGLSubsurface::QGLSubsurface()
- : QGLAbstractSurface(QGLAbstractSurface::Subsurface)
- , d_ptr(new QGLSubsurfacePrivate)
-{
-}
-
-/*!
- Constructs a new subsurface that occupies \a region within
- \a surface. The \a region has its origin at the top-left
- of \a surface.
-*/
-QGLSubsurface::QGLSubsurface
- (QGLAbstractSurface *surface, const QRect ®ion)
- : QGLAbstractSurface(QGLAbstractSurface::Subsurface)
- , d_ptr(new QGLSubsurfacePrivate(surface, region))
-{
-}
-
-/*!
- Destroys this subsurface.
-*/
-QGLSubsurface::~QGLSubsurface()
-{
-}
-
-/*!
- Returns the surface behind this subsurface, or null if the
- surface has not been set.
-
- \sa setSurface(), region()
-*/
-QGLAbstractSurface *QGLSubsurface::surface() const
-{
- Q_D(const QGLSubsurface);
- return d->surface;
-}
-
-/*!
- Sets the \a surface behind this subsurface.
-
- \sa surface(), setRegion()
-*/
-void QGLSubsurface::setSurface(QGLAbstractSurface *surface)
-{
- Q_D(QGLSubsurface);
- d->surface = surface;
-}
-
-/*!
- Returns the region within surface() that is occupied by this
- subsurface, relative to the viewportRect() of surface().
- The origin is at the top-left of surface().
-
- \sa setRegion(), surface()
-*/
-QRect QGLSubsurface::region() const
-{
- Q_D(const QGLSubsurface);
- return d->region;
-}
-
-/*!
- Sets the \a region within surface() that is occupied by this
- subsurface, relative to the viewportRect() of surface().
- The origin is at the top-left of surface().
-
- \sa region(), setSurface()
-*/
-void QGLSubsurface::setRegion(const QRect ®ion)
-{
- Q_D(QGLSubsurface);
- d->region = region;
-}
-
-/*!
- \reimp
-*/
-QPaintDevice *QGLSubsurface::device() const
-{
- Q_D(const QGLSubsurface);
- if (d->surface)
- return d->surface->device();
- else
- return 0;
-}
-
-/*!
- \reimp
-*/
-bool QGLSubsurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_D(QGLSubsurface);
- if (d->surface)
- return d->surface->activate(prevSurface);
- else
- return false;
-}
-
-/*!
- \reimp
-*/
-void QGLSubsurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- Q_D(QGLSubsurface);
- if (d->surface)
- d->surface->deactivate(nextSurface);
-}
-
-/*!
- \reimp
-*/
-QRect QGLSubsurface::viewportGL() const
-{
- Q_D(const QGLSubsurface);
- if (d->surface) {
- // The underlying surface's viewportGL() has its origin
- // at the bottom-left, whereas d->region has its origin
- // at the top-left. Flip the sub-region and adjust.
- QRect rect = d->surface->viewportGL();
- return QRect(rect.x() + d->region.x(),
- rect.y() + rect.height() -
- (d->region.y() + d->region.height()),
- d->region.width(), d->region.height());
- } else {
- // Don't know the actual height of the surrounding surface,
- // so the best we can do is assume the region is bottom-aligned.
- return QRect(d->region.x(), 0, d->region.width(), d->region.height());
- }
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglsubsurface.h b/src/gui/extern/Qt3D/surfaces/qglsubsurface.h
deleted file mode 100644
index 91fa85f272c20d02c18ab9f8f8782035d7017f7d..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglsubsurface.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSUBSURFACE_H
-#define QGLSUBSURFACE_H
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLSubsurfacePrivate;
-
-class Q_QT3D_EXPORT QGLSubsurface : public QGLAbstractSurface
-{
-public:
- QGLSubsurface();
- QGLSubsurface(QGLAbstractSurface *surface, const QRect ®ion);
- ~QGLSubsurface();
-
- QGLAbstractSurface *surface() const;
- void setSurface(QGLAbstractSurface *subSurface);
-
- QRect region() const;
- void setRegion(const QRect ®ion);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface = 0);
- void deactivate(QGLAbstractSurface *nextSurface = 0);
- QRect viewportGL() const;
-
-private:
- QScopedPointer<QGLSubsurfacePrivate> d_ptr;
-
- Q_DECLARE_PRIVATE(QGLSubsurface)
- Q_DISABLE_COPY(QGLSubsurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.cpp b/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.cpp
deleted file mode 100644
index 2558e550ef10b08455bfb2071ef2bea20d1a1ac5..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglwidgetsurface.h"
-#include <QtGui/qpainter.h>
-#include <QtGui/qpaintengine.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLWidgetSurface
- \brief The QGLWidgetSurface class represents a QGLWidget that is begin used as an OpenGL drawing surface.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::painting
-*/
-
-/*!
- Constructs a widget surface. This constructor should be followed
- by a call to setWidget().
-*/
-QGLWidgetSurface::QGLWidgetSurface()
- : QGLAbstractSurface(QGLAbstractSurface::Widget)
- , m_widget(0)
-{
-}
-
-/*!
- Constructs a widget surface for \a widget.
-*/
-QGLWidgetSurface::QGLWidgetSurface(QGLWidget *widget)
- : QGLAbstractSurface(QGLAbstractSurface::Widget)
- , m_widget(widget)
-{
-}
-
-/*!
- Destroys this widget surface.
-*/
-QGLWidgetSurface::~QGLWidgetSurface()
-{
-}
-
-/*!
- Returns the widget that is underlying this surface.
-
- \sa setWidget()
-*/
-QGLWidget *QGLWidgetSurface::widget() const
-{
- return m_widget;
-}
-
-/*!
- Sets the \a widget that is underlying this surface.
-
- \sa widget()
-*/
-void QGLWidgetSurface::setWidget(QGLWidget *widget)
-{
- m_widget = widget;
-}
-
-/*!
- \reimp
-*/
-QPaintDevice *QGLWidgetSurface::device() const
-{
- return m_widget;
-}
-
-/*!
- \reimp
-*/
-bool QGLWidgetSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_UNUSED(prevSurface);
- if (m_widget) {
- const QGLContext *context = m_widget->context();
- if (QGLContext::currentContext() != context)
- const_cast<QGLContext *>(context)->makeCurrent();
- return true;
- } else {
- return false;
- }
-}
-
-/*!
- \reimp
-*/
-void QGLWidgetSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- // Nothing to do here - leave the context current.
- Q_UNUSED(nextSurface);
-}
-
-/*!
- \reimp
-*/
-QRect QGLWidgetSurface::viewportGL() const
-{
- if (m_widget)
- return m_widget->rect(); // Origin assumed to be (0, 0).
- else
- return QRect();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.h b/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.h
deleted file mode 100644
index 2a9ef7f33322ecb2197c03035a3b578496310d1e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/surfaces/qglwidgetsurface.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLWIDGETSURFACE_H
-#define QGLWIDGETSURFACE_H
-
-#include "qglabstractsurface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLWidgetSurfacePrivate;
-
-class Q_QT3D_EXPORT QGLWidgetSurface : public QGLAbstractSurface
-{
-public:
- QGLWidgetSurface();
- explicit QGLWidgetSurface(QGLWidget *widget);
- ~QGLWidgetSurface();
-
- QGLWidget *widget() const;
- void setWidget(QGLWidget *widget);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface = 0);
- void deactivate(QGLAbstractSurface *nextSurface = 0);
- QRect viewportGL() const;
-
-private:
- QGLWidget *m_widget;
-
- Q_DISABLE_COPY(QGLWidgetSurface)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/CMakeLists.txt b/src/gui/extern/Qt3D/textures/CMakeLists.txt
deleted file mode 100644
index 30977fdce7324f8dd02f157dc7e41fb4c51d8471..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-target_sources( gui
- PRIVATE
- qareaallocator.cpp
- qgltexture2d.h
- qareaallocator.h
- qgltexturecube.cpp
- qgltexturecube.h
- qgltextureutils_p.h
- qgltexture2d_p.h
- qgltextureutils.cpp
- qgltexture2d.cpp
- qglsharedresource.cpp
- qglsharedresource_p.h
- )
diff --git a/src/gui/extern/Qt3D/textures/qareaallocator.cpp b/src/gui/extern/Qt3D/textures/qareaallocator.cpp
deleted file mode 100644
index 9dca9f7c40ebff10d4b0a0b9ea1aa45bd0b34644..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qareaallocator.cpp
+++ /dev/null
@@ -1,877 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qareaallocator.h"
-#include "qglnamespace.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QAreaAllocator
- \brief The QAreaAllocator class provides facilities for allocating sub-regions from a rectangular image.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
- \internal
-
- Performance on a system can sometimes be improved by storing
- multiple small images in a single large image. This reduces
- memory allocation overhead and GPU state switching costs.
-
- QAreaAllocator and its subclasses implement standard strategies
- for sub-region allocation in images without tying those strategies
- to specific technologies such as raster, OpenGL, etc.
-
- Allocations are managed in a virtual two-dimensional space.
- The caller performs the actual texture upload based on the sub-region
- that allocate() returns.
-
- The caller can return a sub-region to the allocation pool with
- release(). Note that not all strategies support release().
-
- \sa QSimpleAreaAllocator, QGeneralAreaAllocator, QUniformAreaAllocator
-*/
-
-/*!
- \class QSimpleAreaAllocator
- \brief The QSimpleAreaAllocator class provides a simple allocation policy for simple-sized sub-allocations.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
- \internal
-
- QSimpleAreaAllocator uses a trivial allocation strategy whereby
- sub-regions are allocated in rows, with a new row started each
- time the previous row fills up. Space is never reclaimed by
- release().
-
- This allocator is suitable for use when the allocations will all
- be of a similar size and all regions will be discarded at
- the same time when the allocator is destroyed. An example would
- be a font glyph manager.
-
- \sa QAreaAllocator, QGeneralAreaAllocator
-*/
-
-/*!
- \class QGeneralAreaAllocator
- \brief The QGeneralAreaAllocator class provides a general allocation policy for sub-regions in an image.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
- \internal
-
- QGeneralAreaAllocator can handle arbitrary-sized allocations up to
- size(), in any order, and can release() previously allocated regions.
- It uses a binary subdivision algorithm on the image, which may result
- in fragmentation under heavy load.
-
- While technically any size sub-region up to size() can be allocated,
- once subdivision begins, the sizes that can be allocated will reduce
- substantially. It is recommended that incoming requests be size() / 4
- or less for best performance.
-
- If the sub-region sizes to be allocated are very similar, and release()
- is not necessary, then QSimpleAreaAllocator may work better than
- QGeneralAreaAllocator. If the sizes are very similar, and
- release() is necessary, then QUniformAreaAllocator may work better
- than QGeneralAreaAllocator.
-
- \sa QAreaAllocator, QSimpleAreaAllocator, QUniformAreaAllocator
-*/
-
-/*!
- \class QUniformAreaAllocator
- \brief The QUniformAreaAllocator class provides an allocation policy for uniform-sized areas.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
- \internal
-
- QUniformAreaAllocator allocates any size up to uniformSize()
- by dividing size() up into a grid of uniformSize() areas.
- Areas can be deallocated with release() and returned to the pool.
-
- This allocator is suitable for use when the allocations will all
- be of a similar size. Unlike QSimpleAreaAllocator, this class
- can release allocations.
-
- \sa QAreaAllocator, QSimpleAreaAllocator, QGeneralAreaAllocator
-*/
-
-/*!
- \internal
-
- Constructs a new area allocator that is initially \a size pixels
- in size.
-
- \sa expand()
-*/
-QAreaAllocator::QAreaAllocator(const QSize &size)
- : m_size(size)
- , m_minAlloc(1, 1)
- , m_margin(0, 0)
-{
-}
-
-/*!
- \internal
-
- Destroys this area allocator.
-*/
-QAreaAllocator::~QAreaAllocator()
-{
-}
-
-/*!
- \fn QSize QAreaAllocator::size() const
- \internal
-
- Returns the current size of the area being used by this allocator.
-*/
-
-/*!
- \fn QSize QAreaAllocator::minimumAllocation() const
- \internal
-
- Returns the minimum allocation size in the x and y directions
- for areas returned by allocate(). The default is (1, 1).
-
- \sa setMinimumAllocation()
-*/
-
-/*!
- \fn void QAreaAllocator::setMinimumAllocation(const QSize &size)
- \internal
-
- Sets the minimum allocation \a size in the x and y directions
- for areas returned by allocate().
-
- For example, setting the minimum allocation to (8, 8) will force
- all allocations to be aligned on an 8-pixel boundary.
-
- \sa minimumAllocation()
-*/
-
-/*!
- \fn QSize QAreaAllocator::margin() const
- \internal
-
- Returns the margin that should be left between allocated items
- in the x and y directions. The default is (0, 0).
-
- This may be needed when using OpenGL textures because of
- rounding errors in the floating-point representation of
- texture co-ordinates. Leaving a small margin between allocations
- can help avoid adjacent images from bleeding into each other.
-
- \sa setMargin()
-*/
-
-/*!
- \fn void QAreaAllocator::setMargin(const QSize &margin)
- \internal
-
- Sets the \a margin that should be left between allocated items
- in the x and y directions.
-
- \sa margin()
-*/
-
-/*!
- \internal
-
- Expands this allocator to encompass the width and height of \a size.
- If the area is already larger, this function does nothing.
-
- The rectangles that were returned for previous allocations will
- remain valid.
-
- \sa expandBy()
-*/
-void QAreaAllocator::expand(const QSize &size)
-{
- int newWidth = qMax(m_size.width(), size.width());
- int newHeight = qMax(m_size.height(), size.height());
- m_size = QSize(newWidth, newHeight);
-}
-
-/*!
- \internal
-
- Expands this allocator by \a size pixels in the x and y directions.
-
- For example, expanding by (0, 128) will add 128 additional pixels
- of height but will leave the width unchanged.
-
- \sa expand()
-*/
-void QAreaAllocator::expandBy(const QSize &size)
-{
- expand(m_size + size);
-}
-
-/*!
- \fn QRect QAreaAllocator::allocate(const QSize &size)
- \internal
-
- Allocates \a size pixels from this allocator and returns the rectangle
- that should be used by the caller. Returns a null rectangle if
- this allocator does not have sufficient space to accommodate \a size.
-
- \sa release()
-*/
-
-/*!
- \internal
-
- Allocates and returns a list of rectangles corresponding to the
- elements of \a sizes. The returned list will have less elements
- than \a sizes if there is insufficient space to accommodate
- all of the allocation requests. The values that are in the returned
- list will be allocated and need to be passed to release() to
- deallocate them.
-
- The default implementation will call the subclass allocate() once
- for each size until all \a sizes have been allocated or an
- allocation fails. Subclasses may override this method to
- reorder the allocations for best-fit.
-
- \sa release()
-*/
-QList<QRect> QAreaAllocator::allocate(const QList<QSize> &sizes)
-{
- QList<QRect> rects;
- QRect rect;
- for (int index = 0; index < sizes.count(); ++index) {
- rect = allocate(sizes[index]);
- if (rect.isNull())
- break;
- rects.append(rect);
- }
- return rects;
-}
-
-/*!
- \internal
-
- Releases the space occupied by \a rect back to the allocator.
- The default implementation does nothing.
-
- The \a rect must have been returned by a previous call to allocate().
- Otherwise the behaviour is undefined.
-
- \sa allocate()
-*/
-void QAreaAllocator::release(const QRect &rect)
-{
- Q_UNUSED(rect);
-}
-
-/*!
- \internal
-
- Releases the space occupied by the members of \a rects back to
- the allocator. The default implementation calls release() for
- each rectangle in the list.
-
- The members of \a rects must have been returned by previous calls
- to allocate(). Otherwise the behaviour is undefined.
-
- \sa allocate()
-*/
-void QAreaAllocator::release(const QList<QRect> &rects)
-{
- for (int index = 0; index < rects.count(); ++index)
- release(rects[index]);
-}
-
-/*!
- \internal
-
- Returns a rough estimate of the number of bytes of overhead that
- are currently in use to store the house-keeping data structures
- for this area allocator. The default implementation returns zero.
-*/
-int QAreaAllocator::overhead() const
-{
- return 0;
-}
-
-/*!
- \internal
-
- Returns \a size, after rounding it up to account for
- minimumAllocation() and margin().
-
- This is a convenience function, provided for subclass overrides
- of allocate().
-
- \sa allocate()
-*/
-QSize QAreaAllocator::roundAllocation(const QSize &size) const
-{
- int width = size.width() + m_margin.width();
- int height = size.height() + m_margin.height();
- int extra = width % m_minAlloc.width();
- if (extra)
- width += m_minAlloc.width() - extra;
- extra = height % m_minAlloc.height();
- if (extra)
- height += m_minAlloc.height() - extra;
- return QSize(width, height);
-}
-
-/*!
- \internal
-
- Constructs a simple area allocator that is initially \a size pixels
- in size.
-*/
-QSimpleAreaAllocator::QSimpleAreaAllocator(const QSize &size)
- : QAreaAllocator(size)
- , m_row(0)
- , m_column(0)
- , m_rowHeight(0)
-{
-}
-
-/*!
- \internal
-
- Destroys this simple area allocator.
-*/
-QSimpleAreaAllocator::~QSimpleAreaAllocator()
-{
-}
-
-/*!
- \internal
-*/
-QRect QSimpleAreaAllocator::allocate(const QSize &size)
-{
- // Round up the allocation size to account for the margin and
- // minimum allocation parameters.
- QSize rounded = roundAllocation(size);
- int width = rounded.width();
- int height = rounded.height();
-
- // Bail out if the size is obviously too small or too big.
- if (width <= 0 || width > m_size.width())
- return QRect();
- if (height <= 0 || height > (m_size.height() - m_row))
- return QRect();
-
- // Do we need to place this allocation on a new row?
- int row = m_row;
- int column = m_column;
- int rowHeight = m_rowHeight;
- if ((column + width) > m_size.width()) {
- row += m_rowHeight;
- column = 0;
- rowHeight = 0;
- if (height > (m_size.height() - row))
- return QRect();
- }
-
- // Update the current allocation position.
- m_row = row;
- m_column = column + width;
- m_rowHeight = qMax(rowHeight, height);
-
- // Return the allocation, using the original size without rounding.
- return QRect(column, row, size.width(), size.height());
-}
-
-/*!
- \internal
-
- Constructs a general area allocator that is initially \a size pixels
- in size. The \a size will be rounded up to the next power of two,
- to simplify the internal allocation policy.
-
- This constructor sets minimumAllocation() to (8, 8) to reduce the
- housekeeping overhead of the internal data structures.
-*/
-QGeneralAreaAllocator::QGeneralAreaAllocator(const QSize &size)
- : QAreaAllocator(QGL::nextPowerOfTwo(size))
-{
- m_root = new Node();
- m_root->rect = QRect(0, 0, m_size.width(), m_size.height());
- m_root->largestFree = m_size;
- m_root->parent = 0;
- m_root->left = 0;
- m_root->right = 0;
- m_nodeCount = 1;
- setMinimumAllocation(QSize(8, 8));
-}
-
-/*!
- \internal
-
- Destroys this general area allocator.
-*/
-QGeneralAreaAllocator::~QGeneralAreaAllocator()
-{
- freeNode(m_root);
-}
-
-/*!
- \internal
-*/
-void QGeneralAreaAllocator::freeNode(Node *node)
-{
- if (node) {
- freeNode(node->left);
- freeNode(node->right);
- }
- delete node;
-}
-
-/*!
- \internal
-
- The \a size will be rounded up to the next power of two.
- Use size() to determine the actual size after expansion.
-*/
-void QGeneralAreaAllocator::expand(const QSize &size)
-{
- QAreaAllocator::expand(QGL::nextPowerOfTwo(size));
-
- if (m_root->rect.size() == m_size)
- return; // No change.
- if (!m_root->left && m_root->largestFree.width() > 0) {
- // No allocations have occurred, so just adjust the root size.
- m_root->rect = QRect(0, 0, m_size.width(), m_size.height());
- m_root->largestFree = m_size;
- return;
- }
-
- // Add extra nodes above the current root to expand the tree.
- Node *oldRoot = m_root;
- Split split;
- if (m_size.width() >= m_size.height())
- split = SplitOnX;
- else
- split = SplitOnY;
- while (m_root->rect.size() != m_size) {
- if (m_root->rect.width() == m_size.width())
- split = SplitOnY;
- else if (m_root->rect.height() == m_size.height())
- split = SplitOnX;
- Node *parent = new Node();
- Node *right = new Node();
- m_nodeCount += 2;
- m_root->parent = parent;
- parent->parent = 0;
- parent->left = m_root;
- parent->right = right;
- parent->largestFree = m_root->rect.size();
- right->parent = parent;
- right->left = 0;
- right->right = 0;
- right->largestFree = m_root->rect.size();
- if (split == SplitOnX) {
- parent->rect = QRect(m_root->rect.x(), m_root->rect.y(),
- m_root->rect.width() * 2,
- m_root->rect.height());
- right->rect = QRect(m_root->rect.x() + m_root->rect.width(),
- m_root->rect.y(),
- m_root->rect.width(), m_root->rect.height());
- } else {
- parent->rect = QRect(m_root->rect.x(), m_root->rect.y(),
- m_root->rect.width(),
- m_root->rect.height() * 2);
- right->rect = QRect(m_root->rect.x(),
- m_root->rect.y() + m_root->rect.width(),
- m_root->rect.width(), m_root->rect.height());
- }
- split = (split == SplitOnX ? SplitOnY : SplitOnX);
- m_root = parent;
- }
- updateLargestFree(oldRoot);
-}
-
-static inline bool fitsWithin(const QSize &size1, const QSize &size2)
-{
- return size1.width() <= size2.width() && size1.height() <= size2.height();
-}
-
-/*!
- \internal
-*/
-QRect QGeneralAreaAllocator::allocate(const QSize &size)
-{
- QSize rounded = roundAllocation(size);
- rounded = QGL::nextPowerOfTwo(rounded);
- if (rounded.width() <= 0 || rounded.width() > m_size.width() ||
- rounded.height() <= 0 || rounded.height() > m_size.height())
- return QRect();
- QPoint point = allocateFromNode(rounded, m_root);
- if (point.x() >= 0)
- return QRect(point, size);
- else
- return QRect();
-}
-
-/*!
- \internal
-*/
-QPoint QGeneralAreaAllocator::allocateFromNode(const QSize &size, Node *node)
-{
- // Find the best node to insert into, which should be
- // a node with the least amount of unused space that is
- // big enough to contain the requested size.
- while (node != 0) {
- // Go down a level and determine if the left or right
- // sub-tree contains the best chance of allocation.
- Node *left = node->left;
- Node *right = node->right;
- if (left && fitsWithin(size, left->largestFree)) {
- if (right && fitsWithin(size, right->largestFree)) {
- if (left->largestFree.width() < right->largestFree.width() ||
- left->largestFree.height() < right->largestFree.height()) {
- // The largestFree values may be a little oversized,
- // so try the left sub-tree and then the right sub-tree.
- QPoint point = allocateFromNode(size, left);
- if (point.x() >= 0)
- return point;
- else
- return allocateFromNode(size, right);
- } else {
- node = right;
- }
- } else {
- node = left;
- }
- } else if (right && fitsWithin(size, right->largestFree)) {
- node = right;
- } else if (left || right) {
- // Neither sub-node has enough space to allocate from.
- return QPoint(-1, -1);
- } else if (fitsWithin(size, node->largestFree)) {
- // Do we need to split this node into smaller pieces?
- Split split;
- if (fitsWithin(QSize(size.width() * 2, size.height() * 2),
- node->largestFree)) {
- // Split in either direction: choose the inverse of
- // the parent node's split direction to try to balance
- // out the wasted space as further subdivisions happen.
- if (node->parent &&
- node->parent->left->rect.x() ==
- node->parent->right->rect.x())
- split = SplitOnX;
- else if (node->parent)
- split = SplitOnY;
- else if (node->rect.width() >= node->rect.height())
- split = SplitOnX;
- else
- split = SplitOnY;
- } else if (fitsWithin(QSize(size.width() * 2, size.height()),
- node->largestFree)) {
- // Split along the X direction.
- split = SplitOnX;
- } else if (fitsWithin(QSize(size.width(), size.height() * 2),
- node->largestFree)) {
- // Split along the Y direction.
- split = SplitOnY;
- } else {
- // Cannot split further - allocate this node.
- node->largestFree = QSize(0, 0);
- updateLargestFree(node);
- return node->rect.topLeft();
- }
-
- // Split the node, then go around again using the left sub-tree.
- node = splitNode(node, split);
- } else {
- // Cannot possibly fit into this node.
- break;
- }
- }
- return QPoint(-1, -1);
-}
-
-/*!
- \internal
-*/
-QGeneralAreaAllocator::Node *QGeneralAreaAllocator::splitNode
- (Node *node, Split split)
-{
- Node *left = new Node();
- Node *right = new Node();
- m_nodeCount += 2;
- left->parent = node;
- left->left = 0;
- left->right = 0;
- right->parent = node;
- right->left = 0;
- right->right = 0;
- node->left = left;
- node->right = right;
- if (split == SplitOnX) {
- left->rect = QRect(node->rect.x(), node->rect.y(),
- node->rect.width() / 2,
- node->rect.height());
- right->rect = QRect(left->rect.right() + 1, node->rect.y(),
- node->rect.width() / 2,
- node->rect.height());
- } else {
- left->rect = QRect(node->rect.x(), node->rect.y(),
- node->rect.width(),
- node->rect.height() / 2);
- right->rect = QRect(node->rect.x(), left->rect.bottom() + 1,
- node->rect.width(),
- node->rect.height() / 2);
- }
- left->largestFree = left->rect.size();
- right->largestFree = right->rect.size();
- node->largestFree = right->largestFree;
- return left;
-}
-
-/*!
- \internal
-*/
-void QGeneralAreaAllocator::updateLargestFree(Node *node)
-{
- while ((node = node->parent) != 0) {
- node->largestFree =
- QSize(qMax(node->left->largestFree.width(),
- node->right->largestFree.width()),
- qMax(node->left->largestFree.height(),
- node->right->largestFree.height()));
- }
-}
-
-/*!
- \internal
-*/
-void QGeneralAreaAllocator::release(const QRect &rect)
-{
- // Locate the node that contains the allocated region.
- Node *node = m_root;
- QPoint point = rect.topLeft();
- while (node != 0) {
- if (node->left && node->left->rect.contains(point))
- node = node->left;
- else if (node->right && node->right->rect.contains(point))
- node = node->right;
- else if (node->rect.contains(point))
- break;
- else
- return; // Point is completely outside the tree.
- }
- if (!node)
- return;
-
- // Mark the node as free and then work upwards through the tree
- // recombining and deleting nodes until we reach a sibling
- // that is still allocated.
- node->largestFree = node->rect.size();
- while (node->parent) {
- if (node->parent->left == node) {
- if (node->parent->right->largestFree !=
- node->parent->right->rect.size())
- break;
- } else {
- if (node->parent->left->largestFree !=
- node->parent->left->rect.size())
- break;
- }
- node = node->parent;
- freeNode(node->left);
- freeNode(node->right);
- m_nodeCount -= 2;
- node->left = 0;
- node->right = 0;
- node->largestFree = node->rect.size();
- }
-
- // Make the rest of our ancestors have the correct "largest free size".
- updateLargestFree(node);
-}
-
-/*!
- \internal
-*/
-int QGeneralAreaAllocator::overhead() const
-{
- return m_nodeCount * sizeof(Node);
-}
-
-/*!
- \internal
-
- Constructs a uniform area allocator that is initially \a size pixels
- in size. The \a uniformSize specifies the single allocation size
- that is supported. All allocate() requests must be \a uniformSize
- or less.
-*/
-QUniformAreaAllocator::QUniformAreaAllocator
- (const QSize &size, const QSize &uniformSize)
- : QAreaAllocator(size), m_uniformSize(uniformSize), m_firstFree(0)
-{
- Q_ASSERT(uniformSize.width() > 0 && uniformSize.height() > 0);
- Q_ASSERT(size.width() >= uniformSize.width() &&
- size.height() >= uniformSize.height());
- m_gridSize = QSize(size.width() / uniformSize.width(),
- size.height() / uniformSize.height());
- int count = m_gridSize.width() * m_gridSize.height();
- m_grid = new int [count];
- for (int index = 0; index < (count - 1); ++index)
- m_grid[index] = index + 1;
- m_grid[count - 1] = -1;
-}
-
-/*!
- \internal
-
- Destroys this uniform area allocator.
-*/
-QUniformAreaAllocator::~QUniformAreaAllocator()
-{
- delete [] m_grid;
-}
-
-/*!
- \fn QSize QUniformAreaAllocator::uniformSize() const
- \internal
-
- Returns the uniform size of all allocations.
-
- \sa allocate()
-*/
-
-/*!
- \internal
-*/
-void QUniformAreaAllocator::expand(const QSize &size)
-{
- QAreaAllocator::expand(size);
-
- QSize newGridSize = QSize(m_size.width() / m_uniformSize.width(),
- m_size.height() / m_uniformSize.height());
- if (m_gridSize == newGridSize)
- return;
-
- // Create a new grid.
- int newCount = newGridSize.width() * newGridSize.height();
- int *newGrid = new int [newCount];
-
- // Copy across the free blocks from the old grid.
- int posn = m_firstFree;
- int newFirstFree = -1;
- while (posn != -1) {
- int x = posn % m_gridSize.width();
- int y = posn / m_gridSize.width();
- int newPosn = x + y * newGridSize.width();
- newGrid[newPosn] = newFirstFree;
- newFirstFree = newPosn;
- posn = m_grid[posn];
- }
-
- // Add free blocks within the expanded area of the new grid.
- for (int y = 0; y < m_gridSize.height(); ++y) {
- int newPosn = y * newGridSize.width() + m_gridSize.width();
- for (int x = m_gridSize.width(); x < newGridSize.width(); ++x) {
- newGrid[newPosn] = newFirstFree;
- newFirstFree = newPosn;
- ++newPosn;
- }
- }
- for (int y = m_gridSize.height(); y < newGridSize.height(); ++y) {
- int newPosn = y * newGridSize.width();
- for (int x = 0; x < newGridSize.width(); ++x) {
- newGrid[newPosn] = newFirstFree;
- newFirstFree = newPosn;
- ++newPosn;
- }
- }
-
- // Replace the old grid.
- delete [] m_grid;
- m_grid = newGrid;
- m_gridSize = newGridSize;
- m_firstFree = newFirstFree;
-}
-
-/*!
- \internal
-*/
-QRect QUniformAreaAllocator::allocate(const QSize &size)
-{
- QSize rounded = roundAllocation(size);
- if (rounded.width() > m_uniformSize.width() ||
- rounded.height() > m_uniformSize.height())
- return QRect();
- int posn = m_firstFree;
- if (posn == -1)
- return QRect();
- m_firstFree = m_grid[posn];
- int x = posn % m_gridSize.width();
- int y = posn / m_gridSize.width();
- return QRect(x * m_uniformSize.width(), y * m_uniformSize.height(),
- size.width(), size.height());
-}
-
-/*!
- \internal
-*/
-void QUniformAreaAllocator::release(const QRect &rect)
-{
- int x = rect.x() / m_uniformSize.width();
- int y = rect.y() / m_uniformSize.height();
- int posn = x + y * m_gridSize.width();
- Q_ASSERT(posn >= 0 && posn < m_gridSize.width() * m_gridSize.height());
- m_grid[posn] = m_firstFree;
- m_firstFree = posn;
-}
-
-/*!
- \internal
-*/
-int QUniformAreaAllocator::overhead() const
-{
- return sizeof(int) * m_gridSize.width() * m_gridSize.height();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/textures/qareaallocator.h b/src/gui/extern/Qt3D/textures/qareaallocator.h
deleted file mode 100644
index 45294af4228e7207e0887d2e6ad36d1e8a5ce4f1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qareaallocator.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QAREAALLOCATOR_P_H
-#define QAREAALLOCATOR_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qt3dglobal.h"
-#include <QtCore/qsize.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qlist.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class Q_QT3D_EXPORT QAreaAllocator
-{
-public:
- QAreaAllocator(const QSize &size);
- virtual ~QAreaAllocator();
-
- QSize size() const { return m_size; }
-
- QSize minimumAllocation() const { return m_minAlloc; }
- void setMinimumAllocation(const QSize &size) { m_minAlloc = size; }
-
- QSize margin() const { return m_margin; }
- void setMargin(const QSize &margin) { m_margin = margin; }
-
- virtual void expand(const QSize &size);
- void expandBy(const QSize &size);
-
- virtual QRect allocate(const QSize &size) = 0;
- virtual QList<QRect> allocate(const QList<QSize> &sizes);
- virtual void release(const QRect &rect);
- virtual void release(const QList<QRect> &rects);
-
- virtual int overhead() const;
-
-protected:
- QSize m_size;
- QSize m_minAlloc;
- QSize m_margin;
-
- QSize roundAllocation(const QSize &size) const;
-};
-
-class Q_QT3D_EXPORT QSimpleAreaAllocator : public QAreaAllocator
-{
-public:
- QSimpleAreaAllocator(const QSize &size);
- virtual ~QSimpleAreaAllocator();
-
- QRect allocate(const QSize &size);
-
-private:
- int m_row;
- int m_column;
- int m_rowHeight;
-};
-
-class Q_QT3D_EXPORT QGeneralAreaAllocator : public QAreaAllocator
-{
-public:
- QGeneralAreaAllocator(const QSize &size);
- virtual ~QGeneralAreaAllocator();
-
- void expand(const QSize &size);
- QRect allocate(const QSize &size);
- void release(const QRect &rect);
- int overhead() const;
-
-private:
- enum Split { SplitOnX, SplitOnY };
-
- struct Node
- {
- QRect rect;
- QSize largestFree;
- Node *parent;
- Node *left;
- Node *right;
- };
-
- Node *m_root;
- int m_nodeCount;
-
- static void freeNode(Node *node);
- QPoint allocateFromNode(const QSize &size, Node *node);
- Node *splitNode(Node *node, Split split);
- static void updateLargestFree(Node *node);
-};
-
-class Q_QT3D_EXPORT QUniformAreaAllocator : public QAreaAllocator
-{
-public:
- QUniformAreaAllocator(const QSize &size, const QSize &uniformSize);
- virtual ~QUniformAreaAllocator();
-
- QSize uniformSize() const { return m_uniformSize; }
-
- void expand(const QSize &size);
- QRect allocate(const QSize &size);
- void release(const QRect &rect);
- int overhead() const;
-
-private:
- QSize m_uniformSize;
- QSize m_gridSize;
- int *m_grid;
- int m_firstFree;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/qglsharedresource.cpp b/src/gui/extern/Qt3D/textures/qglsharedresource.cpp
deleted file mode 100644
index 087a7355bf6df869e11ab9b7ce96c814e8caa3bf..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qglsharedresource.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglsharedresource_p.h"
-#include <QtCore/qmutex.h>
-#include <QtCore/qcoreapplication.h>
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(Q_MOC_RUN)
-
-class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
-{
- Q_OBJECT
-public:
- QGLSignalProxy() : QObject() {}
- void emitAboutToDestroyContext(const QGLContext *context) {
- emit aboutToDestroyContext(context);
- }
- static QGLSignalProxy *instance();
-Q_SIGNALS:
- void aboutToDestroyContext(const QGLContext *context);
-};
-
-#endif
-
-class QGLContextInfo
-{
-public:
- QGLContextInfo(const QGLContext *ctx) : m_context(ctx), m_resources(0) {}
- ~QGLContextInfo();
-
- const QGLContext *m_context;
- QGLSharedResource *m_resources;
-};
-
-QGLContextInfo::~QGLContextInfo()
-{
- // Detach this information block from all of the shared resources
- // that used to be owned by it.
- QGLSharedResource *resource = m_resources;
- while (resource != 0) {
- resource->m_contextInfo = 0;
- resource->m_id = 0;
- resource = resource->m_next;
- }
-}
-
-
-
-Q_GLOBAL_STATIC(QGLContextManager, qt_gl_context_manager)
-
-QGLContextManager::QGLContextManager(QObject *parent)
- : QObject(parent)
-{
- QGLSignalProxy *proxy = QGLSignalProxy::instance();
- QThread *mainThread = qApp->thread();
- if (thread() != mainThread) {
- // The manager and signal proxy have been created for the first
- // time in a background thread. For safety, move both objects
- // to the main thread.
- moveToThread(mainThread);
- proxy->moveToThread(mainThread);
- }
- connect(proxy, SIGNAL(aboutToDestroyContext(const QGLContext *)),
- this, SLOT(aboutToDestroyContext(const QGLContext *)));
-}
-
-QGLContextManager::~QGLContextManager()
-{
- QMutexLocker locker(&managerLock);
- qDeleteAll(m_contexts);
-}
-
-QGLContextInfo *QGLContextManager::contextInfo(const QGLContext *ctx)
-{
- QGLContextInfo *info;
- for (int index = 0; index < m_contexts.size(); ++index) {
- info = m_contexts[index];
- if (info->m_context == ctx)
- return info;
- }
- info = new QGLContextInfo(ctx);
- m_contexts.append(info);
- return info;
-}
-
-Q_OPENGL_EXPORT const QGLContext *qt_gl_transfer_context(const QGLContext *);
-
-void QGLContextManager::aboutToDestroyContext(const QGLContext *ctx)
-{
- QMutexLocker locker(&managerLock);
- int index = 0;
- while (index < m_contexts.size()) {
- QGLContextInfo *info = m_contexts[index];
- if (info->m_context == ctx) {
- const QGLContext *transfer = qt_gl_transfer_context(ctx);
- if (transfer) {
- // Transfer ownership to another context in the same sharing
- // group. This may result in multiple QGLContextInfo objects
- // for the same context, which is ok.
- info->m_context = transfer;
- } else {
- // All contexts in the sharing group have been deleted,
- // so detach all of the shared resources.
- m_contexts.removeAt(index);
- delete info;
- continue;
- }
- }
- ++index;
- }
-}
-
-const QGLContext *QGLSharedResource::context() const
-{
- // Hope that the context will not be destroyed in another thread
- // while we are doing this so we don't have to acquire the lock.
- return m_contextInfo ? m_contextInfo->m_context : 0;
-}
-
-void QGLSharedResource::attach(const QGLContext *context, GLuint id)
-{
- Q_ASSERT(!m_contextInfo);
- QGLContextManager *manager = qt_gl_context_manager();
- QMutexLocker locker(&(manager->managerLock));
- m_contextInfo = manager->contextInfo(context);
- m_id = id;
- m_next = m_contextInfo->m_resources;
- m_prev = 0;
- if (m_contextInfo->m_resources)
- m_contextInfo->m_resources->m_prev = this;
- m_contextInfo->m_resources = this;
-}
-
-void QGLSharedResource::destroy()
-{
- // Detach this resource from the context information block.
- QGLContextManager *manager = qt_gl_context_manager();
- const QGLContext *owner = 0;
- GLuint id = 0;
- manager->managerLock.lock();
- if (m_contextInfo) {
- if (m_next)
- m_next->m_prev = m_prev;
- if (m_prev)
- m_prev->m_next = m_next;
- else
- m_contextInfo->m_resources = m_next;
- owner = m_contextInfo->m_context;
- id = m_id;
- }
- m_contextInfo = 0;
- m_id = 0;
- m_next = 0;
- m_prev = 0;
- manager->managerLock.unlock();
-
- // Switch back to the owning context temporarily and delete the id.
- if (owner && id) {
- QGLContext *currentContext = const_cast<QGLContext *>(QGLContext::currentContext());
- QGLContext *oldContext;
- QGLContext *doneContext;
- if (currentContext != owner && !QGLContext::areSharing(owner, currentContext)) {
- oldContext = currentContext;
- doneContext = const_cast<QGLContext *>(owner);
- doneContext->makeCurrent();
- } else {
- oldContext = 0;
- doneContext = 0;
- }
- m_destroyFunc(id);
- if (oldContext)
- oldContext->makeCurrent();
- else if (!currentContext && doneContext)
- doneContext->doneCurrent();
- }
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/Qt3D/textures/qglsharedresource_p.h b/src/gui/extern/Qt3D/textures/qglsharedresource_p.h
deleted file mode 100644
index b9a1b740d3bb9d401b42ac747dc382d38ba73422..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qglsharedresource_p.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLSHAREDRESOURCE_P_H
-#define QGLSHAREDRESOURCE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtOpenGL/qgl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QGLContextManager;
-class QGLContextInfo;
-
-class QGLSharedResource
-{
-public:
- typedef void (*DestroyResourceFunc)(GLuint id);
- QGLSharedResource(DestroyResourceFunc destroyFunc)
- : m_destroyFunc(destroyFunc), m_contextInfo(0), m_id(0)
- , m_next(0), m_prev(0) {}
- ~QGLSharedResource() { destroy(); }
-
- const QGLContext *context() const;
- GLuint id() const { return m_id; }
- void clearId() { m_id = 0; }
-
- void attach(const QGLContext *context, GLuint id);
- void destroy();
-
-private:
- DestroyResourceFunc m_destroyFunc;
- QGLContextInfo *m_contextInfo;
- GLuint m_id;
- QGLSharedResource *m_next;
- QGLSharedResource *m_prev;
-
- friend class QGLContextManager;
- friend class QGLContextInfo;
-};
-
-#include <QMutex>
-class QGLContextManager : public QObject
-{
- Q_OBJECT
-public:
- QGLContextManager(QObject *parent = 0);
- ~QGLContextManager();
-
- QMutex managerLock;
-
- QGLContextInfo *contextInfo(const QGLContext *ctx);
-
-private Q_SLOTS:
- void aboutToDestroyContext(const QGLContext *ctx);
-
-private:
- QList<QGLContextInfo *> m_contexts;
-};
-
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/qgltexture2d.cpp b/src/gui/extern/Qt3D/textures/qgltexture2d.cpp
deleted file mode 100644
index 6f17f65ece70f1132f3c541f1326745e7a53eb9b..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltexture2d.cpp
+++ /dev/null
@@ -1,782 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgltexture2d.h"
-#include "qgltexture2d_p.h"
-#include "qgltextureutils_p.h"
-#include "qglpainter_p.h"
-#include "qglext_p.h"
-#include "qopenglfunctions.h"
-
-#include <QtCore/qfile.h>
-#include <QtCore/qfileinfo.h>
-#include <QImageReader>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLTexture2D
- \brief The QGLTexture2D class represents a 2D texture object for GL painting operations.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
-
- QGLTexture2D contains a QImage and settings for texture filters,
- wrap modes, and mipmap generation. When bind() is called, this
- information is uploaded to the GL server if it has changed since
- the last time bind() was called.
-
- Once a QGLTexture2D object is created, it can be bound to multiple
- GL contexts. Internally, a separate texture identifier is created
- for each context. This makes QGLTexture2D easier to use than
- raw GL texture identifiers because the application does not need
- to be as concerned with whether the texture identifier is valid
- in the current context. The application merely calls bind() and
- QGLTexture2D will create a new texture identifier for the context
- if necessary.
-
- QGLTexture2D internally points to a reference-counted object that
- represents the current texture state. If the QGLTexture2D is copied,
- the internal pointer is the same. Modifications to one QGLTexture2D
- copy will affect all of the other copies in the system.
-
- The texture identifiers will be destroyed when the last QGLTexture2D
- reference is destroyed, or when a context is destroyed that contained a
- texture identifier that was created by QGLTexture2D.
-
- QGLTexture2D can also be used for uploading 1D textures into the
- GL server by specifying an image() with a height of 1.
-
- \sa QGLTextureCube
-*/
-
-Q_GLOBAL_STATIC(QSize, getMaxImageSize)
-
-QGLTexture2DPrivate::ForcePowerOfTwo QGLTexture2DPrivate::forcePowerOfTwo = QGLTexture2DPrivate::ForcePowerOfTwoUndefined;
-
-QGLTexture2DPrivate::QGLTexture2DPrivate()
-{
- horizontalWrap = QGL::Repeat;
- verticalWrap = QGL::Repeat;
- bindOptions = QGLContext::DefaultBindOption;
-#if !defined(QT_OPENGL_ES)
- mipmapSupported = false;
- mipmapSupportedKnown = false;
-#endif
- imageGeneration = 0;
- parameterGeneration = 0;
- infos = 0;
-
- if (forcePowerOfTwo == ForcePowerOfTwoUndefined) {
- if (qgetenv("NPOT_MIPMAP_UNSUPPORTED").toInt() == 1)
- forcePowerOfTwo = ForcePowerOfTwoTrue;
- else
- forcePowerOfTwo = ForcePowerOfTwoFalse;
- }
-}
-
-QGLTexture2DPrivate::~QGLTexture2DPrivate()
-{
- // Destroy the texture id's in the GL server in their original contexts.
- QGLTexture2DTextureInfo *current = infos;
- QGLTexture2DTextureInfo *next;
- const QGLContext *currentContext =
- const_cast<QGLContext *>(QGLContext::currentContext());
- const QGLContext *firstContext = currentContext;
- while (current != 0) {
- next = current->next;
- if (current->isLiteral)
- current->tex.clearId(); // Don't delete literal id's.
- delete current;
- current = next;
- }
- if (firstContext != currentContext) {
- if (firstContext)
- const_cast<QGLContext *>(firstContext)->makeCurrent();
- else if (currentContext)
- const_cast<QGLContext *>(currentContext)->doneCurrent();
- }
-}
-
-/*!
- Constructs a null texture object and attaches it to \a parent.
-
- \sa isNull()
-*/
-QGLTexture2D::QGLTexture2D(QObject *parent)
- : QObject(parent), d_ptr(new QGLTexture2DPrivate())
-{
-}
-
-/*!
- Destroys this texture object. If this object is the last
- reference to the underlying GL texture, then the underlying
- GL texture will also be deleted.
-*/
-QGLTexture2D::~QGLTexture2D()
-{
-}
-
-/*!
- Returns true if this texture object is null; that is, image()
- is null and textureId() is zero.
-*/
-bool QGLTexture2D::isNull() const
-{
- Q_D(const QGLTexture2D);
- return d->image.isNull() && !d->infos;
-}
-
-/*!
- Returns true if this texture has an alpha channel; false if the
- texture is fully opaque.
-*/
-bool QGLTexture2D::hasAlphaChannel() const
-{
- Q_D(const QGLTexture2D);
- if (!d->image.isNull())
- return d->image.hasAlphaChannel();
- QGLTexture2DTextureInfo *info = d->infos;
- if (info)
- return info->tex.hasAlpha();
- return false;
-}
-
-/*!
- Returns the size of this texture. If the underlying OpenGL
- implementation requires texture sizes to be a power of two,
- then this function will return the next power of two equal
- to or greater than requestedSize()
-
- \sa setSize(), requestedSize()
-*/
-QSize QGLTexture2D::size() const
-{
- Q_D(const QGLTexture2D);
- return d->size;
-}
-
-/*!
- Sets the size of this texture to \a value. If the underlying
- OpenGL implementation requires texture sizes to be a power of
- two, then requestedSize() will be set to \a value, and the
- actual size will be set to the next power of two equal
- to or greater than \a value. Otherwise both size() and
- requestedSize() will be set to \a value.
-
- \sa size(), requestedSize()
-*/
-void QGLTexture2D::setSize(const QSize& value)
-{
- Q_D(QGLTexture2D);
- if (d->requestedSize == value)
- return;
- if (!(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)
- && !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))
- d->size = QGL::nextPowerOfTwo(value);
- else
- d->size = value;
- d->requestedSize = value;
- ++(d->imageGeneration);
-}
-
-/*!
- Returns the size that was previously set with setSize() before
- it was rounded to a power of two.
-
- \sa size(), setSize()
-*/
-QSize QGLTexture2D::requestedSize() const
-{
- Q_D(const QGLTexture2D);
- return d->requestedSize;
-}
-
-/*!
- Returns the image that is currently associated with this texture.
- The image may not have been uploaded into the GL server yet.
- Uploads occur upon the next call to bind().
-
- \sa setImage()
-*/
-QImage QGLTexture2D::image() const
-{
- Q_D(const QGLTexture2D);
- return d->image;
-}
-
-/*!
- Sets the \a image that is associated with this texture. The image
- will be uploaded into the GL server the next time bind() is called.
-
- If setSize() or setImage() has been called previously, then \a image
- will be scaled to size() when it is uploaded.
-
- If \a image is null, then this function is equivalent to clearImage().
-
- \sa image(), setSize(), copyImage(), setPixmap()
-*/
-void QGLTexture2D::setImage(const QImage& image)
-{
- Q_D(QGLTexture2D);
- d->compressedData = QByteArray(); // Clear compressed file data.
- if (image.isNull()) {
- // Don't change the imageGeneration, because we aren't actually
- // changing the image in the GL server, only the client copy.
- d->image = image;
- } else {
- if (image.size().isValid())
- setSize(image.size());
- d->image = image;
- ++(d->imageGeneration);
- }
-}
-
-/*!
- Sets the image that is associated with this texture to \a pixmap.
-
- This is a convenience that calls setImage() after converting
- \a pixmap into a QImage. It may be more efficient on some
- platforms than the application calling QPixmap::toImage().
-
- \sa setImage()
-*/
-void QGLTexture2D::setPixmap(const QPixmap& pixmap)
-{
- QImage image = pixmap.toImage();
- if (pixmap.depth() == 16 && !image.hasAlphaChannel()) {
- // If the system depth is 16 and the pixmap doesn't have an alpha channel
- // then we convert it to RGB16 in the hope that it gets uploaded as a 16
- // bit texture which is much faster to access than a 32-bit one.
- image = image.convertToFormat(QImage::Format_RGB16);
- }
- setImage(image);
-}
-
-/*!
- Clears the image() that is associated with this texture, but the
- GL texture will retain its current value. This can be used to
- release client-side memory that is no longer required once the
- image has been uploaded into the GL server.
-
- The following code will queue \c image to be uploaded, immediately
- force it to be uploaded into the current GL context, and then
- clear the client copy:
-
- \code
- texture.setImage(image);
- texture.bind();
- texture.clearImage()
- \endcode
-
- \sa image(), setImage()
-*/
-void QGLTexture2D::clearImage()
-{
- Q_D(QGLTexture2D);
- d->image = QImage();
-}
-
-#ifndef GL_GENERATE_MIPMAP_SGIS
-#define GL_GENERATE_MIPMAP_SGIS 0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
-#endif
-
-/*!
- Sets this texture to the contents of a compressed image file
- at \a path. Returns true if the file exists and has a supported
- compressed format; false otherwise.
-
- The DDS, ETC1, PVRTC2, and PVRTC4 compression formats are
- supported, assuming that the GL implementation has the
- appropriate extension.
-
- \sa setImage(), setSize()
-*/
-bool QGLTexture2D::setCompressedFile(const QString &path)
-{
- Q_D(QGLTexture2D);
- d->image = QImage();
- QFile f(path);
- if (!f.open(QIODevice::ReadOnly))
- {
- qWarning("QGLTexture2D::setCompressedFile(%s): File could not be read",
- qPrintable(path));
- return false;
- }
- QByteArray data = f.readAll();
- f.close();
-
- bool hasAlpha, isFlipped;
- if (!QGLBoundTexture::canBindCompressedTexture
- (data.constData(), data.size(), 0, &hasAlpha, &isFlipped)) {
- qWarning("QGLTexture2D::setCompressedFile(%s): Format is not supported",
- path.toLocal8Bit().constData());
- return false;
- }
-
- QFileInfo fi(path);
- d->url = QUrl::fromLocalFile(fi.absoluteFilePath());
-
- // The 3DS loader expects the flip state to be set before bind().
- if (isFlipped)
- d->bindOptions &= ~QGLContext::InvertedYBindOption;
- else
- d->bindOptions |= QGLContext::InvertedYBindOption;
-
- d->compressedData = data;
- ++(d->imageGeneration);
- return true;
-}
-
-/*!
- Returns the url that was last set with setUrl.
-*/
-QUrl QGLTexture2D::url() const
-{
- Q_D(const QGLTexture2D);
- return d->url;
-}
-
-/*!
- Sets this texture to have the contents of the image stored at \a url.
-
- If the environment variable QT3D_MULTITHREAD is defined, network urls
- (http, etc) are downloaded in a separate download thread, otherwise they are
- downloaded asynchronously in the current thread.
-*/
-void QGLTexture2D::setUrl(const QUrl &url)
-{
- Q_D(QGLTexture2D);
- if (d->url == url)
- return;
- d->url = url;
-
- if (url.isEmpty())
- {
- d->image = QImage();
- }
- else
- {
- if (url.scheme() == QLatin1String("file") || url.scheme().toLower() == QLatin1String("qrc"))
- {
- QString fileName = url.toLocalFile();
-
- // slight hack since there doesn't appear to be a QUrl::toResourcePath() function
- // to convert qrc:///foo into :/foo
- if (url.scheme().toLower() == QLatin1String("qrc")) {
- // strips off any qrc: prefix and any excess slashes and replaces it with :/
- QUrl tempUrl(url);
- tempUrl.setScheme("");
- fileName = QLatin1String(":")+tempUrl.toString();
- }
-
- if (fileName.endsWith(QLatin1String(".dds"), Qt::CaseInsensitive))
- {
- setCompressedFile(fileName);
- }
- else
- {
- QImageReader imgReader;
- imgReader.setFileName(fileName);
-
- if (!getMaxImageSize()->isValid()) {
- imgReader.setScaledSize(imgReader.size().boundedTo(*getMaxImageSize()));
- }
-
- QImage im = imgReader.read();
- if (im.isNull())
- qWarning("Could not load texture: %s", qPrintable(fileName));
- setImage(im);
- }
- }
- else
- {
- qWarning("Unable to issue texture download request.");
- }
- }
-}
-
-/*!
- Copies the contents of \a image to \a offset in this texture
- within the current GL context.
-
- Unlike setImage(), this function copies the image data to the
- GL server immediately using \c{glTexSubImage2D()}. This is typically
- used to update the contents of a texture after it has been created.
-
- It is assumed that the application has already called bind() on
- this texture to bind it to the current GL context.
-
- If the texture has been created in multiple contexts, only the
- texture identifier for the current context will be updated.
-
- \sa setImage(), bind()
-*/
-void QGLTexture2D::copyImage(const QImage& image, const QPoint& offset)
-{
- QImage img = QGLWidget::convertToGLFormat(image);
- glTexSubImage2D(GL_TEXTURE_2D, 0, offset.x(), offset.y(),
- img.width(), img.height(), GL_RGBA,
- GL_UNSIGNED_BYTE, img.bits());
-#if defined(QT_OPENGL_ES_2)
- Q_D(QGLTexture2D);
- if (d->bindOptions & QGLContext::MipmapBindOption)
- glGenerateMipmap(GL_TEXTURE_2D);
-#endif
-}
-
-/*!
- Returns the options to use when binding the image() to an OpenGL
- context for the first time. The default options are
- QGLContext::LinearFilteringBindOption |
- QGLContext::InvertedYBindOption | QGLContext::MipmapBindOption.
-
- \sa setBindOptions()
-*/
-QGLContext::BindOptions QGLTexture2D::bindOptions() const
-{
- Q_D(const QGLTexture2D);
- return d->bindOptions;
-}
-
-/*!
- Sets the \a options to use when binding the image() to an
- OpenGL context. If the image() has already been bound,
- then changing the options will cause it to be recreated
- from image() the next time bind() is called.
-
- \sa bindOptions(), bind()
-*/
-void QGLTexture2D::setBindOptions(QGLContext::BindOptions options)
-{
- Q_D(QGLTexture2D);
- if (d->bindOptions != options) {
- d->bindOptions = options;
- ++(d->imageGeneration);
- }
-}
-
-/*!
- Returns the wrapping mode for horizontal texture co-ordinates.
- The default value is QGL::Repeat.
-
- \sa setHorizontalWrap(), verticalWrap()
-*/
-QGL::TextureWrap QGLTexture2D::horizontalWrap() const
-{
- Q_D(const QGLTexture2D);
- return d->horizontalWrap;
-}
-
-/*!
- Sets the wrapping mode for horizontal texture co-ordinates to \a value.
-
- If \a value is not supported by the OpenGL implementation, it will be
- replaced with a value that is supported. If the application desires a
- very specific \a value, it can call horizontalWrap() to check that
- the specific value was actually set.
-
- The \a value will not be applied to the texture in the GL
- server until the next call to bind().
-
- \sa horizontalWrap(), setVerticalWrap()
-*/
-void QGLTexture2D::setHorizontalWrap(QGL::TextureWrap value)
-{
- Q_D(QGLTexture2D);
- value = qt_gl_modify_texture_wrap(value);
- if (d->horizontalWrap != value) {
- d->horizontalWrap = value;
- ++(d->parameterGeneration);
- }
-}
-
-/*!
- Returns the wrapping mode for vertical texture co-ordinates.
- The default value is QGL::Repeat.
-
- \sa setVerticalWrap(), horizontalWrap()
-*/
-QGL::TextureWrap QGLTexture2D::verticalWrap() const
-{
- Q_D(const QGLTexture2D);
- return d->verticalWrap;
-}
-
-/*!
- Sets the wrapping mode for vertical texture co-ordinates to \a value.
-
- If \a value is not supported by the OpenGL implementation, it will be
- replaced with a value that is supported. If the application desires a
- very specific \a value, it can call verticalWrap() to check that
- the specific value was actually set.
-
- The \a value will not be applied to the texture in the GL
- server until the next call to bind().
-
- \sa verticalWrap(), setHorizontalWrap()
-*/
-void QGLTexture2D::setVerticalWrap(QGL::TextureWrap value)
-{
- Q_D(QGLTexture2D);
- value = qt_gl_modify_texture_wrap(value);
- if (d->verticalWrap != value) {
- d->verticalWrap = value;
- ++(d->parameterGeneration);
- }
-}
-
-/*!
- Binds this texture to the 2D texture target.
-
- If this texture object is not associated with an identifier in
- the current context, then a new identifier will be created,
- and image() uploaded into the GL server.
-
- If setImage() or setSize() was called since the last upload,
- then image() will be re-uploaded to the GL server.
-
- Returns false if the texture could not be bound for some reason.
-
- \sa release(), textureId(), setImage()
-*/
-bool QGLTexture2D::bind() const
-{
- Q_D(const QGLTexture2D);
- return const_cast<QGLTexture2DPrivate *>(d)->bind(GL_TEXTURE_2D);
-}
-
-bool QGLTexture2DPrivate::bind(GLenum target)
-{
- // Get the current context. If we don't have one, then we
- // cannot bind the texture.
- const QGLContext *ctx = QGLContext::currentContext();
- if (!ctx)
- return false;
-
- QOpenGLFunctions glFuncs(ctx);
- if (!glFuncs.hasOpenGLFeature(QOpenGLFunctions::NPOTTextures))
- {
- QSize oldSize = size;
- size = QGL::nextPowerOfTwo(size);
- if (size != oldSize)
- ++imageGeneration;
- }
-
- // Find the information block for the context, or create one.
- QGLTexture2DTextureInfo *info = infos;
- QGLTexture2DTextureInfo *prev = 0;
- while (info != 0 && !QGLContext::areSharing(info->tex.context(), ctx)) {
- if (info->isLiteral)
- return false; // Cannot create extra texture id's for literals.
- prev = info;
- info = info->next;
- }
- if (!info) {
- info = new QGLTexture2DTextureInfo
- (ctx, 0, imageGeneration - 1, parameterGeneration - 1);
- if (prev)
- prev->next = info;
- else
- infos = info;
- }
-
- if (!info->tex.textureId() || imageGeneration != info->imageGeneration) {
- // Create the texture contents and upload a new image.
- info->tex.setOptions(bindOptions);
- if (!compressedData.isEmpty()) {
- info->tex.bindCompressedTexture
- (compressedData.constData(), compressedData.size());
- } else {
- info->tex.startUpload(ctx, target, image.size());
- bindImages(info);
- info->tex.finishUpload(target);
- }
- info->imageGeneration = imageGeneration;
- } else {
- // Bind the existing texture to the texture target.
- glBindTexture(target, info->tex.textureId());
- }
-
- // If the parameter generation has changed, then alter the parameters.
- if (parameterGeneration != info->parameterGeneration) {
- info->parameterGeneration = parameterGeneration;
- q_glTexParameteri(target, GL_TEXTURE_WRAP_S, horizontalWrap);
- q_glTexParameteri(target, GL_TEXTURE_WRAP_T, verticalWrap);
- }
-
- // Texture is ready to be used.
- return true;
-}
-
-void QGLTexture2DPrivate::bindImages(QGLTexture2DTextureInfo *info)
-{
- QSize scaledSize(size);
-#if defined(QT_OPENGL_ES_2)
- if ((bindOptions & QGLContext::MipmapBindOption) ||
- horizontalWrap != QGL::ClampToEdge ||
- verticalWrap != QGL::ClampToEdge) {
- // ES 2.0 does not support NPOT textures when mipmaps are in use,
- // or if the wrap mode isn't ClampToEdge.
- scaledSize = QGL::nextPowerOfTwo(scaledSize);
- }
-#endif
-
- if (forcePowerOfTwo == ForcePowerOfTwoTrue)
- scaledSize = QGL::nextPowerOfTwo(scaledSize);
-
- if (!image.isNull())
- info->tex.uploadFace(GL_TEXTURE_2D, image, scaledSize);
- else if (size.isValid())
- info->tex.createFace(GL_TEXTURE_2D, scaledSize);
-}
-
-/*!
- Releases the texture associated with the 2D texture target.
- This is equivalent to \c{glBindTexture(GL_TEXTURE_2D, 0)}.
-
- \sa bind()
-*/
-void QGLTexture2D::release() const
-{
- glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-/*!
- Returns the identifier associated with this texture object in
- the current context.
-
- Returns zero if the texture has not previously been bound to
- the 2D texture target in the current context with bind().
-
- \sa bind()
-*/
-GLuint QGLTexture2D::textureId() const
-{
- Q_D(const QGLTexture2D);
- const QGLContext *ctx = QGLContext::currentContext();
- if (!ctx)
- return 0;
- QGLTexture2DTextureInfo *info = d->infos;
- while (info != 0 && !QGLContext::areSharing(info->tex.context(), ctx))
- info = info->next;
- return info ? info->tex.textureId() : 0;
-}
-
-/*!
- Constructs a QGLTexture2D object that wraps the supplied literal
- texture identifier \a id, with the dimensions specified by \a size.
-
- The \a id is assumed to have been created by the application in
- the current GL context, and it will be destroyed by the application
- after the returned QGLTexture2D object is destroyed.
-
- This function is intended for interfacing to existing code that
- uses raw GL texture identifiers. The returned QGLTexture2D can
- only be used with the current GL context.
-
- \sa textureId()
-*/
-QGLTexture2D *QGLTexture2D::fromTextureId(GLuint id, const QSize& size)
-{
- const QGLContext *ctx = QGLContext::currentContext();
- if (!id || !ctx)
- return 0;
-
- QGLTexture2D *texture = new QGLTexture2D();
- if (!size.isNull())
- texture->setSize(size);
- QGLTexture2DTextureInfo *info = new QGLTexture2DTextureInfo
- (ctx, id, texture->d_ptr->imageGeneration,
- texture->d_ptr->parameterGeneration, true);
- texture->d_ptr->infos = info;
- return texture;
-}
-
-/*!
- This slot is used to recieve signals from the QDownloadManager class
- which provides Url download capability across the network.
-
- A successful download will have a valid QByteArray stored in \a assetData,
- while a failed download (due to network error, etc), will result in
- a NULL value.
-
- Successful downloads use the image data downloaded into \a assetData,
- which is converted to an image/texture, and emit a textureUpdated()
- signal.
-
- \sa QDownloadManager
-*/
-void QGLTexture2D::textureRequestFinished(QByteArray assetData)
-{
- //Ensure valid asset data exists.
- if (assetData.isEmpty()) {
- qWarning("Network request failed. Texture not loaded.");
- } else {
- //Convert asset data to an image.
- QImage texImage;
- texImage.loadFromData(assetData);
- setImage(texImage.mirrored());
-
- emit textureUpdated();
- }
-}
-
-/*!
- Sets the maximum size of an image file loaded in a texture as being
- of \a width x \a height in size.
-
- \sa setUrl()
-*/
-void QGLTexture2D::setMaxImageSize(int width, int height)
-{
- Q_ASSERT(width>0 && height>0);
- (*getMaxImageSize()) = QSize(width, height);
-}
-
-/*!
- \fn QGLTexture2D::textureUpdated()
- Signals that some property of this texture has changed in a manner
- that may require that the parent material class be updated.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/textures/qgltexture2d.h b/src/gui/extern/Qt3D/textures/qgltexture2d.h
deleted file mode 100644
index d3d04ff6cccfc55a56d42c3ed50319e5d0d6c68e..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltexture2d.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEXTURE2D_H
-#define QGLTEXTURE2D_H
-
-#include "qglnamespace.h"
-#include <QtOpenGL/qgl.h>
-#include <QtCore/qscopedpointer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLTexture2DPrivate;
-
-class Q_QT3D_EXPORT QGLTexture2D : public QObject
-{
- Q_OBJECT
-public:
- QGLTexture2D(QObject *parent = 0);
- ~QGLTexture2D();
-
- bool isNull() const;
- bool hasAlphaChannel() const;
-
- QSize size() const;
- void setSize(const QSize& value);
- QSize requestedSize() const;
-
- QImage image() const;
- void setImage(const QImage& image);
- bool setCompressedFile(const QString &path);
- QUrl url() const;
- void setUrl(const QUrl &url);
-
- void setPixmap(const QPixmap& pixmap);
-
- void clearImage();
-
- void copyImage(const QImage& image, const QPoint& offset = QPoint(0, 0));
-
- QGLContext::BindOptions bindOptions() const;
- void setBindOptions(QGLContext::BindOptions options);
-
- QGL::TextureWrap horizontalWrap() const;
- void setHorizontalWrap(QGL::TextureWrap value);
-
- QGL::TextureWrap verticalWrap() const;
- void setVerticalWrap(QGL::TextureWrap value);
-
- bool bind() const;
- void release() const;
-
- GLuint textureId() const;
-
- static void setMaxImageSize(int width, int height);
-
- static QGLTexture2D *fromTextureId(GLuint id, const QSize& size);
-signals:
- void textureUpdated();
-public slots:
- void textureRequestFinished(QByteArray);
-private:
- QScopedPointer<QGLTexture2DPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGLTexture2D)
- Q_DECLARE_PRIVATE(QGLTexture2D)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/qgltexture2d_p.h b/src/gui/extern/Qt3D/textures/qgltexture2d_p.h
deleted file mode 100644
index 7b3d625560c7c545d1f8cb05b9cc6e1b3783feaf..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltexture2d_p.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEXTURE2D_P_H
-#define QGLTEXTURE2D_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qgltexture2d.h"
-#include "qgltextureutils_p.h"
-#include "qurl.h"
-#include <QtCore/qatomic.h>
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractDownloadManager;
-
-class QGLTexture2DTextureInfo
-{
-public:
- QGLTexture2DTextureInfo
- (const QGLContext *context, GLuint textureId, uint imageGeneration,
- uint parameterGeneration, bool isLiteral = false)
- {
- if (textureId)
- tex.setTextureId(context, textureId);
- this->imageGeneration = imageGeneration;
- this->parameterGeneration = parameterGeneration;
- this->isLiteral = isLiteral;
- this->next = 0;
- }
-
- QGLBoundTexture tex;
- uint imageGeneration;
- uint parameterGeneration;
- bool isLiteral;
- QGLTexture2DTextureInfo *next;
-};
-
-class DDSFormat;
-
-class QGLTexture2DPrivate
-{
-public:
- QGLTexture2DPrivate();
- ~QGLTexture2DPrivate();
-
- QSize size;
- QSize requestedSize;
- QImage image;
- QUrl url;
- QByteArray compressedData;
- QGLContext::BindOptions bindOptions;
- QGL::TextureWrap horizontalWrap;
- QGL::TextureWrap verticalWrap;
-#if !defined(QT_OPENGL_ES)
- bool mipmapSupported;
- bool mipmapSupportedKnown;
-#endif
- uint imageGeneration;
- uint parameterGeneration;
- QGLTexture2DTextureInfo *infos;
- QAbstractDownloadManager *downloadManager;
-
- enum ForcePowerOfTwo {
- ForcePowerOfTwoUndefined = -1,
- ForcePowerOfTwoFalse = 0,
- ForcePowerOfTwoTrue = 1
- };
-
- static ForcePowerOfTwo forcePowerOfTwo;
-
- bool bind(GLenum target);
- virtual void bindImages(QGLTexture2DTextureInfo *info);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/qgltexturecube.cpp b/src/gui/extern/Qt3D/textures/qgltexturecube.cpp
deleted file mode 100644
index 5d1046154ef1870a70235808f1b68f1a930e39e8..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltexturecube.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgltexturecube.h"
-#include "qgltexture2d_p.h"
-#include "qgltextureutils_p.h"
-#include "qglpainter_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLTextureCube
- \brief The QGLTextureCube class represents a cube map texture object for GL painting operations.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::textures
-
- QGLTextureCube contains six QImage objects for each of the cube
- map faces and settings for texture filters, wrap modes, and mipmap
- generation. When bind() is called, this information is uploaded to
- the GL server if it has changed since the last time bind() was called.
-
- Once a QGLTextureCube object is created, it can be bound to multiple
- GL contexts. Internally, a separate texture identifier is created
- for each context. This makes QGLTextureCube easier to use than
- raw GL texture identifiers because the application does not need
- to be as concerned with whether the texture identifier is valid
- in the current context. The application merely calls bind() and
- QGLTextureCube will create a new texture identifier for the context
- if necessary.
-
- QGLTextureCube internally points to a reference-counted object that
- represents the current texture state. If the QGLTextureCube is copied,
- the internal pointer is the same. Modifications to one QGLTextureCube
- copy will affect all of the other copies in the system.
-
- The texture identifiers will be destroyed when the last QGLTextureCube
- reference is destroyed, or when a context is destroyed that contained a
- texture identifier that was created by QGLTextureCube.
-
- \sa QGLTexture2D
-*/
-
-/*!
- \enum QGLTextureCube::Face
- This enum defines the face of a cube map texture that is affected
- by a texture operation on QGLTextureCube instances.
-
- \value PositiveX The positive X face of the cube map.
- \value NegativeX The negative X face of the cube map.
- \value PositiveY The positive Y face of the cube map.
- \value NegativeY The negative Y face of the cube map.
- \value PositiveZ The positive Z face of the cube map.
- \value NegativeZ The negative Z face of the cube map.
-*/
-
-class QGLTextureCubePrivate : public QGLTexture2DPrivate
-{
-public:
- QGLTextureCubePrivate();
- ~QGLTextureCubePrivate();
-
- void bindImages(QGLTexture2DTextureInfo *info);
-
- QImage otherImages[5];
- uint changedFaces;
-};
-
-QGLTextureCubePrivate::QGLTextureCubePrivate()
-{
- changedFaces = 0;
-}
-
-QGLTextureCubePrivate::~QGLTextureCubePrivate()
-{
-}
-
-void QGLTextureCubePrivate::bindImages(QGLTexture2DTextureInfo *info)
-{
- QSize scaledSize(size);
-#if defined(QT_OPENGL_ES_2)
- if ((bindOptions & QGLContext::MipmapBindOption) ||
- horizontalWrap != QGL::ClampToEdge ||
- verticalWrap != QGL::ClampToEdge) {
- // ES 2.0 does not support NPOT textures when mipmaps are in use,
- // or if the wrap mode isn't ClampToEdge.
- scaledSize = QGL::nextPowerOfTwo(scaledSize);
- }
-#endif
-
- // Handle the first face.
- if (!image.isNull())
- info->tex.uploadFace(GL_TEXTURE_CUBE_MAP_POSITIVE_X, image, scaledSize);
- else if (size.isValid())
- info->tex.createFace(GL_TEXTURE_CUBE_MAP_POSITIVE_X, scaledSize);
-
- // Handle the other faces.
- for (int face = 1; face < 6; ++face) {
- if (!otherImages[face - 1].isNull()) {
- info->tex.uploadFace(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
- otherImages[face - 1], scaledSize);
- } else {
- info->tex.createFace(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, scaledSize);
- }
- }
-}
-
-/*!
- Constructs a null texture object.
-
- \sa isNull()
-*/
-QGLTextureCube::QGLTextureCube()
- : d_ptr(new QGLTextureCubePrivate())
-{
-}
-
-/*!
- Destroys this texture object. If this object is the last
- reference to the underlying GL texture, then the underlying
- GL texture will also be deleted.
-*/
-QGLTextureCube::~QGLTextureCube()
-{
-}
-
-/*!
- Returns true if this texture object is null; that is, all image()
- values are null and textureId() is zero.
-*/
-bool QGLTextureCube::isNull() const
-{
- // TODO
- Q_D(const QGLTextureCube);
- return !d->infos;
-}
-
-/*!
- Returns true if this texture has an alpha channel; false if the
- texture is fully opaque.
-*/
-bool QGLTextureCube::hasAlphaChannel() const
-{
- Q_D(const QGLTextureCube);
- if (!d->image.isNull() && d->image.hasAlphaChannel())
- return true;
- for (int face = 0; face < 5; ++face) {
- if (!d->otherImages[face].isNull()) {
- if (d->otherImages[face].hasAlphaChannel())
- return true;
- }
- }
- QGLTexture2DTextureInfo *info = d->infos;
- if (info)
- return info->tex.hasAlpha();
- return false;
-}
-
-/*!
- Returns the size of this texture. If the underlying OpenGL
- implementation requires texture sizes to be a power of two,
- then this function will return the next power of two equal
- to or greater than requestedSize()
-
- \sa setSize(), requestedSize()
-*/
-QSize QGLTextureCube::size() const
-{
- Q_D(const QGLTextureCube);
- return d->size;
-}
-
-/*!
- Sets the size of this texture to \a value. If the underlying
- OpenGL implementation requires texture sizes to be a power of
- two, then requestedSize() will be set to \a value, and the
- actual size will be set to the next power of two equal
- to or greater than \a value. Otherwise both size() and
- requestedSize() will be set to \a value.
-
- \sa size(), requestedSize()
-*/
-void QGLTextureCube::setSize(const QSize& value)
-{
- Q_D(QGLTextureCube);
- if (d->requestedSize == value)
- return;
- if (!(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) &&
- !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))
- d->size = QGL::nextPowerOfTwo(value);
- else
- d->size = value;
- d->requestedSize = value;
- ++(d->imageGeneration);
-}
-
-/*!
- Returns the size that was previously set with setSize() before
- it was rounded to a power of two.
-
- \sa size(), setSize()
-*/
-QSize QGLTextureCube::requestedSize() const
-{
- Q_D(const QGLTextureCube);
- return d->requestedSize;
-}
-
-/*!
- Returns the image that is currently associated with the specified
- \a face of this cube map texture. The image may not have been
- uploaded into the GL server yet. Uploads occur upon the next
- call to bind().
-
- \sa setImage()
-*/
-QImage QGLTextureCube::image(QGLTextureCube::Face face) const
-{
- Q_D(const QGLTextureCube);
- if (uint(face) >= 6)
- return QImage();
- if (face == 0)
- return d->image;
- else
- return d->otherImages[face - 1];
-}
-
-/*!
- Sets the \a image that is associated with this texture on the
- specified \a face of the cube map. The image will be uploaded
- into the GL server the next time bind() is called.
-
- If setSize() or setImage() has been called previously, then \a image
- will be scaled to size() when it is uploaded.
-
- If \a image is null, then this function is equivalent to clearImage().
-
- \sa image(), setSize(), copyImage()
-*/
-void QGLTextureCube::setImage
- (QGLTextureCube::Face face, const QImage& image)
-{
- Q_D(QGLTextureCube);
- if (uint(face) >= 6)
- return;
- if (image.isNull()) {
- // Don't change the imageGeneration, because we aren't actually
- // changing the image in the GL server, only the client copy.
- if (face == 0)
- d->image = image;
- else
- d->otherImages[face - 1] = image;
- } else {
- if (!d->size.isValid())
- setSize(image.size());
- if (face == 0)
- d->image = image;
- else
- d->otherImages[face - 1] = image;
- ++(d->imageGeneration);
- d->changedFaces |= (1 << face);
- }
-}
-
-/*!
- Clears the image() that is associated with this texture on the
- specified \a face of the cube map. The GL texture will retain
- its current value. This can be used to release client-side memory
- that is no longer required once the image has been uploaded into
- the GL server.
-
- The following code will queue \c image to be uploaded as the
- positive X face of the cube map, immediately force it to
- be uploaded into the current GL context, and then clear the
- client copy:
-
- \code
- texture.setImage(QGLTextureCube::PositiveX, image);
- texture.bind();
- texture.clearImage(QGLTextureCube::PositiveX);
- \endcode
-
- \sa image(), setImage()
-*/
-void QGLTextureCube::clearImage(QGLTextureCube::Face face)
-{
- Q_D(QGLTextureCube);
- if (face == 0)
- d->image = QImage();
- else
- d->otherImages[face - 1] = QImage();
-}
-
-/*!
- Copies the contents of \a image to \a offset in this texture
- within the current GL context. The \a face parameter indicates
- which face of the cube map should be altered.
-
- Unlike setImage(), this function copies the image data to the
- GL server immediately using \c{glTexSubImage2D()}. This is typically
- used to update the contents of a texture after it has been created.
-
- It is assumed that the application has already called bind() on
- this texture to bind it to the current GL context.
-
- If the texture has been created in multiple contexts, only the
- texture identifier for the current context will be updated.
-
- \sa setImage(), bind()
-*/
-void QGLTextureCube::copyImage
- (QGLTextureCube::Face face, const QImage& image, const QPoint& offset)
-{
- if (uint(face) >= 6)
- return; // Invalid face number.
- QImage img = QGLWidget::convertToGLFormat(image);
- glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + int(face),
- 0, offset.x(), offset.y(),
- img.width(), img.height(), GL_RGBA,
- GL_UNSIGNED_BYTE, img.bits());
-#if defined(QT_OPENGL_ES_2)
- Q_D(QGLTextureCube);
- if (d->bindOptions & QGLContext::MipmapBindOption)
- glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
-#endif
-}
-
-/*!
- Returns the options to use when binding the image() to an OpenGL
- context for the first time. The default options are
- QGLContext::LinearFilteringBindOption |
- QGLContext::InvertedYBindOption | QGLContext::MipmapBindOption.
-
- \sa setBindOptions()
-*/
-QGLContext::BindOptions QGLTextureCube::bindOptions() const
-{
- Q_D(const QGLTextureCube);
- return d->bindOptions;
-}
-
-/*!
- Sets the \a options to use when binding the image() to an
- OpenGL context. If the image() has already been bound,
- then changing the options will cause it to be recreated
- from image() the next time bind() is called.
-
- \sa bindOptions(), bind()
-*/
-void QGLTextureCube::setBindOptions(QGLContext::BindOptions options)
-{
- Q_D(QGLTextureCube);
- if (d->bindOptions != options) {
- d->bindOptions = options;
- ++(d->imageGeneration);
- }
-}
-
-/*!
- Returns the wrapping mode for horizontal texture co-ordinates.
- The default value is QGL::Repeat.
-
- \sa setHorizontalWrap(), verticalWrap()
-*/
-QGL::TextureWrap QGLTextureCube::horizontalWrap() const
-{
- Q_D(const QGLTextureCube);
- return d->horizontalWrap;
-}
-
-/*!
- Sets the wrapping mode for horizontal texture co-ordinates to \a value.
-
- If \a value is not supported by the OpenGL implementation, it will be
- replaced with a value that is supported. If the application desires a
- very specific \a value, it can call horizontalWrap() to check that
- the specific value was actually set.
-
- The \a value will not be applied to the texture in the GL
- server until the next call to bind().
-
- \sa horizontalWrap(), setVerticalWrap()
-*/
-void QGLTextureCube::setHorizontalWrap(QGL::TextureWrap value)
-{
- Q_D(QGLTextureCube);
- value = qt_gl_modify_texture_wrap(value);
- if (d->horizontalWrap != value) {
- d->horizontalWrap = value;
- ++(d->parameterGeneration);
- }
-}
-
-/*!
- Returns the wrapping mode for vertical texture co-ordinates.
- The default value is QGL::Repeat.
-
- \sa setVerticalWrap(), horizontalWrap()
-*/
-QGL::TextureWrap QGLTextureCube::verticalWrap() const
-{
- Q_D(const QGLTextureCube);
- return d->verticalWrap;
-}
-
-/*!
- Sets the wrapping mode for vertical texture co-ordinates to \a value.
-
- If \a value is not supported by the OpenGL implementation, it will be
- replaced with a value that is supported. If the application desires a
- very specific \a value, it can call verticalWrap() to check that
- the specific value was actually set.
-
- The \a value will not be applied to the texture in the GL
- server until the next call to bind().
-
- \sa verticalWrap(), setHorizontalWrap()
-*/
-void QGLTextureCube::setVerticalWrap(QGL::TextureWrap value)
-{
- Q_D(QGLTextureCube);
- value = qt_gl_modify_texture_wrap(value);
- if (d->verticalWrap != value) {
- d->verticalWrap = value;
- ++(d->parameterGeneration);
- }
-}
-
-/*!
- Binds this texture to the cube map texture target.
-
- If this texture object is not associated with an identifier in
- the current context, then a new identifier will be created,
- and the face images will be uploaded into the GL server.
-
- If setImage() or setSize() was called since the last upload,
- then the face images will be re-uploaded to the GL server.
-
- Returns false if the texture could not be bound for some reason.
-
- \sa release(), textureId(), setImage()
-*/
-bool QGLTextureCube::bind() const
-{
- Q_D(const QGLTextureCube);
- return const_cast<QGLTextureCubePrivate *>(d)->bind(GL_TEXTURE_CUBE_MAP);
-}
-
-/*!
- Releases the texture associated with the cube map texture target.
- This is equivalent to \c{glBindTexture(GL_TEXTURE_CUBE_MAP, 0)}.
-
- \sa bind()
-*/
-void QGLTextureCube::release()
-{
- glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
-}
-
-/*!
- Returns the identifier associated with this texture object in
- the current context.
-
- Returns zero if the texture has not previously been bound to
- the 2D texture target in the current context with bind().
-
- \sa bind()
-*/
-GLuint QGLTextureCube::textureId() const
-{
- Q_D(const QGLTextureCube);
- const QGLContext *ctx = QGLContext::currentContext();
- if (!ctx)
- return 0;
- QGLTexture2DTextureInfo *info = d->infos;
- while (info != 0 && info->tex.context() != ctx)
- info = info->next;
- return info ? info->tex.textureId() : 0;
-}
-
-/*!
- Constructs a QGLTextureCube object that wraps the supplied literal
- texture identifier \a id, with the dimensions specified by \a size.
-
- The \a id is assumed to have been created by the application in
- the current GL context, and it will be destroyed by the application
- after the returned QGLTextureCube object is destroyed.
-
- This function is intended for interfacing to existing code that
- uses raw GL texture identifiers. The returned QGLTextureCube can
- only be used with the current GL context.
-
- \sa textureId()
-*/
-QGLTextureCube *QGLTextureCube::fromTextureId(GLuint id, const QSize& size)
-{
- const QGLContext *ctx = QGLContext::currentContext();
- if (!id || !ctx)
- return 0;
-
- QGLTextureCube *texture = new QGLTextureCube();
- if (!size.isNull())
- texture->setSize(size);
- QGLTexture2DTextureInfo *info = new QGLTexture2DTextureInfo
- (ctx, id, texture->d_ptr->imageGeneration,
- texture->d_ptr->parameterGeneration, true);
- texture->d_ptr->infos = info;
- return texture;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/textures/qgltexturecube.h b/src/gui/extern/Qt3D/textures/qgltexturecube.h
deleted file mode 100644
index 50855b805cff006af57d440e4dda5380f214388f..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltexturecube.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEXTURECUBEMAP_H
-#define QGLTEXTURECUBEMAP_H
-
-#include "qglnamespace.h"
-#include <QtOpenGL/qgl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLTextureCubePrivate;
-
-class Q_QT3D_EXPORT QGLTextureCube
-{
-public:
- QGLTextureCube();
- ~QGLTextureCube();
-
- enum Face
- {
- PositiveX,
- NegativeX,
- PositiveY,
- NegativeY,
- PositiveZ,
- NegativeZ
- };
-
- bool isNull() const;
- bool hasAlphaChannel() const;
-
- QSize size() const;
- void setSize(const QSize& value);
- QSize requestedSize() const;
-
- QImage image(QGLTextureCube::Face face) const;
- void setImage(QGLTextureCube::Face face, const QImage& image);
- void clearImage(QGLTextureCube::Face face);
-
- void copyImage(QGLTextureCube::Face face, const QImage& image, const QPoint& offset = QPoint(0, 0));
-
- QGLContext::BindOptions bindOptions() const;
- void setBindOptions(QGLContext::BindOptions options);
-
- QGL::TextureWrap horizontalWrap() const;
- void setHorizontalWrap(QGL::TextureWrap value);
-
- QGL::TextureWrap verticalWrap() const;
- void setVerticalWrap(QGL::TextureWrap value);
-
- bool bind() const;
- static void release();
-
- GLuint textureId() const;
-
- static QGLTextureCube *fromTextureId(GLuint id, const QSize& size);
-
-private:
- QScopedPointer<QGLTextureCubePrivate> d_ptr;
-
- Q_DISABLE_COPY(QGLTextureCube)
- Q_DECLARE_PRIVATE(QGLTextureCube)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/textures/qgltextureutils.cpp b/src/gui/extern/Qt3D/textures/qgltextureutils.cpp
deleted file mode 100644
index d577aef272d452f87ccc8a361e935d833a61dc76..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltextureutils.cpp
+++ /dev/null
@@ -1,785 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qgltextureutils_p.h"
-#include "qglext_p.h"
-#include <QtCore/qfile.h>
-
-QT_BEGIN_NAMESPACE
-
-QGL::TextureWrap qt_gl_modify_texture_wrap(QGL::TextureWrap value)
-{
- switch (value) {
-#if defined(QT_OPENGL_ES)
- case QGL::Clamp:
- value = QGL::ClampToEdge;
- break;
-#endif
-#if !defined(QT_OPENGL_ES)
- case QGL::ClampToBorder:
- if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_3)
- == 0)
- value = QGL::Clamp;
- break;
-#else
- case QGL::ClampToBorder:
- value = QGL::ClampToEdge;
- break;
-#endif
-#if !defined(QT_OPENGL_ES)
- case QGL::ClampToEdge:
- if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2)
- == 0)
- value = QGL::Clamp;
- break;
-#endif
-#if !defined(QT_OPENGL_ES)
- case QGL::MirroredRepeat:
- if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_4)
- == 0)
- value = QGL::Repeat;
- break;
-#elif !defined(QT_OPENGL_ES_2)
- case QGL::MirroredRepeat:
- value = QGL::Repeat;
- break;
-#endif
- default: break;
- }
- return value;
-}
-
-QGLTextureExtensions::QGLTextureExtensions(const QGLContext *ctx)
- : npotTextures(false)
- , generateMipmap(false)
- , bgraTextureFormat(false)
- , ddsTextureCompression(false)
- , etc1TextureCompression(false)
- , pvrtcTextureCompression(false)
- , compressedTexImage2D(0)
-{
- Q_UNUSED(ctx);
- QGLExtensionChecker extensions(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)));
- if (extensions.match("GL_ARB_texture_non_power_of_two"))
- npotTextures = true;
- if (extensions.match("GL_SGIS_generate_mipmap"))
- generateMipmap = true;
- if (extensions.match("GL_EXT_bgra"))
- bgraTextureFormat = true;
- if (extensions.match("GL_EXT_texture_compression_s3tc"))
- ddsTextureCompression = true;
- if (extensions.match("GL_OES_compressed_ETC1_RGB8_texture"))
- etc1TextureCompression = true;
- if (extensions.match("GL_IMG_texture_compression_pvrtc"))
- pvrtcTextureCompression = true;
-#if defined(QT_OPENGL_ES_2)
- npotTextures = true;
- generateMipmap = true;
-#endif
-#if !defined(QT_OPENGL_ES)
- if (extensions.match("GL_ARB_texture_compression")) {
- compressedTexImage2D = (q_glCompressedTexImage2DARB)
- ctx->getProcAddress(QLatin1String("glCompressedTexImage2DARB"));
- }
-#else
- compressedTexImage2D = glCompressedTexImage2D;
-#endif
-}
-
-QGLTextureExtensions::~QGLTextureExtensions()
-{
-}
-
-Q_GLOBAL_STATIC(QGLResource<QGLTextureExtensions>, qt_gl_texture_extensions)
-
-QGLTextureExtensions *QGLTextureExtensions::extensions()
-{
- const QGLContext *ctx = QGLContext::currentContext();
- if (!ctx)
- return 0;
- return qt_gl_texture_extensions()->value(ctx);
-}
-
-static void qt_gl_destroyTextureId(GLuint id)
-{
- glDeleteTextures(1, &id);
-}
-
-QGLBoundTexture::QGLBoundTexture()
- : m_resource(qt_gl_destroyTextureId)
- , m_options(QGLContext::DefaultBindOption)
- , m_hasAlpha(false)
-{
-}
-
-QGLBoundTexture::~QGLBoundTexture()
-{
-}
-
-// #define QGL_BIND_TEXTURE_DEBUG
-
-void QGLBoundTexture::startUpload(const QGLContext *ctx, GLenum target, const QSize &imageSize)
-{
- Q_UNUSED(imageSize);
-
- QGLTextureExtensions *extensions = QGLTextureExtensions::extensions();
- if (!extensions)
- return;
-
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf("QGLBoundTexture::startUpload(), imageSize=(%d,%d), options=%x\n",
- imageSize.width(), imageSize.height(), int(m_options));
- time.start();
-#endif
-
-#ifndef QT_NO_DEBUG
- // Reset the gl error stack...
- while (glGetError() != GL_NO_ERROR) ;
-#endif
-
- // Create the texture id for the target, which should be one of
- // GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP.
- GLuint id = m_resource.id();
- if (id) {
- glBindTexture(target, 0); // Just in case texture is bound.
- m_resource.destroy();
- }
- id = 0;
- glGenTextures(1, &id);
- glBindTexture(target, id);
- m_resource.attach(ctx, id);
-
- GLuint filtering = m_options & QGLContext::LinearFilteringBindOption ? GL_LINEAR : GL_NEAREST;
-
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - setting options (%d ms)\n", time.elapsed());
-#endif
- q_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filtering);
-
- if (QGLContext::currentContext()->format().directRendering()
- && extensions->generateMipmap
- && (m_options & QGLContext::MipmapBindOption))
- {
-#if !defined(QT_OPENGL_ES_2)
- glHint(GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST);
- q_glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
-#else
- glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
-#endif
- q_glTexParameteri(target, GL_TEXTURE_MIN_FILTER,
- m_options & QGLContext::LinearFilteringBindOption
- ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST);
- } else {
- q_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filtering);
- m_options &= ~QGLContext::MipmapBindOption;
- }
-}
-
-// map from Qt's ARGB endianness-dependent format to GL's big-endian RGBA layout
-static inline void qt_gl_byteSwapImage(QImage &img, GLenum pixel_type)
-{
- const int width = img.width();
- const int height = img.height();
-
- if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV
- || (pixel_type == GL_UNSIGNED_BYTE && QSysInfo::ByteOrder == QSysInfo::LittleEndian))
- {
- for (int i = 0; i < height; ++i) {
- uint *p = (uint *) img.scanLine(i);
- for (int x = 0; x < width; ++x)
- p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00);
- }
- } else {
- for (int i = 0; i < height; ++i) {
- uint *p = (uint *) img.scanLine(i);
- for (int x = 0; x < width; ++x)
- p[x] = (p[x] << 8) | ((p[x] >> 24) & 0xff);
- }
- }
-}
-
-// #define QGL_BIND_TEXTURE_DEBUG
-
-void QGLBoundTexture::uploadFace
- (GLenum target, const QImage &image, const QSize &scaleSize, GLenum format)
-{
- GLenum internalFormat(format);
-
- // Resolve the texture-related extensions for the current context.
- QGLTextureExtensions *extensions = QGLTextureExtensions::extensions();
- if (!extensions)
- return;
-
- // Adjust the image size for scaling and power of two.
- QSize size = (!scaleSize.isEmpty() ? scaleSize : image.size());
- if (!extensions->npotTextures)
- size = QGL::nextPowerOfTwo(size);
- QImage img(image);
- if (size != image.size()) {
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - scaling up to %dx%d (%d ms) \n", size.width(), size.height(), time.elapsed());
-#endif
- img = img.scaled(size);
- }
- m_size = size;
-
- QImage::Format target_format = img.format();
- bool premul = m_options & QGLContext::PremultipliedAlphaBindOption;
- GLenum externalFormat;
- GLuint pixel_type;
- if (extensions->bgraTextureFormat) {
- externalFormat = GL_BGRA;
- if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2)
- pixel_type = GL_UNSIGNED_INT_8_8_8_8_REV;
- else
- pixel_type = GL_UNSIGNED_BYTE;
- } else {
- externalFormat = GL_RGBA;
- pixel_type = GL_UNSIGNED_BYTE;
- }
-
- switch (target_format) {
- case QImage::Format_ARGB32:
- if (premul) {
- img = img.convertToFormat(target_format = QImage::Format_ARGB32_Premultiplied);
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - converting ARGB32 -> ARGB32_Premultiplied (%d ms) \n", time.elapsed());
-#endif
- }
- break;
- case QImage::Format_ARGB32_Premultiplied:
- if (!premul) {
- img = img.convertToFormat(target_format = QImage::Format_ARGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - converting ARGB32_Premultiplied -> ARGB32 (%d ms)\n", time.elapsed());
-#endif
- }
- break;
- case QImage::Format_RGB16:
- pixel_type = GL_UNSIGNED_SHORT_5_6_5;
- externalFormat = GL_RGB;
- internalFormat = GL_RGB;
- break;
- case QImage::Format_RGB32:
- break;
- default:
- if (img.hasAlphaChannel()) {
- img = img.convertToFormat(premul
- ? QImage::Format_ARGB32_Premultiplied
- : QImage::Format_ARGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - converting to 32-bit alpha format (%d ms)\n", time.elapsed());
-#endif
- } else {
- img = img.convertToFormat(QImage::Format_RGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - converting to 32-bit (%d ms)\n", time.elapsed());
-#endif
- }
- }
-
- if (m_options & QGLContext::InvertedYBindOption) {
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - flipping bits over y (%d ms)\n", time.elapsed());
-#endif
- if (img.isDetached()) {
- int ipl = img.bytesPerLine() / 4;
- int h = img.height();
- for (int y=0; y<h/2; ++y) {
- int *a = (int *) img.scanLine(y);
- int *b = (int *) img.scanLine(h - y - 1);
- for (int x=0; x<ipl; ++x)
- qSwap(a[x], b[x]);
- }
- } else {
- // Create a new image and copy across. If we use the
- // above in-place code then a full copy of the image is
- // made before the lines are swapped, which processes the
- // data twice. This version should only do it once.
- img = img.mirrored();
- }
- }
-
- if (externalFormat == GL_RGBA) {
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - doing byte swapping (%d ms)\n", time.elapsed());
-#endif
- // The only case where we end up with a depth different from
- // 32 in the switch above is for the RGB16 case, where we set
- // the format to GL_RGB
- Q_ASSERT(img.depth() == 32);
- qt_gl_byteSwapImage(img, pixel_type);
- }
-#ifdef QT_OPENGL_ES
- // OpenGL/ES requires that the internal and external formats be
- // identical.
- internalFormat = externalFormat;
-#endif
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - uploading, image.format=%d, externalFormat=0x%x, internalFormat=0x%x, pixel_type=0x%x\n",
- img.format(), externalFormat, internalFormat, pixel_type);
-#endif
-
- const QImage &constRef = img; // to avoid detach in bits()...
- glTexImage2D(target, 0, internalFormat, img.width(), img.height(), 0, externalFormat,
- pixel_type, constRef.bits());
-
- m_hasAlpha = (internalFormat != GL_RGB);
-}
-
-void QGLBoundTexture::createFace
- (GLenum target, const QSize &size, GLenum format)
-{
- glTexImage2D(target, 0, format, size.width(),
- size.height(), 0, format, GL_UNSIGNED_BYTE, 0);
- m_hasAlpha = (format != GL_RGB);
-}
-
-void QGLBoundTexture::finishUpload(GLenum target)
-{
- Q_UNUSED(target);
-
-#if defined(QT_OPENGL_ES_2)
- // OpenGL/ES 2.0 needs to generate mipmaps after all cubemap faces
- // have been uploaded.
- if (m_options & QGLContext::MipmapBindOption) {
-#ifdef QGL_BIND_TEXTURE_DEBUG
- printf(" - generating mipmaps (%d ms)\n", time.elapsed());
-#endif
- glGenerateMipmap(target);
- }
-#endif
-
-#ifndef QT_NO_DEBUG
- GLenum error = glGetError();
- if (error != GL_NO_ERROR) {
- qWarning(" - texture upload failed, error code 0x%x, enum: %d (%x)\n", error, target, target);
- }
-#endif
-
-#ifdef QGL_BIND_TEXTURE_DEBUG
- static int totalUploadTime = 0;
- totalUploadTime += time.elapsed();
- printf(" - upload done in (%d ms) time=%d\n", time.elapsed(), totalUploadTime);
-#endif
-}
-
-// DDS format structure
-struct DDSFormat {
- quint32 dwSize;
- quint32 dwFlags;
- quint32 dwHeight;
- quint32 dwWidth;
- quint32 dwLinearSize;
- quint32 dummy1;
- quint32 dwMipMapCount;
- quint32 dummy2[11];
- struct {
- quint32 dummy3[2];
- quint32 dwFourCC;
- quint32 dummy4[5];
- } ddsPixelFormat;
-};
-
-// compressed texture pixel formats
-#define FOURCC_DXT1 0x31545844
-#define FOURCC_DXT2 0x32545844
-#define FOURCC_DXT3 0x33545844
-#define FOURCC_DXT4 0x34545844
-#define FOURCC_DXT5 0x35545844
-
-#ifndef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-#endif
-
-// PVR header format for container files that store textures compressed
-// with the ETC1, PVRTC2, and PVRTC4 encodings. Format information from the
-// PowerVR SDK at http://www.imgtec.com/powervr/insider/powervr-sdk.asp
-// "PVRTexTool Reference Manual, version 1.11f".
-struct PvrHeader
-{
- quint32 headerSize;
- quint32 height;
- quint32 width;
- quint32 mipMapCount;
- quint32 flags;
- quint32 dataSize;
- quint32 bitsPerPixel;
- quint32 redMask;
- quint32 greenMask;
- quint32 blueMask;
- quint32 alphaMask;
- quint32 magic;
- quint32 surfaceCount;
-};
-
-#define PVR_MAGIC 0x21525650 // "PVR!" in little-endian
-
-#define PVR_FORMAT_MASK 0x000000FF
-#define PVR_FORMAT_PVRTC2 0x00000018
-#define PVR_FORMAT_PVRTC4 0x00000019
-#define PVR_FORMAT_ETC1 0x00000036
-
-#define PVR_HAS_MIPMAPS 0x00000100
-#define PVR_TWIDDLED 0x00000200
-#define PVR_NORMAL_MAP 0x00000400
-#define PVR_BORDER_ADDED 0x00000800
-#define PVR_CUBE_MAP 0x00001000
-#define PVR_FALSE_COLOR_MIPMAPS 0x00002000
-#define PVR_VOLUME_TEXTURE 0x00004000
-#define PVR_ALPHA_IN_TEXTURE 0x00008000
-#define PVR_VERTICAL_FLIP 0x00010000
-
-#ifndef GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG
-#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
-#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
-#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
-#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
-#endif
-
-#ifndef GL_ETC1_RGB8_OES
-#define GL_ETC1_RGB8_OES 0x8D64
-#endif
-
-bool QGLBoundTexture::canBindCompressedTexture
- (const char *buf, int len, const char *format, bool *hasAlpha,
- bool *isFlipped)
-{
- if (QSysInfo::ByteOrder != QSysInfo::LittleEndian) {
- // Compressed texture loading only supported on little-endian
- // systems such as x86 and ARM at the moment.
- return false;
- }
- if (!format) {
- // Auto-detect the format from the header.
- if (len >= 4 && !qstrncmp(buf, "DDS ", 4)) {
- *hasAlpha = true;
- *isFlipped = true;
- return true;
- } else if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4)) {
- const PvrHeader *pvrHeader =
- reinterpret_cast<const PvrHeader *>(buf);
- *hasAlpha = (pvrHeader->alphaMask != 0);
- *isFlipped = ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0);
- return true;
- }
- } else {
- // Validate the format against the header.
- if (!qstricmp(format, "DDS")) {
- if (len >= 4 && !qstrncmp(buf, "DDS ", 4)) {
- *hasAlpha = true;
- *isFlipped = true;
- return true;
- }
- } else if (!qstricmp(format, "PVR") || !qstricmp(format, "ETC1")) {
- if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4)) {
- const PvrHeader *pvrHeader =
- reinterpret_cast<const PvrHeader *>(buf);
- *hasAlpha = (pvrHeader->alphaMask != 0);
- *isFlipped = ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0);
- return true;
- }
- }
- }
- return false;
-}
-
-bool QGLBoundTexture::bindCompressedTexture
- (const char *buf, int len, const char *format)
-{
- if (QSysInfo::ByteOrder != QSysInfo::LittleEndian) {
- // Compressed texture loading only supported on little-endian
- // systems such as x86 and ARM at the moment.
- return false;
- }
-#if !defined(QT_OPENGL_ES)
- QGLTextureExtensions *extensions = QGLTextureExtensions::extensions();
- if (!extensions)
- return false;
- if (!extensions->compressedTexImage2D) {
- qWarning("QGLContext::bindTexture(): The GL implementation does "
- "not support texture compression extensions.");
- return false;
- }
-#endif
- if (!format) {
- // Auto-detect the format from the header.
- if (len >= 4 && !qstrncmp(buf, "DDS ", 4))
- return bindCompressedTextureDDS(buf, len);
- else if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4))
- return bindCompressedTexturePVR(buf, len);
- } else {
- // Validate the format against the header.
- if (!qstricmp(format, "DDS")) {
- if (len >= 4 && !qstrncmp(buf, "DDS ", 4))
- return bindCompressedTextureDDS(buf, len);
- } else if (!qstricmp(format, "PVR") || !qstricmp(format, "ETC1")) {
- if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4))
- return bindCompressedTexturePVR(buf, len);
- }
- }
- return false;
-}
-
-bool QGLBoundTexture::bindCompressedTexture
- (const QString& fileName, const char *format)
-{
- QFile file(fileName);
- if (!file.open(QIODevice::ReadOnly))
- return false;
- QByteArray contents = file.readAll();
- file.close();
- return bindCompressedTexture
- (contents.constData(), contents.size(), format);
-}
-
-bool QGLBoundTexture::bindCompressedTextureDDS(const char *buf, int len)
-{
- QGLTextureExtensions *extensions = QGLTextureExtensions::extensions();
- if (!extensions)
- return false;
-
- // Bail out if the necessary extension is not present.
- if (!extensions->ddsTextureCompression) {
- qWarning("QGLBoundTexture::bindCompressedTextureDDS(): DDS texture compression is not supported.");
- return false;
- }
-
- const DDSFormat *ddsHeader = reinterpret_cast<const DDSFormat *>(buf + 4);
- if (!ddsHeader->dwLinearSize) {
- qWarning("QGLBoundTexture::bindCompressedTextureDDS(): DDS image size is not valid.");
- return false;
- }
-
- int blockSize = 16;
- GLenum format;
-
- switch(ddsHeader->ddsPixelFormat.dwFourCC) {
- case FOURCC_DXT1:
- format = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
- blockSize = 8;
- break;
- case FOURCC_DXT3:
- format = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
- break;
- case FOURCC_DXT5:
- format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
- break;
- default:
- qWarning("QGLBoundTexture::bindCompressedTextureDDS(): DDS image format not supported.");
- return false;
- }
-
- const GLubyte *pixels =
- reinterpret_cast<const GLubyte *>(buf + ddsHeader->dwSize + 4);
-
- GLuint id = m_resource.id();
- if (id) {
- glBindTexture(GL_TEXTURE_2D, 0); // Just in case it is bound.
- m_resource.destroy();
- }
- id = 0;
- glGenTextures(1, &id);
- glBindTexture(GL_TEXTURE_2D, id);
- q_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- q_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- m_resource.attach(QGLContext::currentContext(), id);
-
- int size;
- int offset = 0;
- int available = len - int(ddsHeader->dwSize + 4);
- int w = ddsHeader->dwWidth;
- int h = ddsHeader->dwHeight;
-
- // load mip-maps
- for (int i = 0; i < (int) ddsHeader->dwMipMapCount; ++i) {
- if (w == 0) w = 1;
- if (h == 0) h = 1;
-
- size = ((w+3)/4) * ((h+3)/4) * blockSize;
- if (size > available)
- break;
- extensions->compressedTexImage2D
- (GL_TEXTURE_2D, i, format, w, h, 0, size, pixels + offset);
- offset += size;
- available -= size;
-
- // half size for each mip-map level
- w = w/2;
- h = h/2;
- }
-
- // DDS images are not inverted.
- m_options &= ~QGLContext::InvertedYBindOption;
-
- m_size = QSize(ddsHeader->dwWidth, ddsHeader->dwHeight);
- m_hasAlpha = false;
- return true;
-}
-
-bool QGLBoundTexture::bindCompressedTexturePVR(const char *buf, int len)
-{
- QGLTextureExtensions *extensions = QGLTextureExtensions::extensions();
- if (!extensions)
- return false;
-
- // Determine which texture format we will be loading.
- const PvrHeader *pvrHeader = reinterpret_cast<const PvrHeader *>(buf);
- GLenum textureFormat;
- quint32 minWidth, minHeight;
- switch (pvrHeader->flags & PVR_FORMAT_MASK) {
- case PVR_FORMAT_PVRTC2:
- if (pvrHeader->alphaMask)
- textureFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
- else
- textureFormat = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
- minWidth = 16;
- minHeight = 8;
- break;
-
- case PVR_FORMAT_PVRTC4:
- if (pvrHeader->alphaMask)
- textureFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
- else
- textureFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
- minWidth = 8;
- minHeight = 8;
- break;
-
- case PVR_FORMAT_ETC1:
- textureFormat = GL_ETC1_RGB8_OES;
- minWidth = 4;
- minHeight = 4;
- break;
-
- default:
- qWarning("QGLBoundTexture::bindCompressedTexturePVR(): PVR image format 0x%x not supported.", int(pvrHeader->flags & PVR_FORMAT_MASK));
- return false;
- }
-
- // Bail out if the necessary extension is not present.
- if (textureFormat == GL_ETC1_RGB8_OES) {
- if (!extensions->etc1TextureCompression) {
- qWarning("QGLBoundTexture::bindCompressedTexturePVR(): ETC1 texture compression is not supported.");
- return false;
- }
- } else {
- if (!extensions->pvrtcTextureCompression) {
- qWarning("QGLBoundTexture::bindCompressedTexturePVR(): PVRTC texture compression is not supported.");
- return false;
- }
- }
-
- // Boundary check on the buffer size.
- quint32 bufferSize = pvrHeader->headerSize + pvrHeader->dataSize;
- if (bufferSize > quint32(len)) {
- qWarning("QGLBoundTexture::bindCompressedTexturePVR(): PVR image size is not valid.");
- return false;
- }
-
- // Create the texture.
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLuint id = m_resource.id();
- if (id) {
- glBindTexture(GL_TEXTURE_2D, 0); // Just in case it is bound.
- m_resource.destroy();
- }
- id = 0;
- glGenTextures(1, &id);
- glBindTexture(GL_TEXTURE_2D, id);
- m_resource.attach(QGLContext::currentContext(), id);
- if (pvrHeader->mipMapCount) {
- if ((m_options & QGLContext::LinearFilteringBindOption) != 0) {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
- } else {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
- }
- } else if ((m_options & QGLContext::LinearFilteringBindOption) != 0) {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- } else {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- }
-
- // Load the compressed mipmap levels.
- const GLubyte *buffer =
- reinterpret_cast<const GLubyte *>(buf + pvrHeader->headerSize);
- bufferSize = pvrHeader->dataSize;
- quint32 level = 0;
- quint32 width = pvrHeader->width;
- quint32 height = pvrHeader->height;
- while (bufferSize > 0 && level <= pvrHeader->mipMapCount) {
- quint32 size =
- (qMax(width, minWidth) * qMax(height, minHeight) *
- pvrHeader->bitsPerPixel) / 8;
- if (size > bufferSize)
- break;
- extensions->compressedTexImage2D
- (GL_TEXTURE_2D, GLint(level), textureFormat,
- GLsizei(width), GLsizei(height), 0, GLsizei(size), buffer);
- width /= 2;
- height /= 2;
- buffer += size;
- ++level;
- }
-
- // Restore the default pixel alignment for later texture uploads.
- glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-
- // Set the invert flag for the texture. The "vertical flip"
- // flag in PVR is the opposite sense to our sense of inversion.
- if ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0)
- m_options &= ~QGLContext::InvertedYBindOption;
- else
- m_options |= QGLContext::InvertedYBindOption;
-
- m_size = QSize(pvrHeader->width, pvrHeader->height);
- m_hasAlpha = (pvrHeader->alphaMask != 0);
- return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/textures/qgltextureutils_p.h b/src/gui/extern/Qt3D/textures/qgltextureutils_p.h
deleted file mode 100644
index 1fd80007c8f45ac5ce81fcae6fc206e48e06cd32..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/textures/qgltextureutils_p.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLTEXTUREUTILS_P_H
-#define QGLTEXTUREUTILS_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtOpenGL/qgl.h>
-#include <QtCore/qdatetime.h>
-#include "qglnamespace.h"
-#include "qopenglfunctions.h"
-#include "qglsharedresource_p.h"
-
-QT_BEGIN_NAMESPACE
-
-#ifndef GL_BGRA
-#define GL_BGRA 0x80E1
-#endif
-#ifndef GL_UNSIGNED_SHORT_5_6_5
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#endif
-#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_X
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#endif
-
-#ifndef GL_GENERATE_MIPMAP_SGIS
-#define GL_GENERATE_MIPMAP_SGIS 0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
-#endif
-
-#if !defined(QT_OPENGL_ES)
-#define q_glTexParameteri(target,name,value) \
- glTexParameteri((target), (name), int(value))
-#else
-#define q_glTexParameteri(target,name,value) \
- glTexParameterf((target), (name), GLfloat(int(value)))
-#endif
-
-// Modify a wrapping mode to account for platform differences.
-QGL::TextureWrap qt_gl_modify_texture_wrap(QGL::TextureWrap value);
-
-typedef void (QT3D_GLF_APIENTRYP q_glCompressedTexImage2DARB)
- (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-
-class QGLTextureExtensions
-{
-public:
- QGLTextureExtensions(const QGLContext *ctx);
- ~QGLTextureExtensions();
-
- int npotTextures : 1;
- int generateMipmap : 1;
- int bgraTextureFormat : 1;
- int ddsTextureCompression : 1;
- int etc1TextureCompression : 1;
- int pvrtcTextureCompression : 1;
- q_glCompressedTexImage2DARB compressedTexImage2D;
-
- static QGLTextureExtensions *extensions();
-};
-
-class QGLBoundTexture
-{
-public:
- QGLBoundTexture();
- ~QGLBoundTexture();
-
- const QGLContext *context() const { return m_resource.context(); }
-
- GLuint textureId() const { return m_resource.id(); }
- void setTextureId(const QGLContext *ctx, GLuint id)
- { m_resource.attach(ctx, id); }
- void clearId() { m_resource.clearId(); }
-
- QGLContext::BindOptions options() const { return m_options; }
- void setOptions(QGLContext::BindOptions options) { m_options = options; }
-
- QSize size() const { return m_size; }
- bool hasAlpha() const { return m_hasAlpha; }
-
- void startUpload(const QGLContext *ctx, GLenum target, const QSize &imageSize);
- void uploadFace(GLenum target, const QImage &image, const QSize &scaleSize,
- GLenum format = GL_RGBA);
- void createFace(GLenum target, const QSize &size, GLenum format = GL_RGBA);
- void finishUpload(GLenum target);
-
- static bool canBindCompressedTexture
- (const char *buf, int len, const char *format, bool *hasAlpha,
- bool *isFlipped);
- bool bindCompressedTexture
- (const QString& fileName, const char *format = 0);
- bool bindCompressedTexture
- (const char *buf, int len, const char *format = 0);
- bool bindCompressedTextureDDS(const char *buf, int len);
- bool bindCompressedTexturePVR(const char *buf, int len);
-
-private:
- QGLSharedResource m_resource;
- QGLContext::BindOptions m_options;
- QSize m_size;
- bool m_hasAlpha;
- QTime time;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/Qt3D/viewing/CMakeLists.txt b/src/gui/extern/Qt3D/viewing/CMakeLists.txt
deleted file mode 100644
index b7f97f9f02d9445aacb4ec5ff91fe18d6ede20e1..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-target_sources( gui
- PRIVATE
- qglcameraanimation.h
- qglcameraanimation.cpp
- qglview.cpp
- qglcamera.cpp
- qglcamera.h
- qglview.h
- )
diff --git a/src/gui/extern/Qt3D/viewing/qglcamera.cpp b/src/gui/extern/Qt3D/viewing/qglcamera.cpp
deleted file mode 100644
index bd16d7b466c467478cf322a04768917ed6a07550..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglcamera.cpp
+++ /dev/null
@@ -1,1328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcamera.h"
-#include "qglpainter.h"
-#include <QtGui/qquaternion.h>
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLCamera
- \brief The QGLCamera class defines the projection to apply to simulate a camera's position, orientation, and optics.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::viewing
-
- \section1 Modelview and projection transformations
-
- A QGLCamera instance is applied to the scene in two phases:
- modelview transformation and projection transformation.
-
- During the modelview transformation, the eye(), center(), and
- upVector() are used to generate a 4x4 transformation matrix that
- reflects the viewer's current position and orientation.
-
- During the projection transformation, the projectionType(),
- nearPlane(), farPlane(), fieldOfView(), and viewSize() are used
- to define a viewing volume as a 4x4 transformation matrix.
-
- The modelview transformation matrix is returned by modelViewMatrix().
- The projection transformation matrix is returned by projectionMatrix().
-
- \section1 Positioning and orienting the view
-
- The viewer position and orientation are defined by eye(), center(),
- and upVector(). The location of the viewer in world co-ordinates is
- given by eye(), the viewer is looking at the object of interest located
- at center(), and the upVector() specifies the direction that should
- be considered "up" with respect to the viewer.
-
- The vector from the eye() to the center() is called the "view vector",
- and the cross-product of the view vector and upVector() is called
- the "side vector". The view vector specifies the direction the
- viewer is looking, and the side vector points off to the right of
- the viewer.
-
- It is recommended that the view vector and upVector() be at right angles
- to each other, but this is not required as long as the angle between
- them is close to 90 degrees.
-
- The most common use of view and up vectors that are not at right angles
- is to simulate a human eye at a specific height above the ground looking
- down at a lower object or up at a higher object. In this case, the
- the view vector will not be true horizontal, but the upVector() indicating
- the human's upright stance will be true vertical.
-
- \section1 Zooming the camera image
-
- There are two ways to zoom the image seen through the camera: either
- the camera eye() position can be moved closer to the object of interest,
- or the field of view of the camera lens can be changed to make it appear
- as though the object is moving closer.
-
- Changing the eye() position changes the lighting calculation in the
- scene because the viewer is in a different position, changing the
- angle of light reflection on the object's surface.
-
- The setFieldOfView() function can be used to simulate the effect of a
- camera lens. The smaller the fieldOfView(), the closer the object
- will appear. The lighting calculation will be the same as for the
- unzoomed scene.
-
- If fieldOfView() is zero, then a standard perspective frustum of
- viewSize() is used to define the viewing volume. The viewSize()
- can be adjusted with setViewSize() to zoom the view. A smaller
- viewSize() will make the the object appear closer.
-
- The fieldOfView() or viewSize() is applied as part of the
- projectionMatrix().
-
- \section1 Rotating the viewer or object of interest
-
- Rotating a viewer in 3D space is a very delicate process. It is very
- easy to construct the rotation incorrectly and end up in a "gimbal lock"
- state where further rotations are impossible in certain directions.
-
- To help alleviate this problem, QGLCamera uses a quaternion-based
- approach to generate rotations. A quaternion is a compact representation
- of a rotation in 3D space. Rotations can be combined through quaternion
- multiplication. More information on quaternions can be found in the
- documentation for QQuaternion.
-
- Before rotating the view, you should first decide the type
- of rotation you want to perform:
-
- \list
- \i Tilting or panning a fixed eye to reveal the scene in different
- directions and orientations. This is equivalent to mounting a camera
- on a fixed tripod and then adjusting the direction of view and
- orientation with the tripod controls.
- \i Rotating a moving viewer about the object of interest. This is
- equivalent to moving the viewer around the object at a fixed distance,
- but with the viewer always pointing at the object.
- \endlist
-
- In the QGLCamera class, the first type of rotation is performed with
- rotateEye() and the second with rotateCenter(). Each of these functions
- take a quaternion argument that defines the type of rotation to perform.
-
- The tilt(), pan(), and roll() functions return values that can help with
- constructing the rotation quaternions to pass to rotateEye() and
- rotateCenter(). Tilt and pan are also known as "pitch" and "yaw" in
- flight dynamics.
-
- Three axes of rotation are used to compute the quaternions. The tilt()
- quaternion is computed with respect to the side vector, the pan()
- quaterion is computed with respect to the upVector(), and the roll()
- quaternion is computed with respect to the view vector.
-
- The following example tilts the direction the eye() is pointing
- by 5 degrees, and then pans by 45 degrees:
-
- \code
- camera.rotateEye(camera.tilt(5));
- camera.rotateEye(camera.pan(45));
- \endcode
-
- The next example performs the two rotations in a single fluid step
- (note that the rotation to be performed first is multiplied last):
-
- \code
- camera.rotateEye(camera.pan(45) * camera.tilt(5));
- \endcode
-
- These two examples will not produce the same visual result, even though
- it looks like they might. In the first example, the upVector() is tilted
- before the pan() quaternion is computed. In the second example, the pan()
- quaternion is computed using the original upVector().
-
- This difference in behavior is useful in different situations. Some
- applications may wish to perform all rotations relative to the original
- viewer orientation, and other applications may wish to perform rotations
- relative to the current viewer orientation. These application types
- correspond to the second and first examples above.
-
- \section1 Moving the viewer or object of interest
-
- The simplest way to move the viewer or object of interest is to call
- setEye() or setCenter() respectively and supply a new position in
- world co-ordinates. However, this can lead to non-intuitive movements
- if the viewer orientation is not aligned with the world co-ordinate axes.
-
- For example, subtracting 3 from the eye() x co-ordinate will appear to
- move the eye left 3 units if the viewer orientation is aligned with the
- world co-ordinate axes. But it will not appear to move the eye left 3
- units in any other orientation.
-
- The translation() function can be used to construct a translation
- vector that is aligned with the viewer's current orientation.
- Movement in the x direction will move along the side vector, movement in
- the y direction will move along upVector(), and movement in the z
- direction will move along the view vector.
-
- The translation() function is useful when implementing operations such
- as "step left", "jump up", and so on where the movement should be
- interpreted relative to the viewer's current orientation, not the
- world co-ordinate axes,
-
- In other words, the following two lines of code are not equivalent
- unless the view is oriented with the world co-ordinate axes:
-
- \code
- camera.translateEye(camera.translation(x, y, z));
-
- camera.translateEye(QVector3D(x, y, z));
- \endcode
-
- The following example translates the eye() position while
- keeping the object of interest at the original center():
-
- \code
- camera.translateEye(camera.translation(x, y, z));
- \endcode
-
- The following example translates the object of interest at
- center() while keeping the eye() position fixed:
-
- \code
- camera.translateCenter(camera.translation(x, y, z));
- \endcode
-
- The following example translates both the eye() and the center()
- by the same amount, which will maintain the original view vector.
-
- \code
- QVector3D vector = camera.translation(x, y, z);
- camera.translateEye(vector);
- camera.translateCenter(vector);
- \endcode
-
- It is important that the translation vector for center() be computed
- before eye() is translated if both eye() and center() must move by the
- same amount. The following code translates center() in the viewer
- orientation after the eye() is translated:
-
- \code
- camera.translateEye(camera.translation(x, y, z));
- camera.translateCenter(camera.translation(x, y, z));
- \endcode
-
- Translating both eye() and center() by the same amount can be used
- to simulate sliding a viewer past a scene while always looking in the
- same direction (for example, filming a scene from a moving vehicle).
- An alternative is to fix the viewer and move the scene itself:
- the negation of the translation() vector can be applied to the
- scene's modelview transformation.
-
- \section1 Motion tracking
-
- Viewing of 3D scenes can be enhanced if there is some way to track
- the motion of the viewer or the orientation of the display device.
-
- Applications can use setMotionAdjustment() to alter the position
- of the camera to account for the viewer's motion. This indicates
- the viewer's position relative to the center of the screen.
- The motionAdjustment() vector is used to determine by how much
- the camera position should be adjusted. The distance of the viewer
- from the screen is ignored.
-
- On handheld devices that use accelerometers to determine the
- orientation of the device, the down vector due to gravity
- can be adjusted to serve as a motion tracking vector.
-
- The output of motion tracking hardware can be very noisy,
- with minor fluctuations due to viewer twitch movements or
- environmental factors. The application is responsible for
- cleaning up the signal and removing these fluctuations before
- setMotionAdjustment() is called.
-
- \section1 Stereo projections
-
- QGLCamera can adjust the camera position for rendering separate left
- and right eye images by setting eyeSeparation() to a non-zero value.
- The eyeSeparation() is in world co-ordinates.
-
- Objects that are placed at center() will coincide in the left and
- right eye images, establishing the logical center of the stereo
- effect. Objects that are closer to the eye() will be rendered
- to appear closer in the stereo effect, and objects that are further
- away from eye() than center() will be rendered to appear further away.
-
- Perspective and Orthographic projections incorporate the
- eyeSeparation() into the modelViewMatrix() by altering the
- eye() position.
-
- \sa QGLView, QGLPainter
-*/
-
-/*!
- \qmlclass Camera QGLCamera
- \brief The Camera item defines the viewing position and projection for a 3D scene.
- \since 4.8
- \ingroup qt3d::qml3d
-
- Camera instances are defined on a \l Viewport item using the
- Viewport::camera property:
-
- \code
- import QtQuick 1.0
- import Qt3D 1.0
-
- Viewport {
- width: 640; height: 480
- camera: Camera {
- eye: Qt.vector3d(-1, 2, 10)
- }
- light: Light {}
- Item3D {
- mesh: Mesh { source: "meshes/teapot.bez" }
- effect: Effect {}
- }
- }
- \endcode
-
- \section1 Positioning and orienting the view
-
- The viewer position and orientation are defined by \l eye, \l center,
- and \l upVector. The location of the viewer in world co-ordinates is
- given by \l eye, the viewer is looking at the object of interest located
- at \l center, and the \l upVector specifies the direction that should
- be considered "up" with respect to the viewer.
-
- The vector from the \l eye to the \l center is called the "view vector",
- and the cross-product of the view vector and \l upVector is called
- the "side vector". The view vector specifies the direction the
- viewer is looking, and the side vector points off to the right of
- the viewer.
-
- It is recommended that the view vector and \l upVector be at right angles
- to each other, but this is not required as long as the angle between
- them is close to 90 degrees.
-
- The most common use of view and up vectors that are not at right angles
- is to simulate a human eye at a specific height above the ground looking
- down at a lower object or up at a higher object. In this case, the
- the view vector will not be true horizontal, but the \l upVector
- indicating the human's upright stance will be true vertical.
-
- \section1 Zooming the camera image
-
- There are two ways to zoom the image seen through the camera: either
- the camera \l eye position can be moved closer to the object of interest,
- or the field of view of the camera lens can be changed to make it appear
- as though the object is moving closer.
-
- Changing the \l eye position changes the lighting calculation in the
- scene because the viewer is in a different position, changing the
- angle of light reflection on the object's surface.
-
- The \l fieldOfView property function can be used to simulate the effect
- of a camera lens. The smaller the \l fieldOfView, the closer the object
- will appear. The lighting calculation will be the same as for the
- unzoomed scene.
-
- If \l fieldOfView is zero, then a standard perspective frustum of
- is used to define the viewing volume based on the width and height
- of the \l Viewport.
-
- \section1 Stereo projections
-
- Camera can adjust the camera position for rendering separate left
- and right eye images by setting the \l eyeSeparation property
- to a non-zero value. The \l eyeSeparation is in world co-ordinates.
-
- Objects that are placed at \l center will coincide in the left and
- right eye images, establishing the logical center of the stereo
- effect. Objects that are closer to the \l eye will be rendered
- to appear closer in the stereo effect, and objects that are further
- away from \l eye than \l center will be rendered to appear further away.
-
- \sa Viewport
-*/
-
-class QGLCameraPrivate
-{
-public:
- QGLCameraPrivate();
-
- QGLCamera::ProjectionType projectionType;
- qreal fieldOfView;
- qreal nearPlane;
- qreal farPlane;
- QSizeF viewSize;
- QSizeF minViewSize;
- int screenRotation;
- QVector3D eye;
- QVector3D upVector;
- QVector3D center;
- QVector3D viewVector;
- qreal eyeSeparation;
- QVector3D motionAdjustment;
- QQuaternion motionQuaternion;
- bool adjustForAspectRatio;
-};
-
-QGLCameraPrivate::QGLCameraPrivate()
- : projectionType(QGLCamera::Perspective),
- fieldOfView(0.0f),
- nearPlane(5.0f),
- farPlane(1000.0f),
- viewSize(2.0f, 2.0f),
- minViewSize(0.0001f, 0.0001f),
- screenRotation(0),
- eye(0.0f, 0.0f, 10.0f),
- upVector(0.0f, 1.0f, 0.0f),
- center(0.0f, 0.0f, 0.0f),
- viewVector(0.0f, 0.0f, -10.0f),
- eyeSeparation(0.0f),
- motionAdjustment(0.0f, 0.0f, 1.0f),
- adjustForAspectRatio(true)
-{
-}
-
-/*!
- Constructs a QGLCamera with the default properties and
- attaches it to \a parent.
-*/
-QGLCamera::QGLCamera(QObject *parent)
- : QObject(parent), d_ptr(new QGLCameraPrivate)
-{
-}
-
-/*!
- Destroys this QGLCamera object.
-*/
-QGLCamera::~QGLCamera()
-{
- delete d_ptr;
-}
-
-/*!
- \enum QGLCamera::ProjectionType
- This enum defines the type of view projection to use for a QGLCamera.
-
- \value Perspective Use a perspective view.
- \value Orthographic Use an orthographic view.
-*/
-
-/*!
- \property QGLCamera::projectionType
- \brief the projection type for this camera. The default is Perspective.
-*/
-
-/*!
- \qmlproperty enumeration Camera::projectionType
-
- The projection type for this camera, which is one of:
-
- \list
- \o Perspective Use a perspective view. This is the default.
- \o Orthographic Use an orthographic view.
- \endlist
-*/
-
-QGLCamera::ProjectionType QGLCamera::projectionType() const
-{
- Q_D(const QGLCamera);
- return d->projectionType;
-}
-
-void QGLCamera::setProjectionType(QGLCamera::ProjectionType value)
-{
- Q_D(QGLCamera);
- if (d->projectionType != value) {
- d->projectionType = value;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::fieldOfView
- \brief the field of view in degrees for a perspective projection.
-
- The default value is zero, which indicates a standard perspective
- frustum view volume of viewSize() in size. If the value is not
- zero, then viewSize() is ignored.
-
- This value is ignored if projectionType() is not Perspective.
-
- \sa viewSize()
-*/
-
-/*!
- \qmlproperty real Camera::fieldOfView
- The field of view in degrees for a perspective projection.
-
- The default value is zero, which indicates a standard perspective
- frustum view volume.
-
- This value is ignored if projectionType is not Perspective.
-
- \sa projectionType
-*/
-
-qreal QGLCamera::fieldOfView() const
-{
- Q_D(const QGLCamera);
- return d->fieldOfView;
-}
-
-void QGLCamera::setFieldOfView(qreal angle)
-{
- Q_D(QGLCamera);
- if (d->fieldOfView != angle) {
- d->fieldOfView = angle;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::nearPlane
- \brief the distance from the eye to the near clipping plane.
- The default value is 5.
-
- \sa farPlane()
-*/
-
-/*!
- \qmlproperty real Camera::nearPlane
- The distance from the eye to the near clipping plane.
- The default value is 5.
-
- \sa farPlane
-*/
-
-qreal QGLCamera::nearPlane() const
-{
- Q_D(const QGLCamera);
- return d->nearPlane;
-}
-
-void QGLCamera::setNearPlane(qreal value)
-{
- Q_D(QGLCamera);
- if (d->nearPlane != value) {
- d->nearPlane = value;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::farPlane
- \brief the distance from the eye to the far clipping plane.
- The default value is 1000.
-
- \sa nearPlane()
-*/
-
-/*!
- \qmlproperty real Camera::farPlane
- The distance from the eye to the far clipping plane.
- The default value is 1000.
-
- \sa nearPlane
-*/
-
-qreal QGLCamera::farPlane() const
-{
- Q_D(const QGLCamera);
- return d->farPlane;
-}
-
-void QGLCamera::setFarPlane(qreal value)
-{
- Q_D(QGLCamera);
- if (d->farPlane != value) {
- d->farPlane = value;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::viewSize
- \brief the size of the front of the projection viewing volume.
- The viewing volume is assumed to be centered on the origin.
-
- The default value is (2, 2), which indicates a viewing volume front
- from (-1, -1) to (1, 1).
-
- If the width or height of the viewing volume is negative, then the
- co-ordinates will be swapped. For example, a size of (2, -2) will
- flip the vertical axis upside down for a viewing volume from
- (-1, 1) to (1, -1).
-
- The view size will be further adjusted by the window's aspect ratio
- when projectionMatrix() is called. For best results, the width and
- height of the view size should be the same to define an ideal square
- viewing volume, which is then extended to the final viewing volume
- width and height based on the window's aspect ratio.
-
- \sa projectionMatrix(), minViewSize()
-*/
-QSizeF QGLCamera::viewSize() const
-{
- Q_D(const QGLCamera);
- return d->viewSize;
-}
-
-void QGLCamera::setViewSize(const QSizeF& size)
-{
- Q_D(QGLCamera);
- QSizeF sz(size);
- if (qAbs(sz.width()) < d->minViewSize.width()) {
- if (sz.width() >= 0.0f)
- sz.setWidth(d->minViewSize.width());
- else
- sz.setWidth(-d->minViewSize.width());
- }
- if (qAbs(sz.height()) < d->minViewSize.height()) {
- if (sz.height() >= 0.0f)
- sz.setHeight(d->minViewSize.height());
- else
- sz.setHeight(-d->minViewSize.height());
- }
- if (d->viewSize != sz) {
- d->viewSize = sz;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::minViewSize
- \brief the minimum size of the front of the projection viewing volume.
-
- The minimum view size is used to clamp viewSize() when zooming
- the camera closer to an object to prevent it "passing through"
- the object and causing the scale factor to become infinite.
-
- The default value is (0.0001, 0.0001).
-
- \sa projectionMatrix(), viewSize()
-*/
-QSizeF QGLCamera::minViewSize() const
-{
- Q_D(const QGLCamera);
- return d->minViewSize;
-}
-
-void QGLCamera::setMinViewSize(const QSizeF& size)
-{
- Q_D(QGLCamera);
- if (d->minViewSize != size) {
- d->minViewSize = size;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::screenRotation
- \brief the screen rotation angle in degrees. The default
- value is 0. If this value is 90 or 270, then the view
- will be flipped width for height. The only supported values
- are 0, 90, 180, and 270. The screen is rotated around the
- positive z axis.
-
- This setting is intended for simple screen rotations on handheld
- devices that can be held in either portrait or landscape orientations.
- The entire screen image is rotated so that it can be viewed in a
- different device orientation.
-
- Use rotateEye() or rotateCenter() for more complex rotations
- that are not aligned with 0, 90, 180, or 270 degrees.
-*/
-
-int QGLCamera::screenRotation() const
-{
- Q_D(const QGLCamera);
- return d->screenRotation;
-}
-
-void QGLCamera::setScreenRotation(int angle)
-{
- Q_D(QGLCamera);
- if (d->screenRotation != angle) {
- d->screenRotation = angle;
- emit projectionChanged();
- }
-}
-
-/*!
- \property QGLCamera::eye
- \brief the position of the viewer's eye. The default value is (0, 0, 10).
-
- \sa translateEye(), upVector(), center(), eyeSeparation()
- \sa motionAdjustment()
-*/
-
-/*!
- \qmlproperty vector3D Camera::eye
- The position of the viewer's eye. The default value is (0, 0, 10).
-
- \sa upVector, center, eyeSeparation
-*/
-QVector3D QGLCamera::eye() const
-{
- Q_D(const QGLCamera);
- return d->eye;
-}
-
-void QGLCamera::setEye(const QVector3D& vertex)
-{
- Q_D(QGLCamera);
- if (d->eye != vertex) {
- d->eye = vertex;
- d->viewVector = d->center - d->eye;
- emit viewChanged();
- }
-}
-
-/*!
- Adjusts the position of the viewer's eye by the components
- (\a x, \a y, \a z), where the components are interpreted relative
- to the viewer's current orientation. See translation() for more
- information.
-
- This function is accessible to QML on the Camera item.
-
- \sa eye(), setEye(), translateCenter()
-*/
-void QGLCamera::translateEye(qreal x, qreal y, qreal z)
-{
- Q_D(QGLCamera);
- d->eye += translation(x, y, z);
- d->viewVector = d->center - d->eye;
- emit viewChanged();
-}
-
-/*!
- \property QGLCamera::upVector
- \brief the up vector for the viewer. The default value is (0, 1, 0).
-
- \sa eye(), center()
-*/
-
-/*!
- \qmlproperty vector3D Camera::upVector
- The up vector for the viewer. The default value is (0, 1, 0).
-
- \sa eye, center
-*/
-
-QVector3D QGLCamera::upVector() const
-{
- Q_D(const QGLCamera);
- return d->upVector;
-}
-
-void QGLCamera::setUpVector(const QVector3D& vector)
-{
- Q_D(QGLCamera);
- if (d->upVector != vector) {
- d->upVector = vector;
- emit viewChanged();
- }
-}
-
-/*!
- \property QGLCamera::center
- \brief the center of the view visible from the viewer's position.
- The default value is (0, 0, 0).
-
- \sa translateCenter(), eye(), upVector()
-*/
-
-/*!
- \qmlproperty vector3D Camera::center
- The center of the view visible from the viewer's position.
- The default value is (0, 0, 0).
-
- \sa eye, upVector
-*/
-
-QVector3D QGLCamera::center() const
-{
- Q_D(const QGLCamera);
- return d->center;
-}
-
-void QGLCamera::setCenter(const QVector3D& vertex)
-{
- Q_D(QGLCamera);
- if (d->center != vertex) {
- d->center = vertex;
- d->viewVector = d->center - d->eye;
- emit viewChanged();
- }
-}
-
-/*!
- Adjusts the center of the view by the components (\a x, \a y, \a z),
- where the components are interpreted relative to the viewer's current
- orientation. See translation() for more information.
-
- This function is accessible to QML on the Camera item.
-
- \sa center(), setCenter(), translateEye()
-*/
-void QGLCamera::translateCenter(qreal x, qreal y, qreal z)
-{
- Q_D(QGLCamera);
- d->center += translation(x, y, z);
- d->viewVector = d->center - d->eye;
- emit viewChanged();
-}
-
-/*!
- \property QGLCamera::eyeSeparation
- \brief the separation between the eyes when stereo viewing is in use,
- with eye() specifying the mid-point between the eyes. The default
- value is 0.
-
- \sa eye()
-*/
-
-/*!
- \qmlproperty real Camera::eyeSeparation
- The separation between the eyes when stereo viewing is in use,
- with \l eye property specifying the mid-point between the eyes.
- The default value is 0.
-
- \sa eye
-*/
-
-qreal QGLCamera::eyeSeparation() const
-{
- Q_D(const QGLCamera);
- return d->eyeSeparation;
-}
-
-void QGLCamera::setEyeSeparation(qreal value)
-{
- Q_D(QGLCamera);
- if (d->eyeSeparation != value) {
- d->eyeSeparation = value;
- emit viewChanged();
- }
-}
-
-/*!
- \property QGLCamera::motionAdjustment
- \brief the adjustment vector to apply to the eye() for user motion.
-
- This property is typically used to implement motion tracking.
- It is interpreted as a vector from the center of the screen to the
- current position of the viewer. The angle between the motion
- adjustment vector and the screen center is used to adjust the
- position of the eye() when modelViewMatrix() is called.
-
- The default value is (0, 0, 1), which indicates a viewer
- directly in front of the center of the screen.
-
- The units for the vector are unspecified. They could be
- meters, centimeters, or the force due to gravity in various
- directions from an accelerometer. The angle defined
- by the vector is used to perform the adjustment, not its
- magnitude.
-
- The output of motion tracking hardware can be very noisy,
- with minor fluctuations due to viewer twitch movements or
- environmental factors. The application is responsible for
- cleaning up the signal and removing these fluctuations before
- altering this property.
-
- \sa eye(), modelViewMatrix()
-*/
-
-QVector3D QGLCamera::motionAdjustment() const
-{
- Q_D(const QGLCamera);
- return d->motionAdjustment;
-}
-
-void QGLCamera::setMotionAdjustment(const QVector3D& vector)
-{
- Q_D(QGLCamera);
- if (d->motionAdjustment != vector) {
- d->motionAdjustment = vector;
- if (vector.x() == 0.0f && vector.y() == 0.0f) {
- // If the vector is centered, then don't perform any rotations.
- d->motionQuaternion = QQuaternion();
- } else {
- // Determine the pan and tilt angles from the vector.
- QVector3D view = -vector.normalized();
- if (view.z() < 0.0f)
- view = -view;
- qreal xangle = asin(view.x()) * 180.0f / M_PI;
- qreal yangle = asin(-view.y()) * 180.0f / M_PI;
-
- // Construct the pan and tilt quaternions.
- if (qFuzzyIsNull(xangle))
- d->motionQuaternion = tilt(yangle);
- else if (qFuzzyIsNull(yangle))
- d->motionQuaternion = pan(xangle);
- else
- d->motionQuaternion = tilt(yangle) * pan(xangle);
- }
- emit viewChanged();
- }
-}
-
-/*!
- \property QGLCamera::adjustForAspectRatio
- \brief the adjustment state of the aspect ratio in the viewing volume.
-
- By default, QGLCamera adjusts the viewing volume for the aspect
- ratio of the window so that pixels appear square without the
- application needing to adjust viewSize() manually.
-
- If this property is false, then the aspect ratio adjustment is
- not performed.
-*/
-
-/*!
- \qmlproperty bool Camera::adjustForAspectRatio
- The adjustment state of the aspect ratio in the viewing volume.
-
- By default, the camera adjusts the viewing volume for the aspect
- ratio of the window so that pixels appear square without the
- application needing to adjust the view size manually.
-
- If this property is false, then the aspect ratio adjustment is
- not performed.
-
- \sa projectionType
-*/
-
-bool QGLCamera::adjustForAspectRatio() const
-{
- Q_D(const QGLCamera);
- return d->adjustForAspectRatio;
-}
-
-void QGLCamera::setAdjustForAspectRatio(bool value)
-{
- Q_D(QGLCamera);
- if (d->adjustForAspectRatio != value) {
- d->adjustForAspectRatio = value;
- emit viewChanged();
- }
-}
-
-/*!
- Returns the quaternion corresponding to tilting the view up or
- down by \a angle degrees. The returned quaternion can be applied to
- the eye() position with rotateEye() or to the center() position with
- rotateCenter().
-
- \sa pan(), roll(), rotateEye(), rotateCenter()
-*/
-QQuaternion QGLCamera::tilt(qreal angle) const
-{
- Q_D(const QGLCamera);
- QVector3D side = QVector3D::crossProduct(d->viewVector, d->upVector);
- return QQuaternion::fromAxisAndAngle(side, angle);
-}
-
-/*!
- Returns the quaternion corresponding to panning the view left or
- right by \a angle degrees. The returned quaternion can be applied to
- the eye() position with rotateEye() or to the center() position with
- rotateCenter().
-
- \sa tilt(), roll(), rotateEye(), rotateCenter()
-*/
-QQuaternion QGLCamera::pan(qreal angle) const
-{
- Q_D(const QGLCamera);
- return QQuaternion::fromAxisAndAngle(d->upVector, angle);
-}
-
-/*!
- Returns the quaternion corresponding to rolling the view left or
- right by \a angle degrees. The returned quaternion can be applied to
- the eye() position with rotateEye() or to the center() position with
- rotateCenter().
-
- \sa tilt(), pan(), rotateEye(), rotateCenter()
-*/
-QQuaternion QGLCamera::roll(qreal angle) const
-{
- Q_D(const QGLCamera);
- return QQuaternion::fromAxisAndAngle(d->viewVector, angle);
-}
-
-/*!
- Rotates the orientation of the eye() according to the quaternion \a q.
- The eye() will remain in the same position, but the upVector() and
- center() may be altered by the rotation.
-
- \sa rotateCenter(), tilt(), pan(), roll()
-*/
-void QGLCamera::rotateEye(const QQuaternion& q)
-{
- Q_D(QGLCamera);
- d->upVector = q.rotatedVector(d->upVector);
- d->viewVector = q.rotatedVector(d->viewVector);
- d->center = d->eye + d->viewVector;
- emit viewChanged();
-}
-
-/*!
- Rotates the position and orientation of the eye() around center()
- according to the quaternion \a q. The center() will remain in the
- same position, but the upVector() and eye() may be altered by
- the rotation.
-
- \sa rotateEye(), tilt(), pan(), roll()
-*/
-void QGLCamera::rotateCenter(const QQuaternion& q)
-{
- Q_D(QGLCamera);
- d->upVector = q.rotatedVector(d->upVector);
- d->viewVector = q.rotatedVector(d->viewVector);
- d->eye = d->center - d->viewVector;
- emit viewChanged();
-}
-
-/*!
- Returns a translation vector that can be used to adjust the eye()
- or center() by \a x units side-ways, \a y units up,
- and \a z units forwards.
-
- This function is useful when implementing operations such as
- "step left", "jump up", and so on where the movement should be
- interpreted relative to the viewer's current orientation, not the
- world co-ordinate axes.
-
- The following example moves the eye() 2 units to the right of the
- current eye position while keeping the same center() of interest:
-
- \code
- camera.setEye(camera.eye() + camera.translation(2, 0, 0));
- \endcode
-
- \sa translateEye(), translateCenter()
-*/
-QVector3D QGLCamera::translation(qreal x, qreal y, qreal z) const
-{
- Q_D(const QGLCamera);
- QVector3D vector(0.0f, 0.0f, 0.0f);
- if (x != 0.0f)
- vector += QVector3D::normal(d->viewVector, d->upVector) * x;
- if (y != 0.0f)
- vector += d->upVector.normalized() * y;
- if (z != 0.0f)
- vector += d->viewVector.normalized() * z;
- return vector;
-}
-
-/*!
- Returns the transformation matrix to apply to the projection matrix
- to present the scene as viewed from the camera position.
-
- The \a aspectRatio specifies the aspect ratio of the window the
- camera view is being displayed in. An \a aspectRatio of 1 indicates that
- the window is square. An \a aspectRatio greater than 1 indicates that
- the window is wider than it is high. An \a aspectRatio less than 1
- indicates that the window is higher than it is wide.
-
- \sa modelViewMatrix()
-*/
-QMatrix4x4 QGLCamera::projectionMatrix(qreal aspectRatio) const
-{
- Q_D(const QGLCamera);
- QMatrix4x4 m;
- if (!d->adjustForAspectRatio)
- aspectRatio = 1.0f;
- if (d->screenRotation != 0) {
- m.rotate((qreal)(d->screenRotation), 0.0f, 0.0f, 1.0f);
- if (d->screenRotation == 90 || d->screenRotation == 270) {
- if (aspectRatio != 0.0f)
- aspectRatio = 1.0f / aspectRatio;
- }
- }
- if (d->projectionType == Perspective && d->fieldOfView != 0.0f) {
- m.perspective(d->fieldOfView, aspectRatio,
- d->nearPlane, d->farPlane);
- } else {
- qreal halfWidth = d->viewSize.width() / 2.0f;
- qreal halfHeight = d->viewSize.height() / 2.0f;
- if (aspectRatio > 1.0f) {
- halfWidth *= aspectRatio;
- } else if (aspectRatio > 0.0f && aspectRatio < 1.0f) {
- halfHeight /= aspectRatio;
- }
- if (d->projectionType == Perspective) {
- m.frustum(-halfWidth, halfWidth, -halfHeight, halfHeight,
- d->nearPlane, d->farPlane);
- } else {
- m.ortho(-halfWidth, halfWidth, -halfHeight, halfHeight,
- d->nearPlane, d->farPlane);
- }
- }
- return m;
-}
-
-/*!
- Returns the transformation to apply to the modelview matrix
- to present the scene as viewed from the eye position.
-
- The \a eye parameter is used to adjust the camera's position
- horizontally by half of eyeSeparation() if \a eye is QGL::LeftEye
- or QGL::RightEye.
-
- \sa projectionMatrix()
-*/
-QMatrix4x4 QGLCamera::modelViewMatrix(QGL::Eye eye) const
-{
- Q_D(const QGLCamera);
- QMatrix4x4 m;
- QVector3D adjust;
- if (eye == QGL::LeftEye)
- adjust = translation(-d->eyeSeparation / 2.0f, 0.0f, 0.0f);
- else if (eye == QGL::RightEye)
- adjust = translation(d->eyeSeparation / 2.0f, 0.0f, 0.0f);
- if (d->motionQuaternion.isIdentity()) {
- m.lookAt(d->eye + adjust, d->center, d->upVector);
- } else {
- QVector3D up = d->motionQuaternion.rotatedVector(d->upVector);
- QVector3D view = d->motionQuaternion.rotatedVector(d->viewVector);
- m.lookAt(d->center - view + adjust, d->center, up);
- }
- return m;
-}
-
-/*!
- Maps \a point from viewport co-ordinates to eye co-ordinates.
- The size of the viewport is given by \a viewportSize, and its
- aspect ratio by \a aspectRatio.
-
- The returned vector will have its x and y components set to the
- position of the point on the near plane, and the z component
- set to -nearPlane().
-
- This function is used for converting a mouse event's position
- into eye co-ordinates within the current camera view.
-*/
-QVector3D QGLCamera::mapPoint
- (const QPoint& point, qreal aspectRatio, const QSize& viewportSize) const
-{
- Q_D(const QGLCamera);
-
- // Rotate the co-ordinate system to account for the screen rotation.
- int x = point.x();
- int y = point.y();
- int width = viewportSize.width();
- int height = viewportSize.height();
- if (!d->adjustForAspectRatio)
- aspectRatio = 1.0f;
- if (d->screenRotation == 90) {
- if (aspectRatio != 0.0f)
- aspectRatio = 1.0f / aspectRatio;
- qSwap(x, y);
- qSwap(width, height);
- y = height - 1 - y;
- } else if (d->screenRotation == 180) {
- x = width - 1 - x;
- y = height - 1 - y;
- } else if (d->screenRotation == 270) {
- if (aspectRatio != 0.0f)
- aspectRatio = 1.0f / aspectRatio;
- qSwap(x, y);
- qSwap(width, height);
- }
-
- // Determine the relative distance from the middle of the screen.
- // After this xrel and yrel are typically between -1.0 and +1.0
- // (unless the point was outside the viewport). The yrel is
- // flipped upside down to account for the incoming co-ordinate
- // being left-handed, but the world being right-handed.
- qreal xrel, yrel;
- if (width)
- xrel = (((qreal)(x * 2)) - (qreal)width) / (qreal)width;
- else
- xrel = 0.0f;
- if (height)
- yrel = -(((qreal)(y * 2)) - (qreal)height) / (qreal)height;
- else
- yrel = 0.0f;
-
- // Reverse the projection and return the point in world co-ordinates.
- QMatrix4x4 m = projectionMatrix(aspectRatio);
- QMatrix4x4 invm = m.inverted();
- return invm.map(QVector3D(xrel, yrel, -1.0f));
-}
-
-/*!
- \fn void QGLCamera::projectionChanged()
-
- This signal is emitted when one of projectionType(), fieldOfView(),
- nearPlane(), farPlane(), viewSize(), or screenRotation() changes,
- indicating a modification to the optical properties of the camera
- looking at the scene.
-
- \sa viewChanged()
-*/
-
-/*!
- \fn void QGLCamera::viewChanged()
-
- This signal is emitted when one of eye(), upVector(), or center()
- changes, indicating a modification to the viewer's position or
- orientation.
-
- \sa projectionChanged()
-*/
-
-/*!
- \enum QGLCamera::RotateOrder
- This enum defines the order to perform a tilt, pan, and roll
- of a QGLCamera eye or center.
-
- \value TiltPanRoll Tilt, then pan, then roll.
- \value TiltRollPan Tilt, then roll, then pan.
- \value PanTiltRoll Pan, then tilt, then roll.
- \value PanRollTilt Pan, then roll, then tilt.
- \value RollTiltPan Roll, then tilt, then pan.
- \value RollPanTilt Roll, then pan, then tilt.
-*/
-
-/*!
- Tilts the center() up or down by \a tiltAngle degrees,
- pans the center() left or right by \a panAngle degrees,
- and rolls the center() left or right by \a rollAngle degrees,
- all in a single fluid movement. The \a order parameter
- indicates the order in which to perform the rotations.
-
- This function is accessible to QML on the Camera item.
- It is provided as a convenience for navigation items that
- rotate the center in multiple directions at the same time
- based on mouse movements.
-
- \sa tiltPanRollEye()
-*/
-void QGLCamera::tiltPanRollCenter
- (qreal tiltAngle, qreal panAngle, qreal rollAngle,
- QGLCamera::RotateOrder order)
-{
- switch (order) {
- case QGLCamera::TiltPanRoll:
- rotateCenter(roll(rollAngle) * pan(panAngle) * tilt(tiltAngle));
- break;
- case QGLCamera::TiltRollPan:
- rotateCenter(pan(panAngle) * roll(rollAngle) * tilt(tiltAngle));
- break;
- case QGLCamera::PanTiltRoll:
- rotateCenter(roll(rollAngle) * tilt(tiltAngle) * pan(panAngle));
- break;
- case QGLCamera::PanRollTilt:
- rotateCenter(tilt(tiltAngle) * roll(rollAngle) * pan(panAngle));
- break;
- case QGLCamera::RollTiltPan:
- rotateCenter(pan(panAngle) * tilt(tiltAngle) * roll(rollAngle));
- break;
- case QGLCamera::RollPanTilt:
- rotateCenter(tilt(tiltAngle) * pan(panAngle) * roll(rollAngle));
- break;
- }
-}
-
-/*!
- Tilts the eye() up or down by \a tiltAngle degrees,
- pans the eye() left or right by \a panAngle degrees,
- and rolls the eye() left or right by \a rollAngle degrees,
- all in a single fluid movement. The \a order parameter
- indicates the order in which to perform the rotations.
-
- This function is accessible to QML on the Camera item.
- It is provided as a convenience for navigation items that
- rotate the eye in multiple directions at the same time
- based on mouse movements.
-
- \sa tiltPanRollCenter()
-*/
-void QGLCamera::tiltPanRollEye
- (qreal tiltAngle, qreal panAngle, qreal rollAngle,
- QGLCamera::RotateOrder order)
-{
- switch (order) {
- case QGLCamera::TiltPanRoll:
- rotateEye(roll(rollAngle) * pan(panAngle) * tilt(tiltAngle));
- break;
- case QGLCamera::TiltRollPan:
- rotateEye(pan(panAngle) * roll(rollAngle) * tilt(tiltAngle));
- break;
- case QGLCamera::PanTiltRoll:
- rotateEye(roll(rollAngle) * tilt(tiltAngle) * pan(panAngle));
- break;
- case QGLCamera::PanRollTilt:
- rotateEye(tilt(tiltAngle) * roll(rollAngle) * pan(panAngle));
- break;
- case QGLCamera::RollTiltPan:
- rotateEye(pan(panAngle) * tilt(tiltAngle) * roll(rollAngle));
- break;
- case QGLCamera::RollPanTilt:
- rotateEye(tilt(tiltAngle) * pan(panAngle) * roll(rollAngle));
- break;
- }
-}
-
-QDebug operator<<(QDebug dbg, const QGLCamera &cam)
-{
- dbg << "QGLCamera";
- if (!cam.objectName().isEmpty())
- dbg << cam.objectName();
- dbg << "\n";
- dbg << " projection:" << ( cam.projectionType() == QGLCamera::Perspective ?
- "Perspective" : "Orthographic" );
- dbg << "-- viewsize:" << cam.viewSize().width() << "x" << cam.viewSize().height() << "\n";
- dbg << " near-plane:" << cam.nearPlane() << "-- far-plane:" << cam.farPlane();
- dbg << "-- field-of-view:" << cam.fieldOfView() << "\n";
- dbg << " rotation:" << cam.screenRotation() << " -- motion adjust:" <<
- cam.motionAdjustment() << " -- aspect adjust:" << cam.adjustForAspectRatio() << "\n";
- dbg << " eye:" << cam.eye() << "-- center:" << cam.center();
- dbg << "-- up:" << cam.upVector() << "\n";
- return dbg;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/viewing/qglcamera.h b/src/gui/extern/Qt3D/viewing/qglcamera.h
deleted file mode 100644
index 2c62f4142620e576a7ebf9f938c971e4c50c0dcc..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglcamera.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCAMERA_H
-#define QGLCAMERA_H
-
-#include "qt3dglobal.h"
-#include "qglnamespace.h"
-#include <QtCore/qobject.h>
-#include <QtCore/qsize.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qmatrix4x4.h>
-#include <QtGui/qquaternion.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLCameraPrivate;
-class QGLPainter;
-
-class Q_QT3D_EXPORT QGLCamera : public QObject
-{
- Q_OBJECT
- Q_ENUMS(ProjectionType RotateOrder)
- Q_PROPERTY(ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionChanged)
- Q_PROPERTY(qreal fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY projectionChanged)
- Q_PROPERTY(qreal nearPlane READ nearPlane WRITE setNearPlane NOTIFY projectionChanged)
- Q_PROPERTY(qreal farPlane READ farPlane WRITE setFarPlane NOTIFY projectionChanged)
- Q_PROPERTY(QSizeF viewSize READ viewSize WRITE setViewSize NOTIFY projectionChanged)
- Q_PROPERTY(QSizeF minViewSize READ minViewSize WRITE setMinViewSize NOTIFY projectionChanged SCRIPTABLE false)
- Q_PROPERTY(int screenRotation READ screenRotation WRITE setScreenRotation NOTIFY projectionChanged SCRIPTABLE false)
- Q_PROPERTY(QVector3D eye READ eye WRITE setEye NOTIFY viewChanged)
- Q_PROPERTY(QVector3D upVector READ upVector WRITE setUpVector NOTIFY viewChanged)
- Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY viewChanged)
- Q_PROPERTY(qreal eyeSeparation READ eyeSeparation WRITE setEyeSeparation NOTIFY viewChanged)
- Q_PROPERTY(QVector3D motionAdjustment READ motionAdjustment WRITE setMotionAdjustment DESIGNABLE false NOTIFY viewChanged SCRIPTABLE false)
- Q_PROPERTY(bool adjustForAspectRatio READ adjustForAspectRatio WRITE setAdjustForAspectRatio NOTIFY viewChanged)
-public:
- explicit QGLCamera(QObject *parent = 0);
- ~QGLCamera();
-
- enum ProjectionType
- {
- Perspective,
- Orthographic
- };
-
- QGLCamera::ProjectionType projectionType() const;
- void setProjectionType(QGLCamera::ProjectionType value);
-
- qreal fieldOfView() const;
- void setFieldOfView(qreal angle);
-
- qreal nearPlane() const;
- void setNearPlane(qreal value);
-
- qreal farPlane() const;
- void setFarPlane(qreal value);
-
- QSizeF viewSize() const;
- void setViewSize(const QSizeF& size);
-
- QSizeF minViewSize() const;
- void setMinViewSize(const QSizeF& size);
-
- int screenRotation() const;
- void setScreenRotation(int angle);
-
- QVector3D eye() const;
- void setEye(const QVector3D& vertex);
-
- QVector3D upVector() const;
- void setUpVector(const QVector3D& vector);
-
- QVector3D center() const;
- void setCenter(const QVector3D& vertex);
-
- qreal eyeSeparation() const;
- void setEyeSeparation(qreal value);
-
- QVector3D motionAdjustment() const;
- void setMotionAdjustment(const QVector3D& vector);
-
- bool adjustForAspectRatio() const;
- void setAdjustForAspectRatio(bool value);
-
- QQuaternion tilt(qreal angle) const;
- QQuaternion pan(qreal angle) const;
- QQuaternion roll(qreal angle) const;
-
- void rotateEye(const QQuaternion& q);
- void rotateCenter(const QQuaternion& q);
-
- QVector3D translation(qreal x, qreal y, qreal z) const;
-
- QMatrix4x4 projectionMatrix(qreal aspectRatio) const;
- QMatrix4x4 modelViewMatrix(QGL::Eye eye = QGL::NoEye) const;
-
- QVector3D mapPoint
- (const QPoint& point, qreal aspectRatio,
- const QSize& viewportSize) const;
-
- enum RotateOrder
- {
- TiltPanRoll,
- TiltRollPan,
- PanTiltRoll,
- PanRollTilt,
- RollTiltPan,
- RollPanTilt
- };
-
-public Q_SLOTS:
- void translateEye(qreal x, qreal y, qreal z);
- void translateCenter(qreal x, qreal y, qreal z);
-
- void tiltPanRollCenter(qreal tiltAngle, qreal panAngle, qreal rollAngle,
- QGLCamera::RotateOrder order = TiltPanRoll);
- void tiltPanRollEye(qreal tiltAngle, qreal panAngle, qreal rollAngle,
- QGLCamera::RotateOrder order = TiltPanRoll);
-
-Q_SIGNALS:
- void projectionChanged();
- void viewChanged();
-
-private:
- QGLCameraPrivate *d_ptr;
-
- QGLCameraPrivate *d_func() const { return d_ptr; }
-
- Q_DISABLE_COPY(QGLCamera)
-};
-
-#ifndef QT_NO_DEBUG_STREAM
-#include <QtCore/qdebug.h>
-Q_QT3D_EXPORT QDebug operator<<(QDebug dbg, const QGLCamera &order);
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/viewing/qglcameraanimation.cpp b/src/gui/extern/Qt3D/viewing/qglcameraanimation.cpp
deleted file mode 100644
index 6b2e3ff8e478c6ab289e797542cc306078f56766..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglcameraanimation.cpp
+++ /dev/null
@@ -1,543 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglcameraanimation.h"
-#include "qglcamera.h"
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLCameraAnimation
- \brief The QGLCameraAnimation class implements smooth animations between two camera positions.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::viewing
-
- QGLCameraAnimation modifies the camera() object to fall on a smooth
- path between startEye(), startUpVector(), startCenter() and
- endEye(), endUpVector(), endCenter. The animation will attempt to
- keep the eye and center at the same relative distance from each other
- throughout the animation, as though one object is flying around another.
-
- \sa QGLCamera
-*/
-
-class QGLCameraAnimationPrivate
-{
-public:
- enum PointOfRotation
- {
- Center,
- CenterDual,
- Eye,
- EyeDual,
- Both
- };
-
- QGLCameraAnimationPrivate()
- : camera(0)
- , startEye(0.0f, 0.0f, 10.f)
- , startUpVector(0.0f, 1.0f, 0.0f)
- , startCenter(0.0f, 0.0f, 0.0f)
- , endEye(0.0f, 0.0f, 10.f)
- , endUpVector(0.0f, 1.0f, 0.0f)
- , endCenter(0.0f, 0.0f, 0.0f)
- , duration(250)
- , dirty(true)
- , pointOfRotation(Both)
- , lengthStart(1.0f)
- , lengthEnd(1.0f)
- {
- }
-
- QGLCamera *camera;
- QVector3D startEye;
- QVector3D startUpVector;
- QVector3D startCenter;
- QVector3D endEye;
- QVector3D endUpVector;
- QVector3D endCenter;
- int duration;
- bool dirty;
- QEasingCurve easingCurve;
-
- // Derived values for use during the animation.
- PointOfRotation pointOfRotation;
- QVector3D upVectorAxis;
- qreal upVectorAngle;
- QVector3D pointAxis;
- qreal pointAngle;
- QVector3D centerTranslate;
- QVector3D eyeTranslate;
- qreal lengthStart;
- qreal lengthEnd;
-
- static void rotateBetween(const QVector3D &start, const QVector3D &end,
- const QVector3D &defaultAxis,
- QVector3D *rotationAxis, qreal *rotationAngle);
- void deriveRotations();
-};
-
-static inline bool fuzzyCompareVectors(const QVector3D &v1, const QVector3D &v2)
-{
- return qAbs(v1.x() - v2.x()) <= 0.00001 &&
- qAbs(v1.y() - v2.y()) <= 0.00001 &&
- qAbs(v1.z() - v2.z()) <= 0.00001;
-}
-
-// Determine how to rotate between the "start" and "end" vectors.
-// We use the cross-product of the two vectors as the axis of rotation
-// or "defaultAxis" if the cross-product is zero (180 degree rotation).
-void QGLCameraAnimationPrivate::rotateBetween
- (const QVector3D &start, const QVector3D &end, const QVector3D &defaultAxis,
- QVector3D *rotationAxis, qreal *rotationAngle)
-{
- QVector3D nstart = start.normalized();
- QVector3D nend = end.normalized();
- if (qFuzzyCompare(nstart, nend)) {
- // Vectors are the same, so no rotation to perform.
- *rotationAxis = QVector3D(0, 1, 0);
- *rotationAngle = 0.0f;
- } else {
- QVector3D axis = QVector3D::crossProduct(nstart, nend);
- if (qFuzzyIsNull(axis.x()) && qFuzzyIsNull(axis.y()) &&
- qFuzzyIsNull(axis.z())) {
- // Vectors are probably at 180 degrees to each other.
- // We can pick either direction; arbitrarily pick anti-clockwise.
- *rotationAxis = defaultAxis;
- *rotationAngle = 180.0f;
- } else {
- // Compute the smallest angle between the two vectors
- // from the cosine of the angle (i.e. the dot product).
- *rotationAxis = axis;
- *rotationAngle =
- qAcos(QVector3D::dotProduct(nstart, nend)) * 180.0f / M_PI;
- }
- }
-}
-
-void QGLCameraAnimationPrivate::deriveRotations()
-{
- // If the center points are the same, rotate the eye around the center.
- // If the eye points are the same, rotate the center around the eye.
- // If both are different, then interpolate along linear vectors.
- if (qFuzzyCompare(startCenter, endCenter)) {
- if (qFuzzyCompare(startEye, endEye)) {
- // Center and eye both stay the same: nothing to do.
- pointOfRotation = Both;
- centerTranslate = QVector3D();
- eyeTranslate = QVector3D();
- } else {
- // Centers are the same, rotate the eye position.
- pointOfRotation = Center;
- rotateBetween(startEye - startCenter, endEye - startCenter,
- startUpVector, &pointAxis, &pointAngle);
- lengthStart = (startEye - startCenter).length();
- lengthEnd = (endEye - startCenter).length();
-
- // Rotate the start up vector to the final position. If it is
- // different than the end up vector, we need to perform the
- // animation in two steps: rotate eye, then rotate up.
- QQuaternion q =
- QQuaternion::fromAxisAndAngle(pointAxis, pointAngle);
- QVector3D up = q.rotatedVector(startUpVector);
- if (!fuzzyCompareVectors(startUpVector, endUpVector) &&
- !fuzzyCompareVectors(up, endUpVector)) {
- pointOfRotation = CenterDual;
- rotateBetween(up, endUpVector, endEye - endCenter,
- &upVectorAxis, &upVectorAngle);
- }
- }
- } else if (qFuzzyCompare(startEye, endEye)) {
- // Eyes are the same, rotate the center position.
- pointOfRotation = Eye;
- rotateBetween(startCenter - startEye, endCenter - startEye,
- startUpVector, &pointAxis, &pointAngle);
- lengthStart = (startCenter - startEye).length();
- lengthEnd = (startCenter - endEye).length();
-
- // Rotate the start up vector to the final position. If it is
- // different than the end up vector, we need to perform the
- // animation in two steps: rotate eye, then rotate up.
- QQuaternion q =
- QQuaternion::fromAxisAndAngle(pointAxis, pointAngle);
- QVector3D up = q.rotatedVector(startUpVector);
- if (!fuzzyCompareVectors(startUpVector, endUpVector) &&
- !fuzzyCompareVectors(up, endUpVector)) {
- pointOfRotation = EyeDual;
- rotateBetween(up, endUpVector, endCenter - endEye,
- &upVectorAxis, &upVectorAngle);
- }
- } else {
- // Both center and eye are changing, so perform a linear translation.
- pointOfRotation = Both;
- centerTranslate = endCenter - startCenter;
- eyeTranslate = endEye - startEye;
- }
-
- // If we are doing a single movement, then determine how to
- // rotate the up vector during the movement.
- if (pointOfRotation != CenterDual) {
- rotateBetween(startUpVector, endUpVector, startCenter - startEye,
- &upVectorAxis, &upVectorAngle);
- }
-}
-
-/*!
- Constructs a new camera animation object and attaches it to \a parent.
-*/
-QGLCameraAnimation::QGLCameraAnimation(QObject *parent)
- : QAbstractAnimation(parent)
- , d_ptr(new QGLCameraAnimationPrivate)
-{
-}
-
-/*!
- Destroys this camera animation object.
-*/
-QGLCameraAnimation::~QGLCameraAnimation()
-{
-}
-
-/*!
- \property QGLCameraAnimation::camera
- \brief the camera that will be animated by this animation object;
- null if the camera has not yet been set.
-*/
-
-QGLCamera *QGLCameraAnimation::camera() const
-{
- Q_D(const QGLCameraAnimation);
- return d->camera;
-}
-
-void QGLCameraAnimation::setCamera(QGLCamera *camera)
-{
- Q_D(QGLCameraAnimation);
- d->camera = camera;
-}
-
-/*!
- \property QGLCameraAnimation::startEye
- \brief the position of the viewer's eye at the start of the animation.
- The default value is (0, 0, 10).
-
- \sa startUpVector(), startCenter(), endEye()
-*/
-
-QVector3D QGLCameraAnimation::startEye() const
-{
- Q_D(const QGLCameraAnimation);
- return d->startEye;
-}
-
-void QGLCameraAnimation::setStartEye(const QVector3D &eye)
-{
- Q_D(QGLCameraAnimation);
- d->startEye = eye;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::startUpVector
- \brief the up vector for the viewer at the start of the animation.
- The default value is (0, 1, 0).
-
- \sa startEye(), startCenter(), endUpVector()
-*/
-
-QVector3D QGLCameraAnimation::startUpVector() const
-{
- Q_D(const QGLCameraAnimation);
- return d->startUpVector;
-}
-
-void QGLCameraAnimation::setStartUpVector(const QVector3D &upVector)
-{
- Q_D(QGLCameraAnimation);
- d->startUpVector = upVector;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::startCenter
- \brief the center of the view visible from the viewer's position
- at the start of the animation. The default value is (0, 0, 0).
-
- \sa startEye(), startUpVector(), endCenter()
-*/
-
-QVector3D QGLCameraAnimation::startCenter() const
-{
- Q_D(const QGLCameraAnimation);
- return d->startCenter;
-}
-
-void QGLCameraAnimation::setStartCenter(const QVector3D ¢er)
-{
- Q_D(QGLCameraAnimation);
- d->startCenter = center;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::endEye
- \brief the position of the viewer's eye at the end of the animation.
- The default value is (0, 0, 10).
-
- \sa endUpVector(), endCenter(), startEye()
-*/
-
-QVector3D QGLCameraAnimation::endEye() const
-{
- Q_D(const QGLCameraAnimation);
- return d->endEye;
-}
-
-void QGLCameraAnimation::setEndEye(const QVector3D &eye)
-{
- Q_D(QGLCameraAnimation);
- d->endEye = eye;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::endUpVector
- \brief the up vector for the viewer at the end of the animation.
- The default value is (0, 1, 0).
-
- \sa endEye(), endCenter(), startUpVector()
-*/
-
-QVector3D QGLCameraAnimation::endUpVector() const
-{
- Q_D(const QGLCameraAnimation);
- return d->endUpVector;
-}
-
-void QGLCameraAnimation::setEndUpVector(const QVector3D &upVector)
-{
- Q_D(QGLCameraAnimation);
- d->endUpVector = upVector;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::endCenter
- \brief the center of the view visible from the viewer's position
- at the end of the animation. The default value is (0, 0, 0).
-
- \sa endEye(), endUpVector(), startCenter()
-*/
-
-QVector3D QGLCameraAnimation::endCenter() const
-{
- Q_D(const QGLCameraAnimation);
- return d->endCenter;
-}
-
-void QGLCameraAnimation::setEndCenter(const QVector3D ¢er)
-{
- Q_D(QGLCameraAnimation);
- d->endCenter = center;
- d->dirty = true;
-}
-
-/*!
- \property QGLCameraAnimation::duration
- \brief the duration of the animation in milliseconds. The default
- value is 250 milliseconds.
-
- \sa easingCurve()
-*/
-
-int QGLCameraAnimation::duration() const
-{
- Q_D(const QGLCameraAnimation);
- return d->duration;
-}
-
-void QGLCameraAnimation::setDuration(int duration)
-{
- Q_D(QGLCameraAnimation);
- d->duration = duration;
-}
-
-/*!
- \property QGLCameraAnimation::easingCurve
- \brief the easing curve to use for the animation. The default
- value is a linear easing curve.
-
- \sa duration()
-*/
-
-QEasingCurve QGLCameraAnimation::easingCurve() const
-{
- Q_D(const QGLCameraAnimation);
- return d->easingCurve;
-}
-
-void QGLCameraAnimation::setEasingCurve(const QEasingCurve &easing)
-{
- Q_D(QGLCameraAnimation);
- d->easingCurve = easing;
-}
-
-/*!
- \internal
-*/
-void QGLCameraAnimation::updateCurrentTime(int currentTime)
-{
- Q_D(QGLCameraAnimation);
- if (!d->camera)
- return; // Nothing to do if no camera to modify.
- if (currentTime >= d->duration) {
- d->camera->setEye(d->endEye);
- d->camera->setUpVector(d->endUpVector);
- d->camera->setCenter(d->endCenter);
- } else if (currentTime <= 0) {
- d->camera->setEye(d->startEye);
- d->camera->setUpVector(d->startUpVector);
- d->camera->setCenter(d->startCenter);
- } else {
- // Derive the rotation parameters we need if arguments have changed.
- if (d->dirty) {
- d->dirty = false;
- d->deriveRotations();
- }
-
- // Calculate the progress and modify it with the easing curve.
- qreal progress = d->easingCurve.valueForProgress
- (qreal(currentTime) / qreal(d->duration));
-
- // Calculate the new eye and center locations.
- QVector3D eye = d->startEye;
- QVector3D center = d->startCenter;
- QVector3D upVector = d->startUpVector;
- if (d->pointOfRotation == QGLCameraAnimationPrivate::Center) {
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle * progress);
- eye = q.rotatedVector(eye - d->startCenter);
- if (d->lengthStart != d->lengthEnd) {
- qreal length = (1.0f - progress) * d->lengthStart +
- progress * d->lengthEnd;
- eye = eye.normalized() * length;
- }
- eye += d->startCenter;
- } else if (d->pointOfRotation == QGLCameraAnimationPrivate::CenterDual) {
- if (progress < 0.5f) {
- // First half of the animation - rotate the eye position.
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle * progress * 2.0f);
- eye = q.rotatedVector(eye - d->startCenter);
- if (d->lengthStart != d->lengthEnd) {
- qreal length = (1.0f - progress) * d->lengthStart +
- progress * d->lengthEnd;
- eye = eye.normalized() * length;
- }
- eye += d->startCenter;
- upVector = q.rotatedVector(upVector);
- } else {
- // Second half of the animation - rotate the up vector.
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->upVectorAxis,
- d->upVectorAngle * (progress - 0.5f) * 2.0f) *
- QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle);
- eye = d->endEye;
- upVector = q.rotatedVector(upVector);
- }
- } else if (d->pointOfRotation == QGLCameraAnimationPrivate::Eye) {
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle * progress);
- center = q.rotatedVector(center - d->startEye);
- if (d->lengthStart != d->lengthEnd) {
- qreal length = (1.0f - progress) * d->lengthStart +
- progress * d->lengthEnd;
- center = center.normalized() * length;
- }
- center += d->startEye;
- } else if (d->pointOfRotation == QGLCameraAnimationPrivate::EyeDual) {
- if (progress < 0.5f) {
- // First half of the animation - rotate the center position.
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle * progress * 2.0f);
- center = q.rotatedVector(center - d->startEye);
- if (d->lengthStart != d->lengthEnd) {
- qreal length = (1.0f - progress) * d->lengthStart +
- progress * d->lengthEnd;
- center = center.normalized() * length;
- }
- center += d->startEye;
- upVector = q.rotatedVector(upVector);
- } else {
- // Second half of the animation - rotate the up vector.
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->upVectorAxis,
- d->upVectorAngle * (progress - 0.5f) * 2.0f) *
- QQuaternion::fromAxisAndAngle
- (d->pointAxis, d->pointAngle);
- center = d->endCenter;
- upVector = q.rotatedVector(upVector);
- }
- } else {
- eye += d->eyeTranslate * progress;
- center += d->centerTranslate * progress;
- }
-
- // Calculate the new up vector for single-step animations.
- if (d->pointOfRotation != QGLCameraAnimationPrivate::CenterDual &&
- d->pointOfRotation != QGLCameraAnimationPrivate::EyeDual) {
- if (d->upVectorAngle != 0.0f) {
- QQuaternion q = QQuaternion::fromAxisAndAngle
- (d->upVectorAxis, d->upVectorAngle * progress);
- upVector = q.rotatedVector(upVector);
- }
- }
-
- d->camera->setEye(eye);
- d->camera->setUpVector(upVector);
- d->camera->setCenter(center);
- }
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/viewing/qglcameraanimation.h b/src/gui/extern/Qt3D/viewing/qglcameraanimation.h
deleted file mode 100644
index 2c315b353259945719b4bbdd69bda403d010de25..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglcameraanimation.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLCAMERAANIMATION_H
-#define QGLCAMERAANIMATION_H
-
-#include <QtCore/qabstractanimation.h>
-#include <QtCore/qeasingcurve.h>
-#include <QtGui/qvector3d.h>
-#include "qt3dglobal.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLCamera;
-class QGLCameraAnimationPrivate;
-
-class Q_QT3D_EXPORT QGLCameraAnimation : public QAbstractAnimation
-{
- Q_OBJECT
- Q_PROPERTY(QGLCamera *camera READ camera WRITE setCamera)
- Q_PROPERTY(QVector3D startEye READ startEye WRITE setStartEye)
- Q_PROPERTY(QVector3D startUpVector READ startUpVector WRITE setStartUpVector)
- Q_PROPERTY(QVector3D startCenter READ startCenter WRITE setStartCenter)
- Q_PROPERTY(QVector3D endEye READ endEye WRITE setEndEye)
- Q_PROPERTY(QVector3D endUpVector READ endUpVector WRITE setEndUpVector)
- Q_PROPERTY(QVector3D endCenter READ endCenter WRITE setEndCenter)
- Q_PROPERTY(int duration READ duration WRITE setDuration)
- Q_PROPERTY(QEasingCurve easingCurve READ easingCurve WRITE setEasingCurve)
-public:
- explicit QGLCameraAnimation(QObject *parent = 0);
- ~QGLCameraAnimation();
-
- QGLCamera *camera() const;
- void setCamera(QGLCamera *camera);
-
- QVector3D startEye() const;
- void setStartEye(const QVector3D &eye);
-
- QVector3D startUpVector() const;
- void setStartUpVector(const QVector3D &upVector);
-
- QVector3D startCenter() const;
- void setStartCenter(const QVector3D ¢er);
-
- QVector3D endEye() const;
- void setEndEye(const QVector3D &eye);
-
- QVector3D endUpVector() const;
- void setEndUpVector(const QVector3D &upVector);
-
- QVector3D endCenter() const;
- void setEndCenter(const QVector3D ¢er);
-
- int duration() const;
- void setDuration(int duration);
-
- QEasingCurve easingCurve() const;
- void setEasingCurve(const QEasingCurve &easing);
-
-protected:
- void updateCurrentTime(int currentTime);
-
-private:
- QScopedPointer<QGLCameraAnimationPrivate> d_ptr;
-
- Q_DISABLE_COPY(QGLCameraAnimation)
- Q_DECLARE_PRIVATE(QGLCameraAnimation)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/Qt3D/viewing/qglview.cpp b/src/gui/extern/Qt3D/viewing/qglview.cpp
deleted file mode 100644
index 77cd54e448852c1e97ebbab37a90eb86ed53a6ec..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglview.cpp
+++ /dev/null
@@ -1,1496 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 "qglview.h"
-#include "qglframebufferobject.h"
-#include "qglsubsurface.h"
-#include "qglmaskedsurface_p.h"
-#include "qglwidgetsurface.h"
-#include "qgldrawbuffersurface_p.h"
-#include "qray3d.h"
-#include <QtGui/qevent.h>
-#include <QtCore/qmap.h>
-#include <QtGui/qapplication.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qdatetime.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \class QGLView
- \brief The QGLView class extends QGLWidget with support for 3D viewing.
- \since 4.8
- \ingroup qt3d
- \ingroup qt3d::viewing
-
- \section1 Navigating
-
- Navigation in 3D space is possible under keyboard and mouse control.
-
- Holding down the left mouse button and dragging it will rotate the
- camera() position around the object being viewed. Holding down the
- left mouse button and the Shift key pans the view in a plane without
- rotating the viewed object.
-
- Using the mouse wheel, the view can be zoomed in or out. If the
- system does not have a mouse wheel, then holding down the left mouse
- button and the Control key and moving the mouse up and down will
- also zoom in and out.
-
- On the keyboard, the left, right, up, and down keys can also be used
- to shift the camera() position around the object being viewed. Shift
- and Control modify keys the same way they modify the left mouse
- button above. Hitting the Home key will cause the camera position
- to be reset to its original position.
-
- \section1 Stereo viewing support
-
- Note - Stereo viewing is experimental and unsupported.
-
- If the hardware supports stereo buffers, then each time the scene needs
- to be painted, QGLView renders it twice: first from the perspective of
- the left eye, and then from the perspective of the right eye.
- The separation between the eye positions is specified by
- QGLCamera::eyeSeparation(). If the eye separation is zero,
- then stereo viewing is disabled and only a single image will
- be rendered per frame.
-
- Three kinds of stereo viewing are possible: hardware stereo,
- anaglyph stereo, and double image stereo.
-
- Hardware stereo relies upon specialized hardware that can render
- the left and right eye images into separate buffers and then show
- them independently to each eye through the use of polarized glasses
- or similar technology. Hardware stereo is used if the \c{-stereo-hw}
- command-line option is supplied or if the user explicitly requests
- stereo buffers when the QGLView is constructed:
-
- \code
- QGLFormat format(QGLFormat::defaultFormat());
- format.setOption(QGL::StereoBuffers);
- QGLView view(format);
- \endcode
-
- Anaglyph stereo is used when the hardware doesn't have specialized
- stereo buffer support. The left eye image is masked by a red
- filter and the right eye image is masked by a cyan filter. This makes
- the resulting images suitable for viewing with standard red-cyan
- anaglyph glasses.
-
- When using red-cyan anaglyphs, it is recommended that the
- scene use non-primary object colors. Pure primary colors such
- as red, green, and blue will only appear to one of the viewer's
- eyes and will inhibit the 3D effect. Non-primary colors or
- grayscale should be used to get the best effects.
-
- Red-cyan anaglyphs can be disorienting to some viewers. If hardware
- stereo is not available and stereo viewing is not critical to
- the application, then stereo can be disabled by setting
- QGLCamera::eyeSeparation() to zero.
-
- Double image stereo involves drawing the left and right eye
- images in a double-wide or double-high window, with the hardware
- combining the images. Four different configurations are available:
- LeftRight, RightLeft, TopBottom,
- and BottomTop, according to the layout of the eye images.
- Double image stereo is selected by calling setStereoType(). It is
- the responsibility of the application to resize the window to
- twice its normal size to accommodate the images.
-
- Ctrl-Left and Ctrl-Right can be used to make the eye separation
- smaller or larger under keyboard control.
-
- A number of command-line options are available to select the
- stereo mode of the QGLView so that the application does not
- need to select the mode itself:
-
- \table
- \row \o \c{-stereo-hw} \o \l Hardware.
- \row \o \c{-stereo-lr} \o LeftRight.
- \row \o \c{-stereo-rl} \o RightLeft.
- \row \o \c{-stereo-tb} \o TopBottom.
- \row \o \c{-stereo-bt} \o BottomTop.
- \row \o \c{-stereo-stretched-lr} \o StretchedLeftRight.
- \row \o \c{-stereo-stretched-rl} \o StretchedRightLeft.
- \row \o \c{-stereo-stretched-tb} \o StretchedTopBottom.
- \row \o \c{-stereo-stretched-bt} \o StretchedBottomTop.
- \endtable
-
- The option can also be supplied in the \c{Quick3D_OPTIONS} environment
- variable:
-
- \code
- $ Quick3D_OPTIONS="-stereo-lr" ./cubehouse
- \endcode
-
- If the application sets the stereo type with setStereoType(),
- that will be used. Next is the command-line setting, and finally
- the contents of the environment variable.
-*/
-
-/*!
- \enum QGLView::Option
- This enum defines an option for QGLView.
-
- \value ObjectPicking Object picking is enabled. Disabled by default.
- \value ShowPicking Objects are rendered with their pick colors instead
- of their normal colors and materials. This can help debug
- problems with object picking. Disabled by default.
- \value CameraNavigation Camera navigation using the keyboard and mouse
- is enabled. Enabled by default.
- \omitvalue PaintingLog
- \value FOVZoom Enables zooming by changing field of view instead of
- physically moving the camera.
-*/
-
-/*!
- \enum QGLView::StereoType
- This enum defines the type of stereo viewing technology being used by QGLView.
-
- \value Hardware Specialized stereo hardware is being used.
- \value RedCyanAnaglyph Stereo is being simulated for viewing by
- red-cyan anaglyph classes.
- \value LeftRight The view is double-wide with the left eye
- image on the left of the window.
- \value RightLeft The view is double-wide with the left eye
- image on the right of the window.
- \value TopBottom The view is double-high with the left eye
- image on the top of the window.
- \value BottomTop The view is double-high with the left eye
- image on the bottom of the window.
- \value StretchedLeftRight Same as LeftRight, but with the
- left and right eye images stretched to double their width.
- \value StretchedRightLeft Same as RightLeft, but with the
- left and right eye images stretched to double their width.
- \value StretchedTopBottom Same as TopBottom, but with the
- left and right eye images stretched to double their height.
- \value StretchedBottomTop Same as BottomTop, but with the
- left and right eye images stretched to double their height.
-*/
-
-class QGLViewPrivate
-{
-public:
- QGLViewPrivate(QGLView *parent)
- : view(parent), mainSurface(parent)
- {
- options = QGLView::CameraNavigation;
- fbo = 0;
- leftSurface = 0;
- rightSurface = 0;
-
- if (parent->format().stereo())
- stereoType = QGLView::Hardware;
- else
- stereoType = QGLView::RedCyanAnaglyph;
-
- pickBufferForceUpdate = true;
- pickBufferMaybeInvalid = true;
- updateQueued = false;
-
- pressedObject = 0;
- pressedButton = Qt::NoButton;
- enteredObject = 0;
-
- defaultCamera = new QGLCamera(parent);
- camera = defaultCamera;
-
- panning = false;
- startPan = QPoint(-1, -1);
- lastPan = QPoint(-1, -1);
- panModifiers = Qt::NoModifier;
- QObject::connect(defaultCamera, SIGNAL(projectionChanged()),
- parent, SLOT(cameraChanged()));
- QObject::connect(defaultCamera, SIGNAL(viewChanged()),
- parent, SLOT(cameraChanged()));
-
- logTime.start();
- lastFrameTime.start();
- QByteArray env = qgetenv("Quick3D_LOG_EVENTS");
- if (env == "1")
- options |= QGLView::PaintingLog;
- }
- ~QGLViewPrivate()
- {
- delete fbo;
- delete leftSurface;
- delete rightSurface;
- }
-
- QGLView *view;
- QGLView::Options options;
- QGLView::StereoType stereoType;
- QGLFramebufferObject *fbo;
- QGLWidgetSurface mainSurface;
- QGLAbstractSurface *leftSurface;
- QGLAbstractSurface *rightSurface;
- bool pickBufferForceUpdate;
- bool pickBufferMaybeInvalid;
- bool updateQueued;
- QMap<int, QObject *> objects;
- QObject *pressedObject;
- Qt::MouseButton pressedButton;
- QObject *enteredObject;
- QGLCamera *defaultCamera;
- QGLCamera *camera;
- bool panning;
- QPoint startPan;
- QPoint lastPan;
- QVector3D startEye;
- QVector3D startCenter;
- QVector3D startUpVector;
- Qt::KeyboardModifiers panModifiers;
- QTime logTime;
- QTime enterTime;
- QTime lastFrameTime;
-
- inline void logEnter(const char *message);
- inline void logLeave(const char *message);
-
- void processStereoOptions(QGLView *view);
- void processStereoOptions(QGLView *view, const QString &arg);
-
- QGLAbstractSurface *leftEyeSurface(const QSize &size);
- QGLAbstractSurface *rightEyeSurface(const QSize &size);
- QGLAbstractSurface *bothEyesSurface();
-};
-
-inline void QGLViewPrivate::logEnter(const char *message)
-{
- if ((options & QGLView::PaintingLog) == 0)
- return;
- int ms = logTime.elapsed();
- enterTime.start();
- int sinceLast = lastFrameTime.restart();
- qDebug("LOG[%d:%02d:%02d.%03d]: ENTER: %s (%d ms since last enter)",
- ms / 3600000, (ms / 60000) % 60,
- (ms / 1000) % 60, ms % 1000, message, sinceLast);
-}
-
-inline void QGLViewPrivate::logLeave(const char *message)
-{
- if ((options & QGLView::PaintingLog) == 0)
- return;
- int ms = logTime.elapsed();
- int duration = enterTime.elapsed();
- qDebug("LOG[%d:%02d:%02d.%03d]: LEAVE: %s (%d ms elapsed)",
- ms / 3600000, (ms / 60000) % 60,
- (ms / 1000) % 60, ms % 1000, message, duration);
-}
-
-static QString qt_gl_stereo_arg()
-{
- QStringList args = QApplication::arguments();
- foreach (QString arg, args) {
- if (arg.startsWith(QLatin1String("-stereo-")))
- return arg;
- }
- QByteArray options(qgetenv("Quick3D_OPTIONS"));
- args = QString::fromLocal8Bit
- (options.constData(), options.size()).split(QLatin1Char(' '));
- foreach (QString arg, args) {
- if (arg.startsWith(QLatin1String("-stereo-")))
- return arg;
- }
- return QString();
-}
-
-void QGLViewPrivate::processStereoOptions(QGLView *view)
-{
- if (stereoType == QGLView::Hardware)
- return;
- QString arg = qt_gl_stereo_arg();
- if (!arg.isEmpty())
- processStereoOptions(view, arg);
-}
-
-void QGLViewPrivate::processStereoOptions(QGLView *view, const QString &arg)
-{
- // If the command-line contains an option that starts with "-stereo-",
- // then convert it into options that define the size and type of
- // stereo window to use for a top-level QGLView. Possible options:
- //
- // hw - use hardware stereo
- // lr, rl, tb, bt - specify the eye order (default is left-right)
- // stretched - used stretched versions of double wide/high modes.
- //
- QStringList opts = arg.mid(8).split(QLatin1Char('-'));
- QGLView::StereoType stereoType;
- bool stretched = opts.contains(QLatin1String("stretched"));
- if (opts.contains(QLatin1String("rl"))) {
- stereoType = stretched ? QGLView::StretchedRightLeft : QGLView::RightLeft;
- } else if (opts.contains(QLatin1String("tb"))) {
- stereoType = stretched ? QGLView::StretchedTopBottom : QGLView::TopBottom;
- } else if (opts.contains(QLatin1String("bt"))) {
- stereoType = stretched ? QGLView::StretchedBottomTop : QGLView::BottomTop;
- } else {
- stereoType = stretched ? QGLView::StretchedLeftRight : QGLView::LeftRight;
- }
- view->setStereoType(stereoType);
-}
-
-class QGLViewSubsurface : public QGLSubsurface
-{
-public:
- QGLViewSubsurface(QGLAbstractSurface *surface, const QRect ®ion,
- qreal adjust)
- : QGLSubsurface(surface, region), m_adjust(adjust) {}
-
- qreal aspectRatio() const;
-
-private:
- qreal m_adjust;
-};
-
-qreal QGLViewSubsurface::aspectRatio() const
-{
- return QGLSubsurface::aspectRatio() * m_adjust;
-}
-
-// Returns the surface to use to render the left eye image.
-QGLAbstractSurface *QGLViewPrivate::leftEyeSurface(const QSize &size)
-{
- QRect viewport;
- qreal adjust = 1.0f;
- switch (stereoType) {
- case QGLView::Hardware:
-#if defined(GL_BACK_LEFT) && defined(GL_BACK_RIGHT)
- if (!leftSurface) {
- leftSurface = new QGLDrawBufferSurface
- (&mainSurface,
- view->doubleBuffer() ? GL_BACK_LEFT : GL_FRONT_LEFT);
- }
- return leftSurface;
-#endif
- case QGLView::RedCyanAnaglyph:
- if (!leftSurface) {
- leftSurface = new QGLMaskedSurface
- (&mainSurface,
- QGLMaskedSurface::RedMask | QGLMaskedSurface::AlphaMask);
- }
- return leftSurface;
- case QGLView::LeftRight:
- viewport = QRect(0, 0, size.width() / 2, size.height());
- break;
- case QGLView::RightLeft:
- viewport = QRect(size.width() / 2, 0, size.width() / 2, size.height());
- break;
- case QGLView::TopBottom:
- viewport = QRect(0, 0, size.width(), size.height() / 2);
- break;
- case QGLView::BottomTop:
- viewport = QRect(0, size.height() / 2, size.width(), size.height() / 2);
- break;
- case QGLView::StretchedLeftRight:
- viewport = QRect(0, 0, size.width() / 2, size.height());
- adjust = 2.0f;
- break;
- case QGLView::StretchedRightLeft:
- viewport = QRect(size.width() / 2, 0, size.width() / 2, size.height());
- adjust = 2.0f;
- break;
- case QGLView::StretchedTopBottom:
- viewport = QRect(0, 0, size.width(), size.height() / 2);
- adjust = 0.5f;
- break;
- case QGLView::StretchedBottomTop:
- viewport = QRect(0, size.height() / 2, size.width(), size.height() / 2);
- adjust = 0.5f;
- break;
- }
- if (!leftSurface) {
- if (adjust == 1.0f)
- leftSurface = new QGLSubsurface(&mainSurface, viewport);
- else
- leftSurface = new QGLViewSubsurface(&mainSurface, viewport, adjust);
- } else {
- static_cast<QGLSubsurface *>(leftSurface)->setRegion(viewport);
- }
- return leftSurface;
-}
-
-// Returns the surface to use to render the right eye image.
-QGLAbstractSurface *QGLViewPrivate::rightEyeSurface(const QSize &size)
-{
- QRect viewport;
- qreal adjust = 1.0f;
- switch (stereoType) {
- case QGLView::Hardware:
-#if defined(GL_BACK_LEFT) && defined(GL_BACK_RIGHT)
- if (!rightSurface) {
- rightSurface = new QGLDrawBufferSurface
- (&mainSurface,
- view->doubleBuffer() ? GL_BACK_RIGHT : GL_FRONT_RIGHT);
- }
- return rightSurface;
-#endif
- case QGLView::RedCyanAnaglyph:
- if (!rightSurface) {
- rightSurface = new QGLMaskedSurface
- (&mainSurface,
- QGLMaskedSurface::GreenMask | QGLMaskedSurface::BlueMask);
- }
- return rightSurface;
- case QGLView::LeftRight:
- viewport = QRect(size.width() / 2, 0, size.width() / 2, size.height());
- break;
- case QGLView::RightLeft:
- viewport = QRect(0, 0, size.width() / 2, size.height());
- break;
- case QGLView::TopBottom:
- viewport = QRect(0, size.height() / 2, size.width(), size.height() / 2);
- break;
- case QGLView::BottomTop:
- viewport = QRect(0, 0, size.width(), size.height() / 2);
- break;
- case QGLView::StretchedLeftRight:
- viewport = QRect(size.width() / 2, 0, size.width() / 2, size.height());
- adjust = 2.0f;
- break;
- case QGLView::StretchedRightLeft:
- viewport = QRect(0, 0, size.width() / 2, size.height());
- adjust = 2.0f;
- break;
- case QGLView::StretchedTopBottom:
- viewport = QRect(0, size.height() / 2, size.width(), size.height() / 2);
- adjust = 0.5f;
- break;
- case QGLView::StretchedBottomTop:
- viewport = QRect(0, 0, size.width(), size.height() / 2);
- adjust = 0.5f;
- break;
- }
- if (!rightSurface) {
- if (adjust == 1.0f)
- rightSurface = new QGLSubsurface(&mainSurface, viewport);
- else
- rightSurface = new QGLViewSubsurface(&mainSurface, viewport, adjust);
- } else {
- static_cast<QGLSubsurface *>(rightSurface)->setRegion(viewport);
- }
- return rightSurface;
-}
-
-// Returns a surface that can be used to render a non-stereoscopic
-// image into both eyes at the same time. Returns null if the eyes
-// must be rendered one at a time.
-QGLAbstractSurface *QGLViewPrivate::bothEyesSurface()
-{
- switch (stereoType) {
- case QGLView::Hardware:
-#if defined(GL_BACK_LEFT) && defined(GL_BACK_RIGHT)
- return 0;
-#endif
- case QGLView::RedCyanAnaglyph:
- return &mainSurface;
- default:
- return 0;
- }
-}
-
-static QGLFormat makeStereoGLFormat(const QGLFormat& format)
-{
-#if defined(GL_BACK_LEFT) && defined(GL_BACK_RIGHT)
- QGLFormat fmt(format);
- if (qt_gl_stereo_arg() == QLatin1String("-stereo-hw"))
- fmt.setOption(QGL::StereoBuffers);
- return fmt;
-#else
- QGLFormat fmt(format);
- fmt.setOption(QGL::NoStereoBuffers);
- return fmt;
-#endif
-}
-
-/*!
- Constructs a new view widget and attaches it to \a parent.
-
- This constructor will request a stereo rendering context if
- the hardware supports it.
-*/
-QGLView::QGLView(QWidget *parent)
- : QGLWidget(makeStereoGLFormat(QGLFormat::defaultFormat()), parent)
-{
- d = new QGLViewPrivate(this);
- setMouseTracking(true);
- if (!parent)
- d->processStereoOptions(this);
-}
-
-/*!
- Constructs a new view widget and attaches it to \a parent.
- The \a format argument specifies the desired QGLFormat
- rendering options.
-
- If \a format does not include the stereo option, then a stereo
- viewing context will not be requested.
-*/
-QGLView::QGLView(const QGLFormat& format, QWidget *parent)
- : QGLWidget(format, parent)
-{
- d = new QGLViewPrivate(this);
- setMouseTracking(true);
- if (!parent)
- d->processStereoOptions(this);
-}
-
-/*!
- Destroys this view widget.
-*/
-QGLView::~QGLView()
-{
- delete d;
-}
-
-/*!
- Returns the options for this view. The default value is
- CameraNavigation.
-
- \sa setOptions(), setOption()
-*/
-QGLView::Options QGLView::options() const
-{
- return d->options;
-}
-
-/*!
- Sets the options for this view to \a value.
-
- \sa options(), setOption()
-*/
-void QGLView::setOptions(QGLView::Options value)
-{
- d->options = value;
-}
-
-/*!
- Enables or disables \a option according to \a value.
-
- \sa options(), setOptions()
-*/
-void QGLView::setOption(QGLView::Option option, bool value)
-{
- if (value)
- d->options |= option;
- else
- d->options &= ~option;
-}
-
-/*!
- Returns the type of stereo viewing technology that is in use.
-
- \sa setStereoType()
-*/
-QGLView::StereoType QGLView::stereoType() const
-{
- return d->stereoType;
-}
-
-/*!
- Sets the \a type of stereo viewing technology that is in use.
- The request takes effect at the next repaint.
-
- The request is ignored stereoType() or \a type is Hardware,
- because hardware stereo can only be enabled if the hardware
- supports it, and then it can never be disabled.
-
- \sa stereoType()
-*/
-void QGLView::setStereoType(QGLView::StereoType type)
-{
- if (d->stereoType == Hardware || type == Hardware)
- return;
- if (d->stereoType == type)
- return;
- d->stereoType = type;
-
- // Destroy the current surface objects so that they will
- // be re-generated the next time we paint the widget.
- delete d->leftSurface;
- delete d->rightSurface;
- d->leftSurface = 0;
- d->rightSurface = 0;
-}
-
-/*!
- Registers an \a object with this view to be notified when
- \a objectId is selected with the mouse. The \a object must
- persist for the lifetime of the QGLView, or until
- deregisterObject() is called for \a objectId.
-
- \sa deregisterObject(), objectForPoint()
-*/
-void QGLView::registerObject(int objectId, QObject *object)
-{
- d->objects[objectId] = object;
-}
-
-/*!
- Deregisters the object associated with \a objectId.
-
- \sa registerObject()
-*/
-void QGLView::deregisterObject(int objectId)
-{
- d->objects.remove(objectId);
-}
-
-/*!
- Returns the camera parameters. The camera defines the projection
- to apply to convert eye co-ordinates into window co-ordinates,
- and the position and orientation of the viewer's eye.
-
- \sa setCamera()
-*/
-QGLCamera *QGLView::camera() const
-{
- return d->camera;
-}
-
-/*!
- Sets the camera parameters to \a value. The camera defines the
- projection to apply to convert eye co-ordinates into window
- co-ordinates, and the position and orientation of the viewer's eye.
-
- If \a value is null, then the default camera object will be used.
-
- This function will call update() to force the view to
- update with the new camera parameters upon the next event loop.
-
- \sa camera()
-*/
-void QGLView::setCamera(QGLCamera *value)
-{
- if (!value)
- value = d->defaultCamera;
-
- if (d->camera == value)
- return;
-
- disconnect(d->camera, SIGNAL(projectionChanged()),
- this, SLOT(cameraChanged()));
- disconnect(d->camera, SIGNAL(viewChanged()),
- this, SLOT(cameraChanged()));
-
- d->camera = value;
-
- connect(d->camera, SIGNAL(projectionChanged()),
- this, SLOT(cameraChanged()));
- connect(d->camera, SIGNAL(viewChanged()),
- this, SLOT(cameraChanged()));
-
- cameraChanged();
-}
-
-/*!
- Maps \a point from viewport co-ordinates to eye co-ordinates.
-
- The returned vector will have its x and y components set to the
- position of the point on the near plane, and the z component
- set to the inverse of the camera's near plane.
-
- This function is used for converting a mouse event's position
- into eye co-ordinates within the current camera view.
-
- \sa QGLCamera::mapPoint()
-*/
-QVector3D QGLView::mapPoint(const QPoint &point) const
-{
- QSize viewportSize(size());
- qreal aspectRatio;
-
- // Get the size of the underlying paint device.
- int width = viewportSize.width();
- int height = viewportSize.height();
-
- // Use the device's DPI setting to determine the pixel aspect ratio.
- int dpiX = logicalDpiX();
- int dpiY = logicalDpiY();
- if (dpiX <= 0 || dpiY <= 0)
- dpiX = dpiY = 1;
-
- // Derive the aspect ratio based on window and pixel size.
- if (width <= 0 || height <= 0)
- aspectRatio = 1.0f;
- else
- aspectRatio = ((qreal)(width * dpiY)) / ((qreal)(height * dpiX));
-
- // Map the point into eye co-ordinates.
- return d->camera->mapPoint(point, aspectRatio, viewportSize);
-}
-
-void QGLView::cameraChanged()
-{
- // The pick buffer will need to be refreshed at the new camera position.
- d->pickBufferForceUpdate = true;
-
- // Queue an update for the next event loop.
- update();
-}
-
-/*!
- \internal
-*/
-void QGLView::initializeGL()
-{
- d->logEnter("QGLView::initializeGL");
- QGLPainter painter;
- painter.begin();
-
- // Set the default depth buffer options.
- glEnable(GL_DEPTH_TEST);
- glDepthFunc(GL_LESS);
- glDepthMask(GL_TRUE);
-#if defined(QT_OPENGL_ES)
- glDepthRangef(0.0f, 1.0f);
-#else
- glDepthRange(0.0f, 1.0f);
-#endif
-
- // Set the default blend options.
- if (painter.hasOpenGLFeature(QOpenGLFunctions::BlendColor))
- painter.glBlendColor(0, 0, 0, 0);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- if (painter.hasOpenGLFeature(QOpenGLFunctions::BlendEquation))
- painter.glBlendEquation(GL_FUNC_ADD);
- else if (painter.hasOpenGLFeature(QOpenGLFunctions::BlendEquationSeparate))
- painter.glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
-
- glDisable(GL_CULL_FACE);
- initializeGL(&painter);
- d->logLeave("QGLView::initializeGL");
-}
-
-/*!
- \internal
-*/
-void QGLView::resizeGL(int w, int h)
-{
- // Set up the standard viewport for the new window size.
- glViewport(0, 0, w, h);
-
- // We will need to regenerate the pick buffer.
- d->pickBufferForceUpdate = true;
-}
-
-/*!
- \internal
-*/
-void QGLView::paintGL()
-{
- d->logEnter("QGLView::paintGL");
- // We may need to regenerate the pick buffer on the next mouse event.
- d->pickBufferMaybeInvalid = true;
-
- // Paint the scene contents.
- QGLPainter painter;
- QGLAbstractSurface *surface;
- painter.begin();
- if ( (d->options & QGLView::ShowPicking) &&
- d->stereoType == QGLView::RedCyanAnaglyph) {
- // If showing picking, then render normally. This really
- // only works if we aren't using hardware or double stereo.
- painter.setPicking(true);
- painter.clearPickObjects();
- painter.setEye(QGL::NoEye);
- earlyPaintGL(&painter);
- painter.setCamera(d->camera);
- paintGL(&painter);
- painter.setPicking(false);
- } else if (d->camera->eyeSeparation() == 0.0f &&
- (surface = d->bothEyesSurface()) != 0) {
- // No camera separation, so render the same image into both buffers.
- painter.pushSurface(surface);
- painter.setEye(QGL::NoEye);
- earlyPaintGL(&painter);
- painter.setCamera(d->camera);
- paintGL(&painter);
- painter.popSurface();
- } else {
- // Paint the scene twice, from the perspective of each camera.
- QSize size(this->size());
- painter.setEye(QGL::LeftEye);
- if (d->stereoType != QGLView::Hardware)
- earlyPaintGL(&painter); // Clear both eyes at the same time.
- painter.pushSurface(d->leftEyeSurface(size));
- if (d->stereoType == QGLView::Hardware)
- earlyPaintGL(&painter); // Clear the left eye only.
- earlyPaintGL(&painter);
- painter.setCamera(d->camera);
- paintGL(&painter);
- if (d->stereoType == QGLView::RedCyanAnaglyph)
- glClear(GL_DEPTH_BUFFER_BIT);
- painter.setEye(QGL::RightEye);
- painter.setSurface(d->rightEyeSurface(size));
- if (d->stereoType == QGLView::Hardware)
- earlyPaintGL(&painter); // Clear the right eye only.
- painter.setCamera(d->camera);
- paintGL(&painter);
- painter.popSurface();
- }
- d->logLeave("QGLView::paintGL");
-}
-
-/*!
- Initializes the current GL context represented by \a painter.
-
- \sa paintGL()
-*/
-void QGLView::initializeGL(QGLPainter *painter)
-{
- Q_UNUSED(painter);
-}
-
-/*!
- Performs early painting operations just after \a painter
- is initialized but before the camera is set up. The default
- implementation clears the color buffer and depth buffer.
-
- This function is typically overridden to draw scene backdrops
- on the color buffer before the rest of the scene is drawn
- by paintGL().
-
- \sa paintGL()
-*/
-void QGLView::earlyPaintGL(QGLPainter *painter)
-{
- Q_UNUSED(painter);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-/*!
- \fn void QGLView::paintGL(QGLPainter *painter)
-
- Paints the scene onto \a painter. The color and depth buffers
- will have already been cleared, and the camera() position set.
-
- If QGLPainter::isPicking() is set for \a painter, then the
- function should paint the scene onto \a painter in
- "object picking mode". The scene will be rendered into a
- background buffer using flat colors so that mouse events
- can determine which object lies under the mouse pointer.
-
- The default implementation of picking will typically just
- render the scene normally. However, some applications
- may wish to render a simpler scene that omits unselectable
- objects and uses simpler meshes for the selectable objects.
-
- \sa earlyPaintGL()
-*/
-
-/*!
- Processes the mouse press event \a e.
-*/
-void QGLView::mousePressEvent(QMouseEvent *e)
-{
- QObject *object;
- if (!d->panning && (d->options & QGLView::ObjectPicking) != 0)
- object = objectForPoint(e->pos());
- else
- object = 0;
- if (d->pressedObject) {
- // Send the press event to the pressed object. Use a position
- // of (0, 0) if the mouse is still within the pressed object,
- // or (-1, -1) if the mouse is no longer within the pressed object.
- QMouseEvent event
- (QEvent::MouseButtonPress,
- (d->pressedObject == object) ? QPoint(0, 0) : QPoint(-1, -1),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(d->pressedObject, &event);
- } else if (object) {
- // Record the object that was pressed and forward the event.
- d->pressedObject = object;
- d->enteredObject = 0;
- d->pressedButton = e->button();
-
- // Send a mouse press event for (0, 0).
- QMouseEvent event(QEvent::MouseButtonPress, QPoint(0, 0),
- e->globalPos(), e->button(), e->buttons(),
- e->modifiers());
- QCoreApplication::sendEvent(object, &event);
- } else if ((d->options & QGLView::CameraNavigation) != 0 &&
- e->button() == Qt::LeftButton) {
- d->panning = true;
- d->lastPan = d->startPan = e->pos();
- d->startEye = d->camera->eye();
- d->startCenter = d->camera->center();
- d->startUpVector = d->camera->upVector();
- d->panModifiers = e->modifiers();
-#ifndef QT_NO_CURSOR
- setCursor(Qt::ClosedHandCursor);
-#endif
- }
- QGLWidget::mousePressEvent(e);
-}
-
-/*!
- Processes the mouse release event \a e.
-*/
-void QGLView::mouseReleaseEvent(QMouseEvent *e)
-{
- if (d->panning && e->button() == Qt::LeftButton) {
- d->panning = false;
-#ifndef QT_NO_CURSOR
- unsetCursor();
-#endif
- }
- if (d->pressedObject) {
- // Notify the previously pressed object about the release.
- QObject *object = objectForPoint(e->pos());
- QObject *pressed = d->pressedObject;
- if (e->button() == d->pressedButton) {
- d->pressedObject = 0;
- d->pressedButton = Qt::NoButton;
- d->enteredObject = object;
-
- // Send the release event to the pressed object. Use a position
- // of (0, 0) if the mouse is still within the pressed object,
- // or (-1, -1) if the mouse is no longer within the pressed object.
- QMouseEvent event
- (QEvent::MouseButtonRelease,
- (pressed == object) ? QPoint(0, 0) : QPoint(-1, -1),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(pressed, &event);
-
- // Send leave and enter events if necessary.
- if (object != pressed) {
- sendLeaveEvent(pressed);
- if (object)
- sendEnterEvent(object);
- }
- } else {
- // Some other button than the original was released.
- // Forward the event to the pressed object.
- QMouseEvent event
- (QEvent::MouseButtonRelease,
- (pressed == object) ? QPoint(0, 0) : QPoint(-1, -1),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(pressed, &event);
- }
- }
- QGLWidget::mouseReleaseEvent(e);
-}
-
-/*!
- Processes the mouse double click event \a e.
-*/
-void QGLView::mouseDoubleClickEvent(QMouseEvent *e)
-{
- if ((d->options & QGLView::ObjectPicking) != 0) {
- QObject *object = objectForPoint(e->pos());
- if (object) {
- // Simulate a double click event for (0, 0).
- QMouseEvent event
- (QEvent::MouseButtonDblClick, QPoint(0, 0),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(object, &event);
- }
- }
- QGLWidget::mouseDoubleClickEvent(e);
-}
-
-/*!
- Processes the mouse move event \a e.
-*/
-void QGLView::mouseMoveEvent(QMouseEvent *e)
-{
- if (d->panning) {
- QPoint delta = e->pos() - d->startPan;
- if (e->modifiers() == d->panModifiers) {
- d->camera->setEye(d->startEye);
- d->camera->setCenter(d->startCenter);
- d->camera->setUpVector(d->startUpVector);
- } else {
- d->startPan = d->lastPan;
- delta = e->pos() - d->startPan;
- d->startEye = d->camera->eye();
- d->startCenter = d->camera->center();
- d->startUpVector = d->camera->upVector();
- d->panModifiers = e->modifiers();
- }
- d->lastPan = e->pos();
- if ((e->modifiers() & Qt::ControlModifier) != 0)
- wheel(delta.y() * -60);
- else if ((e->modifiers() & Qt::ShiftModifier) != 0)
- pan(delta.x(), delta.y());
- else
- rotate(delta.x(), delta.y());
- } else if ((d->options & QGLView::ObjectPicking) != 0) {
- QObject *object = objectForPoint(e->pos());
- if (d->pressedObject) {
- // Send the move event to the pressed object. Use a position
- // of (0, 0) if the mouse is still within the pressed object,
- // or (-1, -1) if the mouse is no longer within the pressed object.
- QMouseEvent event
- (QEvent::MouseMove,
- (d->pressedObject == object) ? QPoint(0, 0) : QPoint(-1, -1),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(d->pressedObject, &event);
- } else if (object) {
- if (object != d->enteredObject) {
- if (d->enteredObject)
- sendLeaveEvent(d->enteredObject);
- d->enteredObject = object;
- sendEnterEvent(d->enteredObject);
- }
- QMouseEvent event
- (QEvent::MouseMove, QPoint(0, 0),
- e->globalPos(), e->button(), e->buttons(), e->modifiers());
- QCoreApplication::sendEvent(object, &event);
- } else if (d->enteredObject) {
- sendLeaveEvent(d->enteredObject);
- d->enteredObject = 0;
- }
- }
- QGLWidget::mouseMoveEvent(e);
-}
-
-/*!
- Processes the leave event \a e.
-*/
-void QGLView::leaveEvent(QEvent *e)
-{
- if (!d->pressedObject && d->enteredObject) {
- sendLeaveEvent(d->enteredObject);
- d->enteredObject = 0;
- }
- QGLWidget::leaveEvent(e);
-}
-
-#ifndef QT_NO_WHEELEVENT
-
-/*!
- Processes the wheel event \a e.
-*/
-void QGLView::wheelEvent(QWheelEvent *e)
-{
- if ((d->options & QGLView::CameraNavigation) != 0)
- wheel(e->delta());
- QGLWidget::wheelEvent(e);
-}
-
-#endif
-
-/*!
- Processes the key press event \a e.
-*/
-void QGLView::keyPressEvent(QKeyEvent *e)
-{
- QGLCamera *camera;
- qreal sep;
-
- if ((d->options & QGLView::CameraNavigation) == 0) {
- QGLWidget::keyPressEvent(e);
- return;
- }
- switch (e->key()) {
-
- case Qt::Key_Escape:
- case Qt::Key_Q:
- {
- if (parentWidget() == 0)
- close();
- }
-
- case Qt::Key_Left:
- {
- if ((e->modifiers() & Qt::ShiftModifier) != 0) {
- pan(-10, 0);
- } else if ((e->modifiers() & Qt::ControlModifier) != 0) {
- camera = this->camera();
- sep = camera->eyeSeparation();
- sep -= (sep / 10.0f);
- if (sep < 0.0f)
- sep = 0.0f;
- camera->setEyeSeparation(sep);
- e->accept();
- return;
- } else {
- rotate(-10, 0);
- }
- }
- break;
-
- case Qt::Key_Right:
- {
- if ((e->modifiers() & Qt::ShiftModifier) != 0) {
- pan(10, 0);
- } else if ((e->modifiers() & Qt::ControlModifier) != 0) {
- camera = this->camera();
- sep = camera->eyeSeparation();
- sep += (sep / 10.0f);
- camera->setEyeSeparation(sep);
- e->accept();
- return;
- } else {
- rotate(10, 0);
- }
- }
- break;
-
- case Qt::Key_Up:
- {
- if ((e->modifiers() & Qt::ControlModifier) != 0)
- wheel(120);
- else if ((e->modifiers() & Qt::ShiftModifier) != 0)
- pan(0, -10);
- else
- rotate(0, -10);
- }
- break;
-
- case Qt::Key_Down:
- {
- if ((e->modifiers() & Qt::ControlModifier) != 0)
- wheel(-120);
- else if ((e->modifiers() & Qt::ShiftModifier) != 0)
- pan(0, 10);
- else
- rotate(0, 10);
- }
- break;
- }
- QGLWidget::keyPressEvent(e);
-}
-
-class QGLViewPickSurface : public QGLAbstractSurface
-{
-public:
- QGLViewPickSurface(QGLView *view, QGLFramebufferObject *fbo,
- const QSize &areaSize);
-
- QPaintDevice *device() const;
- bool activate(QGLAbstractSurface *prevSurface);
- void deactivate(QGLAbstractSurface *nextSurface);
- QRect viewportGL() const;
-
-private:
- QGLView *m_view;
- QGLFramebufferObject *m_fbo;
- QRect m_viewportGL;
-};
-
-QGLViewPickSurface::QGLViewPickSurface
- (QGLView *view, QGLFramebufferObject *fbo, const QSize &areaSize)
- : QGLAbstractSurface(504)
- , m_view(view)
- , m_fbo(fbo)
- , m_viewportGL(QPoint(0, 0), areaSize)
-{
-}
-
-QPaintDevice *QGLViewPickSurface::device() const
-{
- return m_view;
-}
-
-bool QGLViewPickSurface::activate(QGLAbstractSurface *prevSurface)
-{
- Q_UNUSED(prevSurface);
- if (m_fbo)
- m_fbo->bind();
- return true;
-}
-
-void QGLViewPickSurface::deactivate(QGLAbstractSurface *nextSurface)
-{
- Q_UNUSED(nextSurface);
- if (m_fbo)
- m_fbo->release();
-}
-
-QRect QGLViewPickSurface::viewportGL() const
-{
- return m_viewportGL;
-}
-
-/*!
- Returns the registered object that is under the mouse position
- specified by \a point. This function may need to regenerate
- the contents of the pick buffer by repainting the scene
- with paintGL().
-
- \sa registerObject()
-*/
-QObject *QGLView::objectForPoint(const QPoint &point)
-{
- QPoint pt(point);
-
- // What is the size of the drawing area after correcting for stereo?
- // Also adjust the mouse position to always be in the left half.
- QSize areaSize = size();
- switch (d->stereoType) {
- case QGLView::LeftRight:
- case QGLView::RightLeft:
- areaSize = QSize(areaSize.width() / 2, areaSize.height());
- if (pt.x() >= areaSize.width())
- pt.setX(pt.x() - areaSize.width());
- break;
- case QGLView::TopBottom:
- case QGLView::BottomTop:
- areaSize = QSize(areaSize.width(), areaSize.height() / 2);
- if (pt.y() >= areaSize.height())
- pt.setY(pt.y() - areaSize.height());
- break;
- case QGLView::StretchedLeftRight:
- case QGLView::StretchedRightLeft: {
- int halfwid = areaSize.width() / 2;
- if (pt.x() >= halfwid)
- pt.setX((pt.x() - halfwid) * 2);
- else
- pt.setX(pt.x() * 2);
- break; }
- case QGLView::StretchedTopBottom:
- case QGLView::StretchedBottomTop: {
- int halfht = areaSize.height() / 2;
- if (pt.y() >= halfht)
- pt.setY((pt.y() - halfht) * 2);
- else
- pt.setY(pt.y() * 2);
- break; }
- default: break;
- }
-
- // Check the area boundaries in case a mouse move has
- // moved the pointer outside the window.
- if (pt.x() < 0 || pt.x() >= areaSize.width() ||
- pt.y() < 0 || pt.y() >= areaSize.height())
- return 0;
-
- // Do we need to refresh the pick buffer contents?
- QGLPainter painter(this);
- if (d->pickBufferForceUpdate) {
- // Initialize the painter, which will make the window context current.
- painter.setPicking(true);
- painter.clearPickObjects();
-
- // Create a framebuffer object as big as the window to act
- // as the pick buffer if we are single buffered. If we are
- // double-buffered, then use the window back buffer.
- bool useBackBuffer = doubleBuffer();
- if (!useBackBuffer) {
- QSize fbosize = QGL::nextPowerOfTwo(areaSize);
- if (!d->fbo) {
- d->fbo = new QGLFramebufferObject(fbosize, QGLFramebufferObject::CombinedDepthStencil);
- } else if (d->fbo->size() != fbosize) {
- delete d->fbo;
- d->fbo = new QGLFramebufferObject(fbosize, QGLFramebufferObject::CombinedDepthStencil);
- }
- }
-
- // Render the pick version of the scene.
- QGLViewPickSurface surface(this, d->fbo, areaSize);
- painter.pushSurface(&surface);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- painter.setEye(QGL::NoEye);
- painter.setCamera(d->camera);
- paintGL(&painter);
- painter.setPicking(false);
- painter.popSurface();
-
- // The pick buffer contents are now valid, unless we are using
- // the back buffer - we cannot rely upon it being valid next time.
- d->pickBufferForceUpdate = useBackBuffer;
- d->pickBufferMaybeInvalid = false;
- }
-
- // Pick the object under the mouse.
- if (d->fbo)
- d->fbo->bind();
- int objectId = painter.pickObject(pt.x(), areaSize.height() - 1 - pt.y());
- QObject *object = d->objects.value(objectId, 0);
- if (d->fbo)
- d->fbo->release();
-
- // Release the framebuffer object and return.
- painter.end();
- doneCurrent();
- return object;
-}
-
-void QGLView::sendEnterEvent(QObject *object)
-{
- QEvent event(QEvent::Enter);
- QCoreApplication::sendEvent(object, &event);
-}
-
-void QGLView::sendLeaveEvent(QObject *object)
-{
- QEvent event(QEvent::Leave);
- QCoreApplication::sendEvent(object, &event);
-}
-
-// Zoom in and out according to the change in wheel delta.
-void QGLView::wheel(int delta)
-{
- if (d->options & QGLView::FOVZoom) {
- //Use field-of view as zoom (much like a traditional camera)
- qreal scale = qAbs(viewDelta(delta, delta).x());
- if (delta < 0)
- scale = -scale;
- if (scale >= 0.0f)
- scale += 1.0f;
- else
- scale = 1.0f / (1.0f - scale);
- qreal fov = d->camera->fieldOfView();
- if (fov != 0.0f)
- d->camera->setFieldOfView(d->camera->fieldOfView() / scale);
- else
- d->camera->setViewSize(d->camera->viewSize() / scale);
- } else {
- // enable this to get wheel navigation that actually zooms by moving the
- // camera back, as opposed to making the angle of view wider.
- QVector3D viewVector= camera()->eye() - camera()->center();
- qreal zoomMag = viewVector.length();
- qreal zoomIncrement = -float(delta) / 100.0f;
- if (!qFuzzyIsNull(zoomIncrement))
- {
- zoomMag += zoomIncrement;
- if (zoomMag < 1.0f)
- zoomMag = 1.0f;
-
- QRay3D viewLine(camera()->center(), viewVector.normalized());
- camera()->setEye(viewLine.point(zoomMag));
- }
- }
-
-}
-
-// Pan left/right/up/down without rotating about the object.
-void QGLView::pan(int deltax, int deltay)
-{
- QPointF delta = viewDelta(deltax, deltay);
- QVector3D t = d->camera->translation(delta.x(), -delta.y(), 0.0f);
-
- // Technically panning the eye left should make the object appear to
- // move off to the right, but this looks weird on-screen where the user
- // actually thinks they are picking up the object and dragging it rather
- // than moving the eye. We therefore apply the inverse of the translation
- // to make it "look right".
- d->camera->setEye(d->camera->eye() - t);
- d->camera->setCenter(d->camera->center() - t);
-}
-
-// Rotate about the object being viewed.
-void QGLView::rotate(int deltax, int deltay)
-{
- int rotation = d->camera->screenRotation();
- if (rotation == 90 || rotation == 270) {
- qSwap(deltax, deltay);
- }
- if (rotation == 90 || rotation == 180) {
- deltax = -deltax;
- }
- if (rotation == 180 || rotation == 270) {
- deltay = -deltay;
- }
- qreal anglex = deltax * 90.0f / width();
- qreal angley = deltay * 90.0f / height();
- QQuaternion q = d->camera->pan(-anglex);
- q *= d->camera->tilt(-angley);
- d->camera->rotateCenter(q);
-}
-
-/*!
- Converts \a deltax and \a deltay into percentages of the
- view width and height. Returns a QPointF containing the
- percentage values, typically between -1 and 1.
-
- This function is typically used by subclasses to convert a
- change in mouse position into a relative distance travelled
- across the field of view.
-
- The returned value is corrected for the camera() screen
- rotation and view size.
-*/
-QPointF QGLView::viewDelta(int deltax, int deltay) const
-{
- int w = width();
- int h = height();
- bool scaleToWidth;
- qreal scaleFactor, scaleX, scaleY;
- QSizeF viewSize = d->camera->viewSize();
- if (w >= h) {
- if (viewSize.width() >= viewSize.height())
- scaleToWidth = true;
- else
- scaleToWidth = false;
- } else {
- if (viewSize.width() >= viewSize.height())
- scaleToWidth = false;
- else
- scaleToWidth = true;
- }
- int rotation = d->camera->screenRotation();
- if (rotation == 90 || rotation == 270) {
- scaleToWidth = !scaleToWidth;
- qSwap(deltax, deltay);
- }
- if (rotation == 90 || rotation == 180) {
- deltax = -deltax;
- }
- if (rotation == 180 || rotation == 270) {
- deltay = -deltay;
- }
- if (scaleToWidth) {
- scaleFactor = 2.0f / viewSize.width();
- scaleX = scaleFactor * ((qreal)h) / ((qreal)w);
- scaleY = scaleFactor;
- } else {
- scaleFactor = 2.0f / viewSize.height();
- scaleX = scaleFactor;
- scaleY = scaleFactor * ((qreal)w) / ((qreal)h);
- }
- return QPointF(deltax * scaleX / w, deltay * scaleY / h);
-}
-
-/*!
- \fn QPointF QGLView::viewDelta(const QPoint &delta) const
- \overload
-
- Converts the x and y components of \a delta into percentages
- of the view width and height. Returns a QPointF containing
- the percentage values, typically between -1 and 1.
-*/
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/Qt3D/viewing/qglview.h b/src/gui/extern/Qt3D/viewing/qglview.h
deleted file mode 100644
index c498eb49531115c011c506292ef8b6c7ed4e47de..0000000000000000000000000000000000000000
--- a/src/gui/extern/Qt3D/viewing/qglview.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3D 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 QGLVIEW_H
-#define QGLVIEW_H
-
-#include "qglpainter.h"
-#include "qglcamera.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3D)
-
-class QGLViewPrivate;
-
-class Q_QT3D_EXPORT QGLView : public QGLWidget
-{
- Q_OBJECT
-public:
- explicit QGLView(QWidget *parent=0);
- explicit QGLView(const QGLFormat& format, QWidget *parent=0);
- ~QGLView();
-
- enum Option
- {
- ObjectPicking = 0x0001,
- ShowPicking = 0x0002,
- CameraNavigation = 0x0004,
- PaintingLog = 0x0008,
- FOVZoom = 0x0010
- };
- Q_DECLARE_FLAGS(Options, Option)
-
- QGLView::Options options() const;
- void setOptions(QGLView::Options value);
- void setOption(QGLView::Option option, bool value);
-
- enum StereoType
- {
- Hardware,
- RedCyanAnaglyph,
- LeftRight,
- RightLeft,
- TopBottom,
- BottomTop,
- StretchedLeftRight,
- StretchedRightLeft,
- StretchedTopBottom,
- StretchedBottomTop
- };
-
- QGLView::StereoType stereoType() const;
- void setStereoType(QGLView::StereoType type);
-
- void registerObject(int objectId, QObject *object);
- void deregisterObject(int objectId);
- QObject *objectForPoint(const QPoint &point);
-
- QGLCamera *camera() const;
- void setCamera(QGLCamera *camera);
-
- QVector3D mapPoint(const QPoint &point) const;
-
-protected:
- void initializeGL();
- void resizeGL(int w, int h);
- void paintGL();
- virtual void initializeGL(QGLPainter *painter);
- virtual void earlyPaintGL(QGLPainter *painter);
- virtual void paintGL(QGLPainter *painter) = 0;
-
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void leaveEvent(QEvent *e);
-#ifndef QT_NO_WHEELEVENT
- void wheelEvent(QWheelEvent *e);
-#endif
- void keyPressEvent(QKeyEvent *e);
-
- QPointF viewDelta(int deltax, int deltay) const;
- QPointF viewDelta(const QPoint &delta) const
- { return viewDelta(delta.x(), delta.y()); }
-
-private Q_SLOTS:
- void cameraChanged();
-
-private:
- QGLViewPrivate *d;
-
- static void sendEnterEvent(QObject *object);
- static void sendLeaveEvent(QObject *object);
-
- void wheel(int delta);
- void pan(int deltax, int deltay);
- void rotate(int deltax, int deltay);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLView::Options)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/CMakeLists.txt b/src/gui/extern/QtGradientEditor/CMakeLists.txt
deleted file mode 100644
index b42e203c43078383ae97f88bb8f6612336454039..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-target_sources( gui
- PRIVATE
- qtcolorbutton.h
- qtcolorline.h
- qtcolorline.cpp
- qtgradientviewdialog.cpp
- qtgradientstopsmodel.cpp
- qtgradientutils.cpp
- qtgradientview.cpp
- qtgradientmanager.h
- qtgradientviewdialog.h
- qtgradientwidget.cpp
- qtgradientstopscontroller.h
- qtgradientdialog.cpp
- qtgradientstopswidget.h
- qtcolorbutton.cpp
- qtgradientstopswidget.cpp
- qtgradientstopsmodel.h
- qtgradientmanager.cpp
- qtgradientview.h
- qtgradientstopscontroller.cpp
- qtgradienteditor.cpp
- qtgradientdialog.h
- qtgradientwidget.h
- qtgradienteditor.h
- qtgradientutils.h
- )
diff --git a/src/gui/extern/QtGradientEditor/qtcolorbutton.cpp b/src/gui/extern/QtGradientEditor/qtcolorbutton.cpp
deleted file mode 100644
index 6596b5c403c11332f3e00b3625c9e0157729a685..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtcolorbutton.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtcolorbutton.h"
-#include <QtGui/QColorDialog>
-#include <QtGui/QPainter>
-#include <QtCore/QMimeData>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QApplication>
-
-QT_BEGIN_NAMESPACE
-
-
-
-void QtColorButtonPrivate::slotEditColor()
-{
- bool ok;
- const QRgb rgba = QColorDialog::getRgba(m_color.rgba(), &ok, q_ptr);
- if (!ok)
- return;
- const QColor c = QColor::fromRgba(rgba);
- if (c == q_ptr->color())
- return;
- q_ptr->setColor(c);
- emit q_ptr->colorChanged(m_color);
-}
-
-QColor QtColorButtonPrivate::shownColor() const
-{
-#ifndef QT_NO_DRAGANDDROP
- if (m_dragging)
- return m_dragColor;
-#endif
- return m_color;
-}
-
-QPixmap QtColorButtonPrivate::generatePixmap() const
-{
- QPixmap pix(24, 24);
-
- int pixSize = 20;
- QBrush br(shownColor());
-
- QPixmap pm(2 * pixSize, 2 * pixSize);
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::lightGray);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::lightGray);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::darkGray);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::darkGray);
- pmp.fillRect(0, 0, 2 * pixSize, 2 * pixSize, shownColor());
- br = QBrush(pm);
-
- QPainter p(&pix);
- int corr = 1;
- QRect r = pix.rect().adjusted(corr, corr, -corr, -corr);
- p.setBrushOrigin((r.width() % pixSize + pixSize) / 2 + corr, (r.height() % pixSize + pixSize) / 2 + corr);
- p.fillRect(r, br);
-
- p.fillRect(r.width() / 4 + corr, r.height() / 4 + corr,
- r.width() / 2, r.height() / 2,
- QColor(shownColor().rgb()));
- p.drawRect(pix.rect().adjusted(0, 0, -1, -1));
-
- return pix;
-}
-
-///////////////
-
-QtColorButton::QtColorButton(QWidget *parent)
- : QToolButton(parent)
-{
- d_ptr = new QtColorButtonPrivate;
- d_ptr->q_ptr = this;
- d_ptr->m_dragging = false;
- d_ptr->m_backgroundCheckered = true;
-
- setAcceptDrops(true);
-
- connect(this, SIGNAL(clicked()), this, SLOT(slotEditColor()));
- setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
-}
-
-QtColorButton::~QtColorButton()
-{
- delete d_ptr;
-}
-
-void QtColorButton::setColor(const QColor &color)
-{
- if (d_ptr->m_color == color)
- return;
- d_ptr->m_color = color;
- update();
-}
-
-QColor QtColorButton::color() const
-{
- return d_ptr->m_color;
-}
-
-void QtColorButton::setBackgroundCheckered(bool checkered)
-{
- if (d_ptr->m_backgroundCheckered == checkered)
- return;
- d_ptr->m_backgroundCheckered = checkered;
- update();
-}
-
-bool QtColorButton::isBackgroundCheckered() const
-{
- return d_ptr->m_backgroundCheckered;
-}
-
-void QtColorButton::paintEvent(QPaintEvent *event)
-{
- QToolButton::paintEvent(event);
- if (!isEnabled())
- return;
-
- const int pixSize = 10;
- QBrush br(d_ptr->shownColor());
- if (d_ptr->m_backgroundCheckered) {
- QPixmap pm(2 * pixSize, 2 * pixSize);
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::white);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::white);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black);
- pmp.fillRect(0, 0, 2 * pixSize, 2 * pixSize, d_ptr->shownColor());
- br = QBrush(pm);
- }
-
- QPainter p(this);
- const int corr = 4;
- QRect r = rect().adjusted(corr, corr, -corr, -corr);
- p.setBrushOrigin((r.width() % pixSize + pixSize) / 2 + corr, (r.height() % pixSize + pixSize) / 2 + corr);
- p.fillRect(r, br);
-
- //const int adjX = qRound(r.width() / 4.0);
- //const int adjY = qRound(r.height() / 4.0);
- //p.fillRect(r.adjusted(adjX, adjY, -adjX, -adjY),
- // QColor(d_ptr->shownColor().rgb()));
- /*
- p.fillRect(r.adjusted(0, r.height() * 3 / 4, 0, 0),
- QColor(d_ptr->shownColor().rgb()));
- p.fillRect(r.adjusted(0, 0, 0, -r.height() * 3 / 4),
- QColor(d_ptr->shownColor().rgb()));
- */
- /*
- const QColor frameColor0(0, 0, 0, qRound(0.2 * (0xFF - d_ptr->shownColor().alpha())));
- p.setPen(frameColor0);
- p.drawRect(r.adjusted(adjX, adjY, -adjX - 1, -adjY - 1));
- */
-
- const QColor frameColor1(0, 0, 0, 26);
- p.setPen(frameColor1);
- p.drawRect(r.adjusted(1, 1, -2, -2));
- const QColor frameColor2(0, 0, 0, 51);
- p.setPen(frameColor2);
- p.drawRect(r.adjusted(0, 0, -1, -1));
-}
-
-void QtColorButton::mousePressEvent(QMouseEvent *event)
-{
-#ifndef QT_NO_DRAGANDDROP
- if (event->button() == Qt::LeftButton)
- d_ptr->m_dragStart = event->pos();
-#endif
- QToolButton::mousePressEvent(event);
-}
-
-void QtColorButton::mouseMoveEvent(QMouseEvent *event)
-{
-#ifndef QT_NO_DRAGANDDROP
- if ( (event->buttons() & Qt::LeftButton) &&
- (d_ptr->m_dragStart - event->pos()).manhattanLength() > QApplication::startDragDistance()) {
- QMimeData *mime = new QMimeData;
- mime->setColorData(color());
- QDrag *drg = new QDrag(this);
- drg->setMimeData(mime);
- drg->setPixmap(d_ptr->generatePixmap());
- setDown(false);
- event->accept();
- drg->start();
- return;
- }
-#endif
- QToolButton::mouseMoveEvent(event);
-}
-
-#ifndef QT_NO_DRAGANDDROP
-void QtColorButton::dragEnterEvent(QDragEnterEvent *event)
-{
- const QMimeData *mime = event->mimeData();
- if (!mime->hasColor())
- return;
-
- event->accept();
- d_ptr->m_dragColor = qvariant_cast<QColor>(mime->colorData());
- d_ptr->m_dragging = true;
- update();
-}
-
-void QtColorButton::dragLeaveEvent(QDragLeaveEvent *event)
-{
- event->accept();
- d_ptr->m_dragging = false;
- update();
-}
-
-void QtColorButton::dropEvent(QDropEvent *event)
-{
- event->accept();
- d_ptr->m_dragging = false;
- if (d_ptr->m_dragColor == color())
- return;
- setColor(d_ptr->m_dragColor);
- emit colorChanged(color());
-}
-#endif
-
-QT_END_NAMESPACE
-
-
diff --git a/src/gui/extern/QtGradientEditor/qtcolorbutton.h b/src/gui/extern/QtGradientEditor/qtcolorbutton.h
deleted file mode 100644
index 8d3d85b6a95620daa2b1680ddbbcd6265fdd769f..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtcolorbutton.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTCOLORBUTTON_H
-#define QTCOLORBUTTON_H
-
-#include <QtGui/QToolButton>
-
-QT_BEGIN_NAMESPACE
-
-class QtColorButton : public QToolButton
-{
- Q_OBJECT
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
-public:
- QtColorButton(QWidget *parent = 0);
- ~QtColorButton();
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- QColor color() const;
-
-public slots:
-
- void setColor(const QColor &color);
-
-signals:
- void colorChanged(const QColor &color);
-protected:
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
-#ifndef QT_NO_DRAGANDDROP
- void dragEnterEvent(QDragEnterEvent *event);
- void dragLeaveEvent(QDragLeaveEvent *event);
- void dropEvent(QDropEvent *event);
-#endif
-private:
- class QtColorButtonPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtColorButton)
- Q_DISABLE_COPY(QtColorButton)
- Q_PRIVATE_SLOT(d_func(), void slotEditColor())
-};
-
-//put private here: otherwise build problems when using extra moc files
-class QtColorButtonPrivate
-{
- QtColorButton *q_ptr;
- Q_DECLARE_PUBLIC(QtColorButton)
-public:
- QColor m_color;
-#ifndef QT_NO_DRAGANDDROP
- QColor m_dragColor;
- QPoint m_dragStart;
- bool m_dragging;
-#endif
- bool m_backgroundCheckered;
-
- void slotEditColor();
- QColor shownColor() const;
- QPixmap generatePixmap() const;
-};
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtcolorline.cpp b/src/gui/extern/QtGradientEditor/qtcolorline.cpp
deleted file mode 100644
index 6c5a30b04689f8f11e7e8ccaa2f38f50aeeafd0a..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtcolorline.cpp
+++ /dev/null
@@ -1,1125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtcolorline.h"
-#include "qdrawutil.h"
-
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QStyleOption>
-
-QT_BEGIN_NAMESPACE
-
-class QtColorLinePrivate
-{
- QtColorLine *q_ptr;
- Q_DECLARE_PUBLIC(QtColorLine)
-public:
- QtColorLinePrivate();
-
- QColor color() const;
- void setColor(const QColor &color);
-
- QtColorLine::ColorComponent colorComponent() const;
- void setColorComponent(QtColorLine::ColorComponent component);
-
- void setIndicatorSize(int size);
- int indicatorSize() const;
-
- void setIndicatorSpace(int space);
- int indicatorSpace() const;
-
- void setFlip(bool flip);
- bool flip() const;
-
- void setBackgroundCheckered(bool checkered);
- bool isBackgroundCheckered() const;
-
- void setOrientation(Qt::Orientation orientation);
- Qt::Orientation orientation() const;
-
- void resizeEvent(QResizeEvent *event);
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
- void mouseDoubleClickEvent(QMouseEvent *event);
-private:
- void checkColor();
- bool isMainPixmapValid() const;
- void validate();
- void recreateMainPixmap();
- QSize pixmapSizeFromGeometrySize(const QSize &geometrySize) const;
- QPixmap gradientPixmap(int size, Qt::Orientation orientation, const QColor &begin, const QColor &end, bool flipped = false) const;
- QPixmap gradientPixmap(Qt::Orientation orientation, const QColor &begin, const QColor &end, bool flipped = false) const;
- QPixmap hueGradientPixmap(int size, Qt::Orientation orientation, bool flipped = false,
- int saturation = 0xFF, int value = 0xFF, int alpha = 0xFF) const;
- QPixmap hueGradientPixmap(Qt::Orientation orientation, bool flipped = false,
- int saturation = 0xFF, int value = 0xFF, int alpha = 0xFF) const;
-
- QVector<QRect> rects(const QPointF &point) const;
-
- QColor colorFromPoint(const QPointF &point) const;
- QPointF pointFromColor(const QColor &color) const;
-
- QColor m_color;
- QtColorLine::ColorComponent m_component;
- bool m_flipped;
- bool m_backgroundCheckered;
- Qt::Orientation m_orientation;
- bool m_dragging;
- bool m_combiningAlpha;
- int m_indicatorSize;
- int m_indicatorSpace;
- QPointF m_point;
- QPoint m_clickOffset;
-
- QPixmap m_mainPixmap;
- QPixmap m_alphalessPixmap;
- QPixmap m_semiAlphaPixmap;
- QSize m_pixmapSize;
-
- struct PixData {
- QSize size;
- QColor color;
- QtColorLine::ColorComponent component;
- bool flipped;
- Qt::Orientation orientation;
- };
-
- PixData m_lastValidMainPixmapData;
-};
-
-QtColorLinePrivate::QtColorLinePrivate()
- : m_color(Qt::black), m_component(QtColorLine::Value),
- m_flipped(false), m_backgroundCheckered(true), m_orientation(Qt::Horizontal), m_dragging(false), m_combiningAlpha(false)
-{
- m_indicatorSize = 22;
- m_indicatorSpace = 0;
- m_pixmapSize = QSize(0, 0);
- m_point = pointFromColor(m_color);
-}
-
-void QtColorLinePrivate::setColor(const QColor &color)
-{
- if (m_color == color)
- return;
- if (!color.isValid())
- return;
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- m_color = color;
- checkColor();
- QColor c = colorFromPoint(m_point);
- m_point = pointFromColor(m_color);
- q_ptr->update();
-}
-
-QColor QtColorLinePrivate::color() const
-{
- return m_color;
-}
-
-void QtColorLinePrivate::setColorComponent(QtColorLine::ColorComponent component)
-{
- if (m_component == component)
- return;
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- m_component = component;
- checkColor();
- m_point = pointFromColor(m_color);
- q_ptr->update();
-}
-
-QtColorLine::ColorComponent QtColorLinePrivate::colorComponent() const
-{
- return m_component;
-}
-
-void QtColorLinePrivate::setIndicatorSize(int size)
-{
- if (size <= 0)
- return;
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- if (m_indicatorSize == size)
- return;
- m_indicatorSize = size;
- m_pixmapSize = pixmapSizeFromGeometrySize(q_ptr->contentsRect().size());
- q_ptr->update();
- q_ptr->updateGeometry();
-}
-
-int QtColorLinePrivate::indicatorSize() const
-{
- return m_indicatorSize;
-}
-
-void QtColorLinePrivate::setIndicatorSpace(int space)
-{
- if (space < 0)
- return;
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- if (m_indicatorSpace == space)
- return;
- m_indicatorSpace = space;
- m_pixmapSize = pixmapSizeFromGeometrySize(q_ptr->contentsRect().size());
- q_ptr->update();
-}
-
-int QtColorLinePrivate::indicatorSpace() const
-{
- return m_indicatorSpace;
-}
-
-void QtColorLinePrivate::setFlip(bool flip)
-{
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- if (m_flipped == flip)
- return;
- m_flipped = flip;
- m_point = pointFromColor(m_color);
- q_ptr->update();
-}
-
-bool QtColorLinePrivate::flip() const
-{
- return m_flipped;
-}
-
-void QtColorLinePrivate::setBackgroundCheckered(bool checkered)
-{
- if (m_backgroundCheckered == checkered)
- return;
- m_backgroundCheckered = checkered;
- q_ptr->update();
-}
-
-bool QtColorLinePrivate::isBackgroundCheckered() const
-{
- return m_backgroundCheckered;
-}
-
-void QtColorLinePrivate::setOrientation(Qt::Orientation orientation)
-{
- if (m_dragging) // Warning perhaps here, recursive call
- return;
- if (m_orientation == orientation)
- return;
-
- m_orientation = orientation;
- if (!q_ptr->testAttribute(Qt::WA_WState_OwnSizePolicy)) {
- QSizePolicy sp = q_ptr->sizePolicy();
- sp.transpose();
- q_ptr->setSizePolicy(sp);
- q_ptr->setAttribute(Qt::WA_WState_OwnSizePolicy, false);
- }
- m_point = pointFromColor(m_color);
- q_ptr->update();
- q_ptr->updateGeometry();
-}
-
-Qt::Orientation QtColorLinePrivate::orientation() const
-{
- return m_orientation;
-}
-
-void QtColorLinePrivate::checkColor()
-{
- switch (m_component) {
- case QtColorLine::Red:
- case QtColorLine::Green:
- case QtColorLine::Blue:
- if (m_color.spec() != QColor::Rgb)
- m_color = m_color.toRgb();
- break;
- case QtColorLine::Hue:
- case QtColorLine::Saturation:
- case QtColorLine::Value:
- if (m_color.spec() != QColor::Hsv)
- m_color = m_color.toHsv();
- break;
- default:
- break;
- }
- if (m_color.spec() == QColor::Hsv) {
- if (m_color.hue() == 360 || m_color.hue() == -1) {
- m_color.setHsvF(0.0, m_color.saturationF(), m_color.valueF(), m_color.alphaF());
- }
- }
-}
-
-bool QtColorLinePrivate::isMainPixmapValid() const
-{
- if (m_mainPixmap.isNull()) {
- if (m_pixmapSize.isEmpty())
- return true;
- else
- return false;
- }
- if (m_lastValidMainPixmapData.component != m_component)
- return false;
- if (m_lastValidMainPixmapData.size != m_pixmapSize)
- return false;
- if (m_lastValidMainPixmapData.flipped != m_flipped)
- return false;
- if (m_lastValidMainPixmapData.orientation != m_orientation)
- return false;
- if (m_lastValidMainPixmapData.color == m_color)
- return true;
- switch (m_component) {
- case QtColorLine::Red:
- if (m_color.green() == m_lastValidMainPixmapData.color.green() &&
- m_color.blue() == m_lastValidMainPixmapData.color.blue() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Green:
- if (m_color.red() == m_lastValidMainPixmapData.color.red() &&
- m_color.blue() == m_lastValidMainPixmapData.color.blue() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Blue:
- if (m_color.red() == m_lastValidMainPixmapData.color.red() &&
- m_color.green() == m_lastValidMainPixmapData.color.green() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Hue:
- if (m_color.saturation() == m_lastValidMainPixmapData.color.saturation() &&
- m_color.value() == m_lastValidMainPixmapData.color.value() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Saturation:
- if (m_color.hue() == m_lastValidMainPixmapData.color.hue() &&
- m_color.value() == m_lastValidMainPixmapData.color.value() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Value:
- if (m_color.hue() == m_lastValidMainPixmapData.color.hue() &&
- m_color.saturation() == m_lastValidMainPixmapData.color.saturation() &&
- (!m_combiningAlpha || m_color.alpha() == m_lastValidMainPixmapData.color.alpha()))
- return true;
- break;
- case QtColorLine::Alpha:
- if (m_color.hue() == m_lastValidMainPixmapData.color.hue() &&
- m_color.saturation() == m_lastValidMainPixmapData.color.saturation() &&
- m_color.value() == m_lastValidMainPixmapData.color.value())
- return true;
- }
- return false;
-}
-
-void QtColorLinePrivate::validate()
-{
- if (isMainPixmapValid())
- return;
-
- recreateMainPixmap();
-}
-
-QPixmap QtColorLinePrivate::gradientPixmap(Qt::Orientation orientation, const QColor &begin, const QColor &end, bool flipped) const
-{
- int size = m_pixmapSize.width();
- if (orientation == Qt::Vertical)
- size = m_pixmapSize.height();
- return gradientPixmap(size, orientation, begin, end, flipped);
-}
-
-QPixmap QtColorLinePrivate::gradientPixmap(int size, Qt::Orientation orientation,
- const QColor &begin, const QColor &end, bool flipped) const
-{
- int gradW = size;
- int gradH = size;
- int w = size;
- int h = size;
- if (orientation == Qt::Horizontal) {
- gradH = 0;
- h = 1;
- } else {
- gradW = 0;
- w = 1;
- }
- QColor c1 = begin;
- QColor c2 = end;
- if (flipped) {
- c1 = end;
- c2 = begin;
- }
- QLinearGradient lg(0, 0, gradW, gradH);
- lg.setColorAt(0, c1);
- lg.setColorAt(1, c2);
- QImage img(w, h, QImage::Format_ARGB32);
- QPainter p(&img);
- p.setCompositionMode(QPainter::CompositionMode_Source);
- p.fillRect(QRect(0, 0, w, h), lg);
- return QPixmap::fromImage(img);
-}
-
-QPixmap QtColorLinePrivate::hueGradientPixmap(Qt::Orientation orientation, bool flipped,
- int saturation, int value, int alpha) const
-{
- int size = m_pixmapSize.width();
- if (orientation == Qt::Vertical)
- size = m_pixmapSize.height();
- return hueGradientPixmap(size, orientation, flipped, saturation, value, alpha);
-}
-
-QPixmap QtColorLinePrivate::hueGradientPixmap(int size, Qt::Orientation orientation, bool flipped,
- int saturation, int value, int alpha) const
-{
- int gradW = size + 1;
- int gradH = size + 1;
- int w = size;
- int h = size;
- if (orientation == Qt::Horizontal) {
- gradH = 0;
- h = 1;
- } else {
- gradW = 0;
- w = 1;
- }
- QList<QColor> colorList;
- colorList << QColor::fromHsv(0, saturation, value, alpha);
- colorList << QColor::fromHsv(60, saturation, value, alpha);
- colorList << QColor::fromHsv(120, saturation, value, alpha);
- colorList << QColor::fromHsv(180, saturation, value, alpha);
- colorList << QColor::fromHsv(240, saturation, value, alpha);
- colorList << QColor::fromHsv(300, saturation, value, alpha);
- colorList << QColor::fromHsv(0, saturation, value, alpha);
- QLinearGradient lg(0, 0, gradW, gradH);
- for (int i = 0; i <= 6; i++)
- lg.setColorAt((double)i / 6.0, flipped ? colorList.at(6 - i) : colorList.at(i));
- QImage img(w, h, QImage::Format_ARGB32);
- QPainter p(&img);
- p.setCompositionMode(QPainter::CompositionMode_Source);
- p.fillRect(QRect(0, 0, w, h), lg);
- return QPixmap::fromImage(img);
-}
-
-void QtColorLinePrivate::recreateMainPixmap()
-{
- m_lastValidMainPixmapData.size = m_pixmapSize;
- m_lastValidMainPixmapData.component = m_component;
- m_lastValidMainPixmapData.color = m_color;
- m_lastValidMainPixmapData.flipped = m_flipped;
- m_lastValidMainPixmapData.orientation = m_orientation;
-
- if (m_pixmapSize.isEmpty()) {
- m_mainPixmap = QPixmap();
- m_alphalessPixmap = QPixmap();
- m_semiAlphaPixmap = QPixmap();
- return;
- }
-
- if (m_mainPixmap.size() != m_pixmapSize) {
- m_mainPixmap = QPixmap(m_pixmapSize);
- m_alphalessPixmap = QPixmap(m_pixmapSize);
- m_semiAlphaPixmap = QPixmap(m_pixmapSize);
- }
-
- Qt::Orientation orient = m_orientation;
- const bool flip = m_flipped;
-
- const int r = m_color.red();
- const int g = m_color.green();
- const int b = m_color.blue();
- const int h = m_color.hue();
- const int s = m_color.saturation();
- const int v = m_color.value();
- const int a = m_color.alpha();
- const double coef = 0.5;
- const int semi = qRound(a * coef + 0xFF * (1.0 - coef));
-
- if (m_component == QtColorLine::Hue) {
- m_alphalessPixmap = hueGradientPixmap(orient, flip, s, v, 0xFF);
- if (m_combiningAlpha) {
- m_mainPixmap = hueGradientPixmap(orient, flip, s, v, a);
- m_semiAlphaPixmap = hueGradientPixmap(orient, flip, s, v, semi);
- }
- } else if (m_component == QtColorLine::Saturation) {
- m_alphalessPixmap = gradientPixmap(orient, QColor::fromHsv(h, 0, v, 0xFF), QColor::fromHsv(h, 0xFF, v, 0xFF), flip);
- if (m_combiningAlpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromHsv(h, 0, v, a), QColor::fromHsv(h, 0xFF, v, a), flip);
- m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromHsv(h, 0, v, semi), QColor::fromHsv(h, 0xFF, v, semi), flip);
- }
- } else if (m_component == QtColorLine::Value) {
- m_alphalessPixmap = gradientPixmap(orient, QColor::fromRgb(0, 0, 0, 0xFF), QColor::fromHsv(h, s, 0xFF, 0xFF), flip);
- if (m_combiningAlpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromRgb(0, 0, 0, a), QColor::fromHsv(h, s, 0xFF, a), flip);
- m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromRgb(0, 0, 0, semi), QColor::fromHsv(h, s, 0xFF, semi), flip);
- }
- } else if (m_component == QtColorLine::Red) {
- m_alphalessPixmap = gradientPixmap(orient, QColor::fromRgb(0, g, b, 0xFF), QColor::fromRgb(0xFF, g, b, 0xFF), flip);
- if (m_combiningAlpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromRgb(0, g, b, a), QColor::fromRgb(0xFF, g, b, a), flip);
- m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromRgb(0, g, b, semi), QColor::fromRgb(0xFF, g, b, semi), flip);
- }
- } else if (m_component == QtColorLine::Green) {
- m_alphalessPixmap = gradientPixmap(orient, QColor::fromRgb(r, 0, b, 0xFF), QColor::fromRgb(r, 0xFF, b, 0xFF), flip);
- if (m_combiningAlpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromRgb(r, 0, b, a), QColor::fromRgb(r, 0xFF, b, a), flip);
- m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromRgb(r, 0, b, semi), QColor::fromRgb(r, 0xFF, b, semi), flip);
- }
- } else if (m_component == QtColorLine::Blue) {
- m_alphalessPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, 0, 0xFF), QColor::fromRgb(r, g, 0xFF, 0xFF), flip);
- if (m_combiningAlpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, 0, a), QColor::fromRgb(r, g, 0xFF, a), flip);
- m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, 0, semi), QColor::fromRgb(r, g, 0xFF, semi), flip);
- }
- } else if (m_component == QtColorLine::Alpha) {
- m_mainPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, b, 0), QColor::fromRgb(r, g, b, 0xFF), flip);
-
-// m_alphalessPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, b, 0xFF), QColor::fromRgb(r, g, b, 0xFF), flip);
-// m_semiAlphaPixmap = gradientPixmap(orient, QColor::fromRgb(r, g, b, semi), QColor::fromRgb(r, g, b, semi), flip);
- }
- if (!m_combiningAlpha && m_component != QtColorLine::Alpha)
- m_mainPixmap = m_alphalessPixmap;
-}
-
-QSize QtColorLinePrivate::pixmapSizeFromGeometrySize(
- const QSize &geometrySize) const
-{
- QSize size(m_indicatorSize + 2 * m_indicatorSpace - 1,
- m_indicatorSize + 2 * m_indicatorSpace - 1);
- if (m_orientation == Qt::Horizontal)
- size.setHeight(0);
- else
- size.setWidth(0);
- return geometrySize - size;
-}
-
-QColor QtColorLinePrivate::colorFromPoint(const QPointF &point) const
-{
- QPointF p = point;
- if (p.x() < 0)
- p.setX(0.0);
- else if (p.x() > 1)
- p.setX(1.0);
- if (p.y() < 0)
- p.setY(0.0);
- else if (p.y() > 1)
- p.setY(1.0);
-
- double pos = p.x();
- if (m_orientation == Qt::Vertical)
- pos = p.y();
- if (m_flipped)
- pos = 1.0 - pos;
- QColor c;
- qreal hue;
- switch (m_component) {
- case QtColorLine::Red:
- c.setRgbF(pos, m_color.greenF(), m_color.blueF(), m_color.alphaF());
- break;
- case QtColorLine::Green:
- c.setRgbF(m_color.redF(), pos, m_color.blueF(), m_color.alphaF());
- break;
- case QtColorLine::Blue:
- c.setRgbF(m_color.redF(), m_color.greenF(), pos, m_color.alphaF());
- break;
- case QtColorLine::Hue:
- hue = pos;
- hue *= 35999.0 / 36000.0;
- c.setHsvF(hue, m_color.saturationF(), m_color.valueF(), m_color.alphaF());
- break;
- case QtColorLine::Saturation:
- c.setHsvF(m_color.hueF(), pos, m_color.valueF(), m_color.alphaF());
- break;
- case QtColorLine::Value:
- c.setHsvF(m_color.hueF(), m_color.saturationF(), pos, m_color.alphaF());
- break;
- case QtColorLine::Alpha:
- c.setHsvF(m_color.hueF(), m_color.saturationF(), m_color.valueF(), pos);
- break;
- }
- return c;
-}
-
-QPointF QtColorLinePrivate::pointFromColor(const QColor &color) const
-{
- qreal hue = color.hueF();
- if (color.hue() == 360)
- hue = 0.0;
- else
- hue *= 36000.0 / 35999.0;
-
- double pos = 0.0;
- switch (m_component) {
- case QtColorLine::Red:
- pos = color.redF();
- break;
- case QtColorLine::Green:
- pos = color.greenF();
- break;
- case QtColorLine::Blue:
- pos = color.blueF();
- break;
- case QtColorLine::Hue:
- pos = hue;
- break;
- case QtColorLine::Saturation:
- pos = color.saturationF();
- break;
- case QtColorLine::Value:
- pos = color.valueF();
- break;
- case QtColorLine::Alpha:
- pos = color.alphaF();
- break;
- }
- if (m_flipped)
- pos = 1.0 - pos;
- QPointF p(pos, pos);
- if (m_orientation == Qt::Horizontal)
- p.setY(0);
- else
- p.setX(0);
- return p;
-}
-
-QVector<QRect> QtColorLinePrivate::rects(const QPointF &point) const
-{
- QRect r = q_ptr->geometry();
- r.moveTo(0, 0);
-
- int x1 = (int)((r.width() - m_indicatorSize - 2 * m_indicatorSpace) * point.x() + 0.5);
- int x2 = x1 + m_indicatorSize + 2 * m_indicatorSpace;
- int y1 = (int)((r.height() - m_indicatorSize - 2 * m_indicatorSpace) * point.y() + 0.5);
- int y2 = y1 + m_indicatorSize + 2 * m_indicatorSpace;
-
- QVector<QRect> rects;
- if (m_orientation == Qt::Horizontal) {
- // r0 r1 r2
- QRect r0(0, 0, x1, r.height());
- QRect r1(x1 + m_indicatorSpace, 0, m_indicatorSize, r.height());
- QRect r2(x2, 0, r.width() - x2, r.height());
-
- rects << r0 << r1 << r2;
- } else {
- // r0
- // r1
- // r2
- QRect r0(0, 0, r.width(), y1);
- QRect r1(0, y1 + m_indicatorSpace, r.width(), m_indicatorSize);
- QRect r2(0, y2, r.width(), r.height() - y2);
-
- rects << r0 << r1 << r2;
- }
- return rects;
-}
-
-void QtColorLinePrivate::resizeEvent(QResizeEvent *event)
-{
- m_pixmapSize = pixmapSizeFromGeometrySize(event->size());
-}
-
-void QtColorLinePrivate::paintEvent(QPaintEvent *)
-{
- QRect rect = q_ptr->rect();
-
- QVector<QRect> r = rects(m_point);
-
- QColor cBack = q_ptr->palette().color(QPalette::Active, QPalette::Window);
- QColor c = colorFromPoint(m_point);
- if (!m_combiningAlpha && m_component != QtColorLine::Alpha)
- c.setAlpha(0xFF);
-
- QPainter p(q_ptr);
- if (q_ptr->isEnabled()) {
- if (m_backgroundCheckered) {
- int pixSize = 20;
- QPixmap pm(2 * pixSize, 2 * pixSize);
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::white);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::white);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black);
- pmp.end();
-
- p.setBrushOrigin((rect.width() % pixSize + pixSize) / 2, (rect.height() % pixSize + pixSize) / 2);
- p.setClipRect(r[1].adjusted(4, 4, -4, -4));
- p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom())), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight()), Qt::UniteClip);
- p.setClipRect(QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0)), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight()), Qt::UniteClip);
- /*
- p.setClipRect(r[1].adjusted(3, 3, -3, -3));
- p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 1, rect.bottom())), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(r[1].right() - 1, rect.top()), rect.bottomRight()), Qt::UniteClip);
- p.setClipRect(QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 1)), Qt::UniteClip);
- p.setClipRect(QRect(QPoint(rect.left(), r[1].bottom() - 1), rect.bottomRight()), Qt::UniteClip);
- */
- p.fillRect(rect, pm);
- p.setBrushOrigin(0, 0);
- p.setClipping(false);
- }
-
- validate();
-
- QSize fieldSize = pixmapSizeFromGeometrySize(q_ptr->geometry().size());
-
- QPoint posOnField = r[1].topLeft() - QPoint(m_indicatorSpace, m_indicatorSpace);
- int x = posOnField.x();
- int y = posOnField.y();
- int w = fieldSize.width();
- int h = fieldSize.height();
-
- QRect r0, r2;
- if (m_orientation == Qt::Horizontal) {
- r0 = QRect(0, 0, x, m_pixmapSize.height());
- r2 = QRect(x + 1, 0, w - x - 1, m_pixmapSize.height());
- } else {
- r0 = QRect(0, 0, m_pixmapSize.width(), y);
- r2 = QRect(0, y + 1, m_pixmapSize.width(), h - y - 1);
- }
-
- p.setBrush(m_mainPixmap);
- p.setPen(Qt::NoPen);
- if (r[0].isValid()) {
- p.drawRect(r[0]);
- }
- if (r[2].isValid()) {
- p.setBrushOrigin(r[2].topLeft() - r2.topLeft());
- p.drawRect(r[2]);
- }
- if (m_indicatorSpace) {
- p.setBrush(c);
- if (m_orientation == Qt::Horizontal) {
- p.drawRect(r[1].adjusted(-m_indicatorSpace, 0, -r[1].width(), 0));
- p.drawRect(r[1].adjusted(r[1].width(), 0, m_indicatorSpace, 0));
- } else {
- p.drawRect(r[1].adjusted(0, -m_indicatorSpace, 0, -r[1].height()));
- p.drawRect(r[1].adjusted(0, r[1].height(), 0, m_indicatorSpace));
- }
- }
-
- QPen pen(c);
- p.setPen(pen);
- p.setBrush(Qt::NoBrush);
- if (r[1].isValid()) {
- p.drawRect(r[1].adjusted(0, 0, -1, -1));
- // p.drawRect(r[1].adjusted(1, 1, -2, -2));
- }
- double coef = 9.0 / 10;
- p.setPen(Qt::NoPen);
- if (m_component != QtColorLine::Alpha && m_combiningAlpha) {
- p.setBrush(m_alphalessPixmap);
- if (r[0].isValid()) {
- p.setBrushOrigin(QPoint(0, 0));
- QRect thinRect1 = r[0];
- QRect thinRect2 = r[0];
- QRect thinRect = r[0];
- if (m_orientation == Qt::Horizontal) {
- thinRect1.adjust(0, qRound(thinRect1.height() * coef), 0, 0);
- thinRect2.adjust(0, 0, 0, -qRound(thinRect2.height() * coef));
- thinRect.adjust(0, qRound(thinRect.height() * coef), 0, -qRound(thinRect.height() * coef));
- } else {
- thinRect1.adjust(qRound(thinRect1.width() * coef), 0, 0, 0);
- thinRect2.adjust(0, 0, -qRound(thinRect2.width() * coef), 0);
- thinRect.adjust(qRound(thinRect.width() * coef), 0, -qRound(thinRect.width() * coef), 0);
- }
- p.drawRect(thinRect1);
- p.drawRect(thinRect2);
- //p.drawRect(thinRect);
- }
- if (r[2].isValid()) {
- p.setBrushOrigin(r[2].topLeft() - r2.topLeft());
- QRect thinRect1 = r[2];
- QRect thinRect2 = r[2];
- QRect thinRect = r[2];
- if (m_orientation == Qt::Horizontal) {
- thinRect1.adjust(0, qRound(thinRect1.height() * coef), 0, 0);
- thinRect2.adjust(0, 0, 0, -qRound(thinRect2.height() * coef));
- thinRect.adjust(0, qRound(thinRect.height() * coef), 0, -qRound(thinRect.height() * coef));
- } else {
- thinRect1.adjust(qRound(thinRect1.width() * coef), 0, 0, 0);
- thinRect2.adjust(0, 0, -qRound(thinRect2.width() * coef), 0);
- thinRect.adjust(qRound(thinRect.width() * coef), 0, -qRound(thinRect.width() * coef), 0);
- }
- p.drawRect(thinRect1);
- p.drawRect(thinRect2);
- //p.drawRect(thinRect);
- }
- /*
-
-*/
-
-
-
-
-
- p.setPen(Qt::NoPen);
-
- p.setBrush(m_semiAlphaPixmap);
- if (r[0].isValid()) {
- p.setBrushOrigin(QPoint(0, 0));
- QRect thinRect1 = r[0];
- QRect thinRect2 = r[0];
- QRect thinRect = r[0];
- if (m_orientation == Qt::Horizontal) {
- thinRect1.adjust(0, qRound(thinRect1.height() * coef) - 1, 0, 0);
- thinRect1.setBottom(thinRect1.top());
- thinRect2.adjust(0, 0, 0, -qRound(thinRect2.height() * coef) + 1);
- thinRect2.setTop(thinRect2.bottom());
- thinRect.adjust(0, qRound(thinRect.height() * coef), 0, -qRound(thinRect.height() * coef));
- } else {
- thinRect1.adjust(qRound(thinRect1.width() * coef) - 1, 0, 0, 0);
- thinRect1.setRight(thinRect1.left());
- thinRect2.adjust(0, 0, -qRound(thinRect2.width() * coef) + 1, 0);
- thinRect2.setLeft(thinRect2.right());
- thinRect.adjust(qRound(thinRect.width() * coef), 0, -qRound(thinRect.width() * coef), 0);
- }
- p.drawRect(thinRect1);
- p.drawRect(thinRect2);
- //p.drawRect(thinRect);
- }
- if (r[2].isValid()) {
- p.setBrushOrigin(r[2].topLeft() - r2.topLeft());
- QRect thinRect1 = r[2];
- QRect thinRect2 = r[2];
- QRect thinRect = r[2];
- if (m_orientation == Qt::Horizontal) {
- thinRect1.adjust(0, qRound(thinRect1.height() * coef) - 1, 0, 0);
- thinRect1.setBottom(thinRect1.top());
- thinRect2.adjust(0, 0, 0, -qRound(thinRect2.height() * coef) + 1);
- thinRect2.setTop(thinRect2.bottom());
- thinRect.adjust(0, qRound(thinRect.height() * coef), 0, -qRound(thinRect.height() * coef));
- } else {
- thinRect1.adjust(qRound(thinRect1.width() * coef) - 1, 0, 0, 0);
- thinRect1.setRight(thinRect1.left());
- thinRect2.adjust(0, 0, -qRound(thinRect2.width() * coef) + 1, 0);
- thinRect2.setLeft(thinRect2.right());
- thinRect.adjust(qRound(thinRect.width() * coef), 0, -qRound(thinRect.width() * coef), 0);
- }
- p.drawRect(thinRect1);
- p.drawRect(thinRect2);
- //p.drawRect(thinRect);
- }
- p.setBrush(m_alphalessPixmap);
- if (m_orientation == Qt::Horizontal) {
- p.setClipRect(r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0));
- p.setClipRect(r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef)), Qt::UniteClip);
- } else {
- p.setClipRect(r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0));
- p.setClipRect(r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0), Qt::UniteClip);
- }
- p.setBrush(Qt::NoBrush);
- p.setPen(QPen(QColor(c.rgb())));
-
- p.drawRect(r[1].adjusted(0, 0, -1, -1));
- // p.drawRect(r[1].adjusted(1, 1, -2, -2));
-/*
- p.setBrush(m_semiAlphaPixmap);
- if (m_orientation == Qt::Horizontal) {
- QRect top = r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef) + 1);
- top.setTop(top.bottom());
- QRect bottom = r[1].adjusted(0, qRound(r[1].height() * coef) - 1, 0, 0);
- top.setBottom(bottom.top());
- p.setClipRect(top);
- p.setClipRect(bottom, Qt::UniteClip);
- } else {
-
- }
- QColor semiColor(c.rgb());
- semiColor.setAlpha((c.alpha() + 0xFF) / 2);
- p.setPen(QPen(semiColor));
- p.drawRect(r[1].adjusted(0, 0, -1, -1));
- // p.drawRect(r[1].adjusted(1, 1, -2, -2));
-*/
- p.setClipping(false);
- }
- }
-
- p.setBrush(Qt::NoBrush);
- int lw = 4;
- //int br = 1;
- int br = 0;
- r[1].adjust(br, br, -br, -br);
- if (r[1].adjusted(lw, lw, -lw, -lw).isValid()) {
- QStyleOptionFrame opt;
- opt.init(q_ptr);
- opt.rect = r[1];
- opt.lineWidth = 2;
- opt.midLineWidth = 1;
- if (m_dragging)
- opt.state |= QStyle::State_Sunken;
- else
- opt.state |= QStyle::State_Raised;
- q_ptr->style()->drawPrimitive(QStyle::PE_Frame, &opt, &p, q_ptr);
- QRect colorRect = r[1].adjusted(lw, lw, -lw, -lw);
- if (q_ptr->isEnabled()) {
- p.fillRect(colorRect, c);
- const QColor frameColor(0, 0, 0, 38);
- p.setPen(frameColor);
- p.drawRect(colorRect.adjusted(0, 0, -1, -1));
- /*
- p.fillRect(colorRect.width() / 4 + colorRect.left(),
- colorRect.height() / 4 + colorRect.top(),
- colorRect.width() / 2,
- colorRect.height() / 2,
- QColor(c.rgb()));
- */
- /*
- if (m_component != QtColorLine::Alpha) {
- p.fillRect(colorRect.adjusted(0, colorRect.height() * 4 / 5, 0, 0), QColor(c.rgb()));
- p.fillRect(colorRect.adjusted(0, 0, 0, -colorRect.height() * 4 / 5), QColor(c.rgb()));
- }
- */
- }
- }
-}
-
-void QtColorLinePrivate::mousePressEvent(QMouseEvent *event)
-{
- if (event->button() != Qt::LeftButton)
- return;
-
- QVector<QRect> r = rects(m_point);
- QPoint clickPos = event->pos();
-
- QSize fieldSize = q_ptr->geometry().size() -
- QSize(m_indicatorSize + 2 * m_indicatorSpace - 1, m_indicatorSize + 2 * m_indicatorSpace - 1);
- QPoint posOnField = r[1].topLeft() - QPoint(m_indicatorSpace, m_indicatorSpace);
- m_clickOffset = posOnField - clickPos;
-
- if (!r[1].contains(clickPos))
- return;
- m_dragging = true;
- q_ptr->update();
-}
-
-void QtColorLinePrivate::mouseMoveEvent(QMouseEvent *event)
-{
- if (!m_dragging)
- return;
- QPoint newPos = event->pos();
-
- QSize fieldSize = q_ptr->geometry().size() -
- QSize(m_indicatorSize + 2 * m_indicatorSpace - 1, m_indicatorSize + 2 * m_indicatorSpace - 1);
- QPoint newPosOnField = newPos + m_clickOffset;
- if (newPosOnField.x() < 0)
- newPosOnField.setX(0);
- else if (newPosOnField.x() > fieldSize.width())
- newPosOnField.setX(fieldSize.width());
- if (newPosOnField.y() < 0)
- newPosOnField.setY(0);
- else if (newPosOnField.y() > fieldSize.height())
- newPosOnField.setY(fieldSize.height());
-
- double x = (double)newPosOnField.x() / fieldSize.width();
- double y = (double)newPosOnField.y() / fieldSize.height();
- m_point = QPointF(x, y);
- QColor color = colorFromPoint(m_point);
- if (m_color == color)
- return;
- m_color = color;
- emit q_ptr->colorChanged(color); // maybe before internal set, 1 line above
- q_ptr->update();
-}
-
-void QtColorLinePrivate::mouseReleaseEvent(QMouseEvent *event)
-{
- if (event->button() != Qt::LeftButton)
- return;
- m_dragging = false;
- q_ptr->update();
-}
-
-void QtColorLinePrivate::mouseDoubleClickEvent(QMouseEvent *event)
-{
- if (event->button() != Qt::LeftButton)
- return;
-
- QVector<QRect> r = rects(m_point);
- QPoint clickPos = event->pos();
- if (!r[0].contains(clickPos) && !r[2].contains(clickPos))
- return;
- QPoint newPosOnField = clickPos;
- if (r[2].contains(clickPos))
- newPosOnField -= QPoint(m_indicatorSize + 2 * m_indicatorSpace - 2, m_indicatorSize + 2 * m_indicatorSpace - 2);
- QSize fieldSize = q_ptr->geometry().size() -
- QSize(m_indicatorSize + 2 * m_indicatorSpace - 1, m_indicatorSize + 2 * m_indicatorSpace - 1);
-
- double x = (double)newPosOnField.x() / fieldSize.width();
- double y = (double)newPosOnField.y() / fieldSize.height();
- m_point = QPointF(x, y);
- QColor color = colorFromPoint(m_point);
- if (m_color == color)
- return;
- m_color = color;
- emit q_ptr->colorChanged(color); // maybe before internal set, 1 line above
- q_ptr->update();
-}
-
-////////////////////////////////////////////////////
-
-QtColorLine::QtColorLine(QWidget *parent)
- : QWidget(parent)
-{
- d_ptr = new QtColorLinePrivate;
- d_ptr->q_ptr = this;
-
- setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
-}
-
-QtColorLine::~QtColorLine()
-{
- delete d_ptr;
-}
-
-QSize QtColorLine::minimumSizeHint() const
-{
- return QSize(d_ptr->m_indicatorSize, d_ptr->m_indicatorSize);
-}
-
-QSize QtColorLine::sizeHint() const
-{
- return QSize(d_ptr->m_indicatorSize, d_ptr->m_indicatorSize);
-}
-
-void QtColorLine::setColor(const QColor &color)
-{
- d_ptr->setColor(color);
-}
-
-QColor QtColorLine::color() const
-{
- return d_ptr->color();
-}
-
-void QtColorLine::setColorComponent(QtColorLine::ColorComponent component)
-{
- d_ptr->setColorComponent(component);
-}
-
-QtColorLine::ColorComponent QtColorLine::colorComponent() const
-{
- return d_ptr->colorComponent();
-}
-
-void QtColorLine::setIndicatorSize(int size)
-{
- d_ptr->setIndicatorSize(size);
-}
-
-int QtColorLine::indicatorSize() const
-{
- return d_ptr->indicatorSize();
-}
-
-void QtColorLine::setIndicatorSpace(int space)
-{
- d_ptr->setIndicatorSpace(space);
-}
-
-int QtColorLine::indicatorSpace() const
-{
- return d_ptr->indicatorSpace();
-}
-
-void QtColorLine::setFlip(bool flip)
-{
- d_ptr->setFlip(flip);
-}
-
-bool QtColorLine::flip() const
-{
- return d_ptr->flip();
-}
-
-void QtColorLine::setBackgroundCheckered(bool checkered)
-{
- d_ptr->setBackgroundCheckered(checkered);
-}
-
-bool QtColorLine::isBackgroundCheckered() const
-{
- return d_ptr->isBackgroundCheckered();
-}
-
-void QtColorLine::setOrientation(Qt::Orientation orientation)
-{
- d_ptr->setOrientation(orientation);
-}
-
-Qt::Orientation QtColorLine::orientation() const
-{
- return d_ptr->orientation();
-}
-void QtColorLine::resizeEvent(QResizeEvent *event)
-{
- d_ptr->resizeEvent(event);
-}
-
-void QtColorLine::paintEvent(QPaintEvent *event)
-{
- d_ptr->paintEvent(event);
-}
-
-void QtColorLine::mousePressEvent(QMouseEvent *event)
-{
- d_ptr->mousePressEvent(event);
-}
-
-void QtColorLine::mouseMoveEvent(QMouseEvent *event)
-{
- d_ptr->mouseMoveEvent(event);
-}
-
-void QtColorLine::mouseReleaseEvent(QMouseEvent *event)
-{
- d_ptr->mouseReleaseEvent(event);
-}
-
-void QtColorLine::mouseDoubleClickEvent(QMouseEvent *event)
-{
- d_ptr->mouseDoubleClickEvent(event);
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtcolorline.h b/src/gui/extern/QtGradientEditor/qtcolorline.h
deleted file mode 100644
index d3d2778780bda8532e5c1d1f6c86f5115b5e1537..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtcolorline.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTCOLORLINE_H
-#define QTCOLORLINE_H
-
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class QtColorLine : public QWidget
-{
- Q_OBJECT
- Q_PROPERTY(QColor color READ color WRITE setColor)
- Q_PROPERTY(int indicatorSpace READ indicatorSpace WRITE setIndicatorSpace)
- Q_PROPERTY(int indicatorSize READ indicatorSize WRITE setIndicatorSize)
- Q_PROPERTY(bool flip READ flip WRITE setFlip)
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
- Q_PROPERTY(ColorComponent colorComponent READ colorComponent WRITE setColorComponent)
- Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
- Q_ENUMS(ColorComponent)
-public:
-
- enum ColorComponent
- {
- Red,
- Green,
- Blue,
- Hue,
- Saturation,
- Value,
- Alpha
- };
-
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
-
- QtColorLine(QWidget *parent = 0);
- ~QtColorLine();
-
- QColor color() const;
-
- void setIndicatorSize(int size);
- int indicatorSize() const;
-
- void setIndicatorSpace(int space);
- int indicatorSpace() const;
-
- void setFlip(bool flip);
- bool flip() const;
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- void setOrientation(Qt::Orientation orientation);
- Qt::Orientation orientation() const;
-
- void setColorComponent(ColorComponent component);
- ColorComponent colorComponent() const;
-
-public slots:
-
- void setColor(const QColor &color);
-
-signals:
-
- void colorChanged(const QColor &color);
-
-protected:
-
- void resizeEvent(QResizeEvent *event);
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
- void mouseDoubleClickEvent(QMouseEvent *event);
-
-private:
-
- class QtColorLinePrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtColorLine)
- Q_DISABLE_COPY(QtColorLine)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientdialog.cpp b/src/gui/extern/QtGradientEditor/qtgradientdialog.cpp
deleted file mode 100644
index de3256447b88daf6fec3e488ece6f59613e219e5..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientdialog.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-TRANSLATOR qdesigner_internal::QtGradientDialog
-*/
-
-#include "qtgradientdialog.h"
-#include <QtGui/QPushButton>
-
-QT_BEGIN_NAMESPACE
-
-
-
-void QtGradientDialogPrivate::slotAboutToShowDetails(bool details, int extensionWidthHint)
-{
- if (details) {
- q_ptr->resize(q_ptr->size() + QSize(extensionWidthHint, 0));
- } else {
- q_ptr->setMinimumSize(1, 1);
- q_ptr->resize(q_ptr->size() - QSize(extensionWidthHint, 0));
- q_ptr->setMinimumSize(0, 0);
- }
-}
-
-/*!
- \class QtGradientDialog
-
- \brief The QtGradientDialog class provides a dialog for specifying gradients.
-
- The gradient dialog's function is to allow users to edit gradients.
- For example, you might use this in a drawing program to allow the user to set the brush gradient.
-
- \table
- \row
- \o \inlineimage qtgradientdialog.png
- \o \inlineimage qtgradientdialogextension.png
- \header
- \o Details extension hidden
- \o Details extension visible
- \endtable
-
- Starting from the top of the dialog there are several buttons:
-
- \image qtgradientdialogtopbuttons.png
-
- The first three buttons allow for changing a type of the gradient (QGradient::Type), while the second three allow for
- changing spread of the gradient (QGradient::Spread). The last button shows or hides the details extension of the dialog.
- Conceptually the default view with hidden details provides the full functional control over gradient editing.
- The additional extension with details allows to set gradient's parameters more precisely. The visibility
- of extension can be controlled by detailsVisible property. Moreover, if you don't want the user to
- switch on or off the visibility of extension you can set the detailsButtonVisible property to false.
-
- Below top buttons there is an area where edited gradient is interactively previewed.
- In addition the user can edit gradient type's specific parameters directly in this area by dragging
- appropriate handles.
-
- \table
- \row
- \o \inlineimage qtgradientdialoglineareditor.png
- \o \inlineimage qtgradientdialogradialeditor.png
- \o \inlineimage qtgradientdialogconicaleditor.png
- \header
- \o Editing linear type
- \o Editing radial type
- \o Editing conical type
- \row
- \o The user can change the start and final point positions by dragging the circular handles.
- \o The user can change the center and focal point positions by dragging the circular handles
- and can change the gradient's radius by dragging horizontal or vertical line.
- \o The user can change the center point by dragging the circular handle
- and can change the gradient's angle by dragging the big wheel.
- \endtable
-
- In the middle of the dialog there is an area where the user can edit gradient stops.
-
- \table
- \row
- \o \inlineimage qtgradientdialogstops.png
- \o \inlineimage qtgradientdialogstopszoomed.png
- \endtable
-
- The top part of this area contains stop handles, and bottom part shows the preview of gradient stops path.
- In order to create a new gradient stop double click inside the view over the desired position.
- If you double click on existing stop handle in the top part of the view, clicked handle will be duplicated
- (duplicate will contain the same color).
- The stop can be activated by clicking on its handle. You can activate previous or next stop by pressing
- left or right key respectively. To jump to the first or last stop press home or end key respectively.
- The gradient stops editor supports multiselection.
- Clicking a handle holding the shift modifier key down will select a range of stops between
- the active stop and clicked one. Clicking a handle holding control modifier key down will remove from or
- add to selection the clicked stop depending if it was or wasn't already selected respectively.
- Multiselection can also be created using rubberband (by pressing the left mouse button outside
- of any handle and dragging).
- Sometimes it's hard to select a stop because its handle can be partially covered by other handle.
- In that case the user can zoom in the view by spinning mouse wheel.
- The selected stop handles can be moved by drag & drop. In order to remove selected stops press delete key.
- For convenience context menu is provided with the following actions:
-
- \list
- \o New Stop - creates a new gradient stop
- \o Delete - removes the active and all selected stops
- \o Flip All - mirrors all stops
- \o Select All - selects all stops
- \o Zoom In - zooms in
- \o Zoom Out - zooms out
- \o Zoom All - goes back to original 100% zoom
- \endlist
-
- The bottom part of the QtGradientDialog contains a set of widgets allowing to control the color of
- the active and selected stops.
-
- \table
- \row
- \o \inlineimage qtgradientdialogcolorhsv.png
- \o \inlineimage qtgradientdialogcolorrgb.png
- \endtable
-
-
- The color button shows the color of the active gradient stop. It also allows for choosing
- a color from standard color dialog and applying it to the
- active stop and all selected stops. It's also possible to drag a color directly from the color button
- and to drop it in gradient stops editor at desired position (it will create new stop with dragged color)
- or at desired stop handle (it will change the color of that handle).
-
- To the right of color button there is a set of 2 radio buttons which allows to switch between
- HVS and RGB color spec.
-
- Finally there are 4 color sliders working either in HSVA (hue saturation value alpha) or
- RGBA (red green blue alpha) mode, depending on which radio button is chosen. The radio buttons
- can be controlled programatically by spec() and setSpec() methods. The sliders show the
- color of the active stop. By double clicking inside color slider you can set directly the desired color.
- Changes of slider's are applied to stop selection in the way that the color
- component being changed is applied to stops in selection only, while other components
- remain unchanged in selected stops (e.g. when the user is changing the saturation,
- new saturation is applied to selected stops preventing original hue, value and alpha in multiselection).
-
- The convenient static functions getGradient() provide modal gradient dialogs, e.g.:
-
- \snippet doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp 0
-
- In order to have more control over the properties of QtGradientDialog use
- standard QDialog::exec() method:
-
- \snippet doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp 1
-
- \sa {Gradient View Example}
-*/
-
-/*!
- Constructs a gradient dialog with \a parent as parent widget.
-*/
-
-QtGradientDialog::QtGradientDialog(QWidget *parent)
- : QDialog(parent)
-{
-// setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- d_ptr = new QtGradientDialogPrivate();
- d_ptr->q_ptr = this;
- d_ptr->m_ui.setupUi(this);
-
- QPushButton *button = d_ptr->m_ui.buttonBox->button(QDialogButtonBox::Ok);
- if (button)
- button->setAutoDefault(false);
- button = d_ptr->m_ui.buttonBox->button(QDialogButtonBox::Cancel);
- if (button)
- button->setAutoDefault(false);
- connect(d_ptr->m_ui.gradientEditor, SIGNAL(aboutToShowDetails(bool, int)),
- this, SLOT(slotAboutToShowDetails(bool, int)));
-
- setDetailsVisible( true );
-}
-
-/*!
- Destroys the gradient dialog
-*/
-
-QtGradientDialog::~QtGradientDialog()
-{
- delete d_ptr;
-}
-
-/*!
- \property QtGradientDialog::gradient
- \brief the gradient of the dialog
-*/
-void QtGradientDialog::setGradient(const QGradient &gradient)
-{
- d_ptr->m_ui.gradientEditor->setGradient(gradient);
-}
-
-QGradient QtGradientDialog::gradient() const
-{
- return d_ptr->m_ui.gradientEditor->gradient();
-}
-
-/*!
- \property QtGradientDialog::backgroundCheckered
- \brief whether the background of widgets able to show the colors with alpha channel is checkered.
-
- \table
- \row
- \o \inlineimage qtgradientdialogbackgroundcheckered.png
- \o \inlineimage qtgradientdialogbackgroundtransparent.png
- \row
- \o \snippet doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp 2
- \o \snippet doc/src/snippets/code/tools_shared_qtgradienteditor_qtgradientdialog.cpp 3
- \endtable
-
- When this property is set to true (the default) widgets inside gradient dialog like color button,
- color sliders, gradient stops editor and gradient editor will show checkered background
- in case of transparent colors. Otherwise the background of these widgets is transparent.
-*/
-
-bool QtGradientDialog::isBackgroundCheckered() const
-{
- return d_ptr->m_ui.gradientEditor->isBackgroundCheckered();
-}
-
-void QtGradientDialog::setBackgroundCheckered(bool checkered)
-{
- d_ptr->m_ui.gradientEditor->setBackgroundCheckered(checkered);
-}
-
-/*!
- \property QtGradientDialog::detailsVisible
- \brief whether details extension is visible.
-
- When this property is set to true the details extension is visible. By default
- this property is set to false and the details extension is hidden.
-
- \sa detailsButtonVisible
-*/
-bool QtGradientDialog::detailsVisible() const
-{
- return d_ptr->m_ui.gradientEditor->detailsVisible();
-}
-
-void QtGradientDialog::setDetailsVisible(bool visible)
-{
- d_ptr->m_ui.gradientEditor->setDetailsVisible(visible);
-}
-
-/*!
- \property QtGradientDialog::detailsButtonVisible
- \brief whether the details button allowing for showing and hiding details extension is visible.
-
- When this property is set to true (the default) the details button is visible and the user
- can show and hide details extension interactively. Otherwise the button is hidden and the details
- extension is always visible or hidded depending on the value of detailsVisible property.
-
- \sa detailsVisible
-*/
-bool QtGradientDialog::isDetailsButtonVisible() const
-{
- return d_ptr->m_ui.gradientEditor->isDetailsButtonVisible();
-}
-
-void QtGradientDialog::setDetailsButtonVisible(bool visible)
-{
- d_ptr->m_ui.gradientEditor->setDetailsButtonVisible(visible);
-}
-
-/*!
- Returns the current QColor::Spec used for the color sliders in the dialog.
-*/
-QColor::Spec QtGradientDialog::spec() const
-{
- return d_ptr->m_ui.gradientEditor->spec();
-}
-
-/*!
- Sets the current QColor::Spec to \a spec used for the color sliders in the dialog.
-*/
-void QtGradientDialog::setSpec(QColor::Spec spec)
-{
- d_ptr->m_ui.gradientEditor->setSpec(spec);
-}
-
-/*!
- Executes a modal gradient dialog, lets the user to specify a gradient, and returns that gradient.
-
- If the user clicks \gui OK, the gradient specified by the user is returned. If the user clicks \gui Cancel, the \a initial gradient is returned.
-
- The dialog is constructed with the given \a parent. \a caption is shown as the window title of the dialog and
- \a initial is the initial gradient shown in the dialog. If the \a ok parameter is not-null,
- the value it refers to is set to true if the user clicks \gui OK, and set to false if the user clicks \gui Cancel.
-*/
-QGradient QtGradientDialog::getGradient(bool *ok, const QGradient &initial, QWidget *parent, const QString &caption)
-{
- QtGradientDialog dlg(parent);
- if (!caption.isEmpty())
- dlg.setWindowTitle(caption);
- dlg.setGradient(initial);
- const int res = dlg.exec();
- if (ok) {
- *ok = (res == QDialog::Accepted) ? true : false;
- }
- if (res == QDialog::Accepted)
- return dlg.gradient();
- return initial;
-}
-
-/*!
- This method calls getGradient(ok, QLinearGradient(), parent, caption).
-*/
-QGradient QtGradientDialog::getGradient(bool *ok, QWidget *parent, const QString &caption)
-{
- return getGradient(ok, QLinearGradient(), parent, caption);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/QtGradientEditor/qtgradientdialog.h b/src/gui/extern/QtGradientEditor/qtgradientdialog.h
deleted file mode 100644
index f528cdffa8ce8c7f2b061ab260f2c714f13e238a..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientdialog.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTDIALOG_H
-#define QTGRADIENTDIALOG_H
-
-#include <QtGui/QDialog>
-
-#include "ui_qtgradientdialog.h"
-
-QT_BEGIN_NAMESPACE
-
-
-class QtGradientDialog : public QDialog
-{
- Q_OBJECT
- Q_PROPERTY(QGradient gradient READ gradient WRITE setGradient)
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
- Q_PROPERTY(bool detailsVisible READ detailsVisible WRITE setDetailsVisible)
- Q_PROPERTY(bool detailsButtonVisible READ isDetailsButtonVisible WRITE setDetailsButtonVisible)
-public:
- QtGradientDialog(QWidget *parent = 0);
- ~QtGradientDialog();
-
- void setGradient(const QGradient &gradient);
- QGradient gradient() const;
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- bool detailsVisible() const;
- void setDetailsVisible(bool visible);
-
- bool isDetailsButtonVisible() const;
- void setDetailsButtonVisible(bool visible);
-
- QColor::Spec spec() const;
- void setSpec(QColor::Spec spec);
-
- static QGradient getGradient(bool *ok, const QGradient &initial, QWidget *parent = 0, const QString &caption = QString());
- static QGradient getGradient(bool *ok, QWidget *parent = 0, const QString &caption = QString());
-
-private:
- class QtGradientDialogPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientDialog)
- Q_DISABLE_COPY(QtGradientDialog)
- Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint))
-};
-
-//put private here: otherwise build problems when using extra moc files
-class QtGradientDialogPrivate
-{
- QtGradientDialog *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientDialog)
-public:
-
- void slotAboutToShowDetails(bool details, int extensionWidthHint);
-
- Ui::QtGradientDialog m_ui;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientdialog.ui b/src/gui/extern/QtGradientEditor/qtgradientdialog.ui
deleted file mode 100644
index 7a205c139ad8a75617eed7da8c88fdac9ad86f5b..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientdialog.ui
+++ /dev/null
@@ -1,121 +0,0 @@
-<ui version="4.0" >
- <comment>*********************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-*********************************************************************</comment>
- <class>QtGradientDialog</class>
- <widget class="QDialog" name="QtGradientDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>178</width>
- <height>81</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Edit Gradient</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QtGradientEditor" name="gradientEditor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>QtGradientEditor</class>
- <extends>QFrame</extends>
- <header>qtgradienteditor.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>QtGradientDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>72</x>
- <y>224</y>
- </hint>
- <hint type="destinationlabel" >
- <x>21</x>
- <y>243</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>QtGradientDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>168</x>
- <y>233</y>
- </hint>
- <hint type="destinationlabel" >
- <x>152</x>
- <y>251</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/src/gui/extern/QtGradientEditor/qtgradienteditor.cpp b/src/gui/extern/QtGradientEditor/qtgradienteditor.cpp
deleted file mode 100644
index 5ada86f8930fb0e33064f0fc52b802cded878288..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradienteditor.cpp
+++ /dev/null
@@ -1,889 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-TRANSLATOR qdesigner_internal::QtGradientEditor
-*/
-
-#include "qtgradienteditor.h"
-#include "qtgradientstopscontroller.h"
-
-QT_BEGIN_NAMESPACE
-
-QGradient QtGradientEditorPrivate::gradient() const
-{
- QGradient *gradient = 0;
- switch (m_ui.gradientWidget->gradientType()) {
- case QGradient::LinearGradient:
- gradient = new QLinearGradient(m_ui.gradientWidget->startLinear(),
- m_ui.gradientWidget->endLinear());
- break;
- case QGradient::RadialGradient:
- gradient = new QRadialGradient(m_ui.gradientWidget->centralRadial(),
- m_ui.gradientWidget->radiusRadial(),
- m_ui.gradientWidget->focalRadial());
- break;
- case QGradient::ConicalGradient:
- gradient = new QConicalGradient(m_ui.gradientWidget->centralConical(),
- m_ui.gradientWidget->angleConical());
- break;
- default:
- break;
- }
- if (!gradient)
- return QGradient();
- gradient->setStops(m_ui.gradientWidget->gradientStops());
- gradient->setSpread(m_ui.gradientWidget->gradientSpread());
- gradient->setCoordinateMode(QGradient::StretchToDeviceMode);
- QGradient gr = *gradient;
- delete gradient;
- return gr;
-}
-
-void QtGradientEditorPrivate::updateGradient(bool emitSignal)
-{
- QGradient grad = gradient();
- if (m_gradient == grad)
- return;
-
- m_gradient = grad;
- if (emitSignal)
- emit q_ptr->gradientChanged(m_gradient);
-}
-
-void QtGradientEditorPrivate::setCombos(bool combos)
-{
- if (m_combos == combos)
- return;
-
- m_combos = combos;
- m_ui.linearButton->setVisible(!m_combos);
- m_ui.radialButton->setVisible(!m_combos);
- m_ui.conicalButton->setVisible(!m_combos);
- m_ui.padButton->setVisible(!m_combos);
- m_ui.repeatButton->setVisible(!m_combos);
- m_ui.reflectButton->setVisible(!m_combos);
- m_ui.typeComboBox->setVisible(m_combos);
- m_ui.spreadComboBox->setVisible(m_combos);
-}
-
-void QtGradientEditorPrivate::setLayout(bool details)
-{
- QHBoxLayout *hboxLayout = new QHBoxLayout();
- hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
- hboxLayout->addWidget(m_ui.typeComboBox);
- hboxLayout->addWidget(m_ui.spreadComboBox);
- QHBoxLayout *typeLayout = new QHBoxLayout();
- typeLayout->setSpacing(0);
- typeLayout->addWidget(m_ui.linearButton);
- typeLayout->addWidget(m_ui.radialButton);
- typeLayout->addWidget(m_ui.conicalButton);
- hboxLayout->addLayout(typeLayout);
- QHBoxLayout *spreadLayout = new QHBoxLayout();
- spreadLayout->setSpacing(0);
- spreadLayout->addWidget(m_ui.padButton);
- spreadLayout->addWidget(m_ui.repeatButton);
- spreadLayout->addWidget(m_ui.reflectButton);
- hboxLayout->addLayout(spreadLayout);
- hboxLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
- hboxLayout->addWidget(m_ui.detailsButton);
- m_gridLayout->addLayout(hboxLayout, 0, 0, 1, 2);
- int span = 1;
- if (details)
- span = 7;
- m_gridLayout->addWidget(m_ui.frame, 1, 0, span, 2);
- int row = 2;
- if (details) {
- row = 8;
- span = 4;
- }
- m_gridLayout->addWidget(m_ui.gradientStopsWidget, row, 0, span, 2);
- QHBoxLayout *hboxLayout1 = new QHBoxLayout();
- hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
- hboxLayout1->addWidget(m_ui.colorLabel);
- hboxLayout1->addWidget(m_ui.colorButton);
- hboxLayout1->addWidget(m_ui.hsvRadioButton);
- hboxLayout1->addWidget(m_ui.rgbRadioButton);
- hboxLayout1->addItem(new QSpacerItem(16, 23, QSizePolicy::Expanding, QSizePolicy::Minimum));
- int addRow = 0;
- if (details)
- addRow = 9;
- m_gridLayout->addLayout(hboxLayout1, 3 + addRow, 0, 1, 2);
- m_gridLayout->addWidget(m_ui.hLabel, 4 + addRow, 0, 1, 1);
- m_gridLayout->addWidget(m_ui.frame_2, 4 + addRow, 1, 1, 1);
- m_gridLayout->addWidget(m_ui.sLabel, 5 + addRow, 0, 1, 1);
- m_gridLayout->addWidget(m_ui.frame_5, 5 + addRow, 1, 1, 1);
- m_gridLayout->addWidget(m_ui.vLabel, 6 + addRow, 0, 1, 1);
- m_gridLayout->addWidget(m_ui.frame_3, 6 + addRow, 1, 1, 1);
- m_gridLayout->addWidget(m_ui.aLabel, 7 + addRow, 0, 1, 1);
- m_gridLayout->addWidget(m_ui.frame_4, 7 + addRow, 1, 1, 1);
-
- if (details) {
- layoutDetails(details);
- }
-}
-
-void QtGradientEditorPrivate::layoutDetails(bool details)
-{
- QGridLayout *gridLayout = m_gridLayout;
- int col = 2;
- if (!details) {
- col = 0;
- if (!m_hiddenWidget) {
- m_hiddenWidget = new QWidget();
- m_hiddenLayout = new QGridLayout(m_hiddenWidget);
- m_hiddenLayout->setContentsMargins(0, 0, 0, 0);
- m_hiddenLayout->setSizeConstraint(QLayout::SetFixedSize);
- }
- gridLayout = m_hiddenLayout;
- }
- gridLayout->addWidget(m_ui.label1, 1, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.spinBox1, 1, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.label2, 2, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.spinBox2, 2, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.label3, 3, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.spinBox3, 3, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.label4, 4, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.spinBox4, 4, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.label5, 5, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.spinBox5, 5, col + 1, 1, 1);
- gridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), 6, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.line1Widget, 7, col + 0, 1, 2);
- gridLayout->addWidget(m_ui.zoomLabel, 8, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.zoomWidget, 8, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.zoomButtonsWidget, 9, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.zoomAllButton, 9, col + 1, 1, 1);
- gridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Preferred), 10, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.line2Widget, 11, col + 0, 1, 2);
- gridLayout->addWidget(m_ui.positionLabel, 12, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.positionWidget, 12, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.hueLabel, 13, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.hueWidget, 13, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.saturationLabel, 14, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.saturationWidget, 14, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.valueLabel, 15, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.valueWidget, 15, col + 1, 1, 1);
- gridLayout->addWidget(m_ui.alphaLabel, 16, col + 0, 1, 1);
- gridLayout->addWidget(m_ui.alphaWidget, 16, col + 1, 1, 1);
-
- if (details) {
- if (m_hiddenLayout) {
- delete m_hiddenLayout;
- m_hiddenLayout = 0;
- }
- if (m_hiddenWidget) {
- delete m_hiddenWidget;
- m_hiddenWidget = 0;
- }
- }
-}
-
-int QtGradientEditorPrivate::extensionWidthHint() const
-{
- if (m_details)
- return q_ptr->size().width() - m_ui.gradientStopsWidget->size().width();
-
- const int space = m_ui.spinBox1->geometry().left() - m_ui.label1->geometry().right();
-
- return m_hiddenLayout->minimumSize().width() + space;
-}
-
-void QtGradientEditorPrivate::slotDetailsChanged(bool details)
-{
- showDetails(details);
-}
-
-bool QtGradientEditorPrivate::row4Visible() const
-{
- if (m_type == QGradient::ConicalGradient)
- return false;
- return true;
-}
-
-bool QtGradientEditorPrivate::row5Visible() const
-{
- if (m_type == QGradient::RadialGradient)
- return true;
- return false;
-}
-
-void QtGradientEditorPrivate::showDetails(bool details)
-{
- if (m_details == details)
- return;
-
- bool blocked = m_ui.detailsButton->signalsBlocked();
- m_ui.detailsButton->blockSignals(true);
- m_ui.detailsButton->setChecked(details);
- m_ui.detailsButton->blockSignals(blocked);
-
- bool updates = q_ptr->updatesEnabled();
- q_ptr->setUpdatesEnabled(false);
-
- if (m_gridLayout) {
- m_gridLayout->setEnabled(false);
- delete m_gridLayout;
- m_gridLayout = 0;
- }
-
- if (!details) {
- layoutDetails(details);
- }
-
- emit q_ptr->aboutToShowDetails(details, extensionWidthHint());
- m_details = details;
-
- m_gridLayout = new QGridLayout(q_ptr);
- m_gridLayout->setEnabled(false);
- m_gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
- m_gridLayout->setContentsMargins(0, 0, 0, 0);
-
- /*m_ui.label4->setVisible(row4Visible());
- m_ui.label5->setVisible(row5Visible());
- m_ui.spinBox4->setVisible(row4Visible());
- m_ui.spinBox5->setVisible(row5Visible());*/
-
- setLayout(details);
- m_gridLayout->setEnabled(true);
-
- q_ptr->setUpdatesEnabled(updates);
- q_ptr->update();
-}
-
-void QtGradientEditorPrivate::setSpinBox(QDoubleSpinBox *spinBox, const char *slot, double max, double step, int decimals)
-{
- bool blocked = spinBox->signalsBlocked();
- spinBox->blockSignals(true);
- spinBox->setDecimals(decimals);
- spinBox->setMaximum(max);
- spinBox->setSingleStep(step);
- spinBox->blockSignals(blocked);
- QObject::connect(spinBox, SIGNAL(valueChanged(double)), q_ptr, slot);
-}
-
-void QtGradientEditorPrivate::reset()
-{
- startLinearXSpinBox = 0;
- startLinearYSpinBox = 0;
- endLinearXSpinBox = 0;
- endLinearYSpinBox = 0;
- centralRadialXSpinBox = 0;
- centralRadialYSpinBox = 0;
- focalRadialXSpinBox = 0;
- focalRadialYSpinBox = 0;
- radiusRadialSpinBox = 0;
- centralConicalXSpinBox = 0;
- centralConicalYSpinBox = 0;
- angleConicalSpinBox = 0;
-}
-
-void QtGradientEditorPrivate::setType(QGradient::Type type)
-{
- if (m_type == type)
- return;
-
- m_type = type;
- m_ui.spinBox1->disconnect(SIGNAL(valueChanged(double)));
- m_ui.spinBox2->disconnect(SIGNAL(valueChanged(double)));
- m_ui.spinBox3->disconnect(SIGNAL(valueChanged(double)));
- m_ui.spinBox4->disconnect(SIGNAL(valueChanged(double)));
- m_ui.spinBox5->disconnect(SIGNAL(valueChanged(double)));
-
- reset();
-
- bool ena = true;
-
- if (m_gridLayout) {
- ena = m_gridLayout->isEnabled();
- m_gridLayout->setEnabled(false);
- }
-
- bool spreadEnabled = true;
-
- if (type == QGradient::LinearGradient) {
- startLinearXSpinBox = m_ui.spinBox1;
- setSpinBox(startLinearXSpinBox, SLOT(slotStartLinearXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Start X", 0, QApplication::UnicodeUTF8));
-
- startLinearYSpinBox = m_ui.spinBox2;
- setSpinBox(startLinearYSpinBox, SLOT(slotStartLinearYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Start Y", 0, QApplication::UnicodeUTF8));
-
- endLinearXSpinBox = m_ui.spinBox3;
- setSpinBox(endLinearXSpinBox, SLOT(slotEndLinearXChanged(double)));
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Final X", 0, QApplication::UnicodeUTF8));
-
- endLinearYSpinBox = m_ui.spinBox4;
- setSpinBox(endLinearYSpinBox, SLOT(slotEndLinearYChanged(double)));
- m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Final Y", 0, QApplication::UnicodeUTF8));
-
- setStartLinear(m_ui.gradientWidget->startLinear());
- setEndLinear(m_ui.gradientWidget->endLinear());
- } else if (type == QGradient::RadialGradient) {
- centralRadialXSpinBox = m_ui.spinBox1;
- setSpinBox(centralRadialXSpinBox, SLOT(slotCentralRadialXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", 0, QApplication::UnicodeUTF8));
-
- centralRadialYSpinBox = m_ui.spinBox2;
- setSpinBox(centralRadialYSpinBox, SLOT(slotCentralRadialYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", 0, QApplication::UnicodeUTF8));
-
- focalRadialXSpinBox = m_ui.spinBox3;
- setSpinBox(focalRadialXSpinBox, SLOT(slotFocalRadialXChanged(double)));
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Focal X", 0, QApplication::UnicodeUTF8));
-
- focalRadialYSpinBox = m_ui.spinBox4;
- setSpinBox(focalRadialYSpinBox, SLOT(slotFocalRadialYChanged(double)));
- m_ui.label4->setText(QApplication::translate("QtGradientEditor", "Focal Y", 0, QApplication::UnicodeUTF8));
-
- radiusRadialSpinBox = m_ui.spinBox5;
- setSpinBox(radiusRadialSpinBox, SLOT(slotRadiusRadialChanged(double)), 2.0);
- m_ui.label5->setText(QApplication::translate("QtGradientEditor", "Radius", 0, QApplication::UnicodeUTF8));
-
- setCentralRadial(m_ui.gradientWidget->centralRadial());
- setFocalRadial(m_ui.gradientWidget->focalRadial());
- setRadiusRadial(m_ui.gradientWidget->radiusRadial());
- } else if (type == QGradient::ConicalGradient) {
- centralConicalXSpinBox = m_ui.spinBox1;
- setSpinBox(centralConicalXSpinBox, SLOT(slotCentralConicalXChanged(double)));
- m_ui.label1->setText(QApplication::translate("QtGradientEditor", "Central X", 0, QApplication::UnicodeUTF8));
-
- centralConicalYSpinBox = m_ui.spinBox2;
- setSpinBox(centralConicalYSpinBox, SLOT(slotCentralConicalYChanged(double)));
- m_ui.label2->setText(QApplication::translate("QtGradientEditor", "Central Y", 0, QApplication::UnicodeUTF8));
-
- angleConicalSpinBox = m_ui.spinBox3;
- setSpinBox(angleConicalSpinBox, SLOT(slotAngleConicalChanged(double)), 360.0, 1.0, 1);
- m_ui.label3->setText(QApplication::translate("QtGradientEditor", "Angle", 0, QApplication::UnicodeUTF8));
-
- setCentralConical(m_ui.gradientWidget->centralConical());
- setAngleConical(m_ui.gradientWidget->angleConical());
-
- spreadEnabled = false;
- }
- m_ui.spreadComboBox->setEnabled(spreadEnabled);
- m_ui.padButton->setEnabled(spreadEnabled);
- m_ui.repeatButton->setEnabled(spreadEnabled);
- m_ui.reflectButton->setEnabled(spreadEnabled);
-
- /*m_ui.label4->setVisible(row4Visible());
- m_ui.spinBox4->setVisible(row4Visible());
- m_ui.label5->setVisible(row5Visible());
- m_ui.spinBox5->setVisible(row5Visible());*/
-
- if (m_gridLayout) {
- m_gridLayout->setEnabled(ena);
- }
-}
-
-void QtGradientEditorPrivate::slotGradientStopsChanged(const QGradientStops &stops)
-{
- m_ui.gradientWidget->setGradientStops(stops);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotTypeChanged(int idx)
-{
- QGradient::Type type = QGradient::NoGradient;
- if (idx == 0)
- type = QGradient::LinearGradient;
- else if (idx == 1)
- type = QGradient::RadialGradient;
- else if (idx == 2)
- type = QGradient::ConicalGradient;
- setType(type);
- m_ui.typeComboBox->setCurrentIndex(idx);
- m_typeGroup->button(idx)->setChecked(true);
- m_ui.gradientWidget->setGradientType(type);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotSpreadChanged(int spread)
-{
- if (spread == 0) {
- m_ui.gradientWidget->setGradientSpread(QGradient::PadSpread);
- } else if (spread == 1) {
- m_ui.gradientWidget->setGradientSpread(QGradient::RepeatSpread);
- } else if (spread == 2) {
- m_ui.gradientWidget->setGradientSpread(QGradient::ReflectSpread);
- }
- m_ui.spreadComboBox->setCurrentIndex(spread);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotStartLinearXChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->startLinear();
- point.setX(value);
- m_ui.gradientWidget->setStartLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotStartLinearYChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->startLinear();
- point.setY(value);
- m_ui.gradientWidget->setStartLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotEndLinearXChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->endLinear();
- point.setX(value);
- m_ui.gradientWidget->setEndLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotEndLinearYChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->endLinear();
- point.setY(value);
- m_ui.gradientWidget->setEndLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotCentralRadialXChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->centralRadial();
- point.setX(value);
- m_ui.gradientWidget->setCentralRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotCentralRadialYChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->centralRadial();
- point.setY(value);
- m_ui.gradientWidget->setCentralRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotFocalRadialXChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->focalRadial();
- point.setX(value);
- m_ui.gradientWidget->setFocalRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotFocalRadialYChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->focalRadial();
- point.setY(value);
- m_ui.gradientWidget->setFocalRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotRadiusRadialChanged(double value)
-{
- m_ui.gradientWidget->setRadiusRadial(value);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotCentralConicalXChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->centralConical();
- point.setX(value);
- m_ui.gradientWidget->setCentralConical(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotCentralConicalYChanged(double value)
-{
- QPointF point = m_ui.gradientWidget->centralConical();
- point.setY(value);
- m_ui.gradientWidget->setCentralConical(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::slotAngleConicalChanged(double value)
-{
- m_ui.gradientWidget->setAngleConical(value);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::startLinearChanged(const QPointF &point)
-{
- setStartLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::endLinearChanged(const QPointF &point)
-{
- setEndLinear(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::centralRadialChanged(const QPointF &point)
-{
- setCentralRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::focalRadialChanged(const QPointF &point)
-{
- setFocalRadial(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::radiusRadialChanged(qreal radius)
-{
- setRadiusRadial(radius);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::centralConicalChanged(const QPointF &point)
-{
- setCentralConical(point);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::angleConicalChanged(qreal angle)
-{
- setAngleConical(angle);
- updateGradient(true);
-}
-
-void QtGradientEditorPrivate::setStartLinear(const QPointF &point)
-{
- if (startLinearXSpinBox)
- startLinearXSpinBox->setValue(point.x());
- if (startLinearYSpinBox)
- startLinearYSpinBox->setValue(point.y());
-}
-
-void QtGradientEditorPrivate::setEndLinear(const QPointF &point)
-{
- if (endLinearXSpinBox)
- endLinearXSpinBox->setValue(point.x());
- if (endLinearYSpinBox)
- endLinearYSpinBox->setValue(point.y());
-}
-
-void QtGradientEditorPrivate::setCentralRadial(const QPointF &point)
-{
- if (centralRadialXSpinBox)
- centralRadialXSpinBox->setValue(point.x());
- if (centralRadialYSpinBox)
- centralRadialYSpinBox->setValue(point.y());
-}
-
-void QtGradientEditorPrivate::setFocalRadial(const QPointF &point)
-{
- if (focalRadialXSpinBox)
- focalRadialXSpinBox->setValue(point.x());
- if (focalRadialYSpinBox)
- focalRadialYSpinBox->setValue(point.y());
-}
-
-void QtGradientEditorPrivate::setRadiusRadial(qreal radius)
-{
- if (radiusRadialSpinBox)
- radiusRadialSpinBox->setValue(radius);
-}
-
-void QtGradientEditorPrivate::setCentralConical(const QPointF &point)
-{
- if (centralConicalXSpinBox)
- centralConicalXSpinBox->setValue(point.x());
- if (centralConicalYSpinBox)
- centralConicalYSpinBox->setValue(point.y());
-}
-
-void QtGradientEditorPrivate::setAngleConical(qreal angle)
-{
- if (angleConicalSpinBox)
- angleConicalSpinBox->setValue(angle);
-}
-
-QtGradientEditor::QtGradientEditor(QWidget *parent)
- : QWidget(parent)
-{
- d_ptr = new QtGradientEditorPrivate();
- d_ptr->q_ptr = this;
- d_ptr->m_type = QGradient::RadialGradient;
- d_ptr->m_ui.setupUi(this);
- d_ptr->m_gridLayout = 0;
- d_ptr->m_hiddenLayout = 0;
- d_ptr->m_hiddenWidget = 0;
- bool detailsDefault = false;
- d_ptr->m_details = !detailsDefault;
- d_ptr->m_detailsButtonVisible = true;
- bool checkeredDefault = true;
- d_ptr->m_backgroundCheckered = !checkeredDefault;
- d_ptr->m_gradientStopsController = new QtGradientStopsController(this);
- d_ptr->m_gradientStopsController->setUi(&d_ptr->m_ui);
- d_ptr->reset();
- d_ptr->setType(QGradient::LinearGradient);
- d_ptr->m_combos = true;
- d_ptr->setCombos(!d_ptr->m_combos);
-
- d_ptr->showDetails(detailsDefault);
- setBackgroundCheckered(checkeredDefault);
-
- d_ptr->setStartLinear(QPointF(0, 0));
- d_ptr->setEndLinear(QPointF(1, 1));
- d_ptr->setCentralRadial(QPointF(0.5, 0.5));
- d_ptr->setFocalRadial(QPointF(0.5, 0.5));
- d_ptr->setRadiusRadial(0.5);
- d_ptr->setCentralConical(QPointF(0.5, 0.5));
- d_ptr->setAngleConical(0);
-
- QIcon icon;
- icon.addPixmap(style()->standardPixmap(QStyle::SP_ArrowRight), QIcon::Normal, QIcon::Off);
- icon.addPixmap(style()->standardPixmap(QStyle::SP_ArrowLeft), QIcon::Normal, QIcon::On);
- d_ptr->m_ui.detailsButton->setIcon(icon);
-
- connect(d_ptr->m_ui.detailsButton, SIGNAL(clicked(bool)), this, SLOT(slotDetailsChanged(bool)));
- connect(d_ptr->m_gradientStopsController, SIGNAL(gradientStopsChanged(const QGradientStops &)),
- this, SLOT(slotGradientStopsChanged(const QGradientStops &)));
-
- QIcon iconLinear(QLatin1String(":/trolltech/qtgradienteditor/images/typelinear.png"));
- QIcon iconRadial(QLatin1String(":/trolltech/qtgradienteditor/images/typeradial.png"));
- QIcon iconConical(QLatin1String(":/trolltech/qtgradienteditor/images/typeconical.png"));
-
- d_ptr->m_ui.typeComboBox->addItem(iconLinear, tr("Linear"));
- d_ptr->m_ui.typeComboBox->addItem(iconRadial, tr("Radial"));
- d_ptr->m_ui.typeComboBox->addItem(iconConical, tr("Conical"));
-
- d_ptr->m_ui.linearButton->setIcon(iconLinear);
- d_ptr->m_ui.radialButton->setIcon(iconRadial);
- d_ptr->m_ui.conicalButton->setIcon(iconConical);
-
- d_ptr->m_typeGroup = new QButtonGroup(this);
- d_ptr->m_typeGroup->addButton(d_ptr->m_ui.linearButton, 0);
- d_ptr->m_typeGroup->addButton(d_ptr->m_ui.radialButton, 1);
- d_ptr->m_typeGroup->addButton(d_ptr->m_ui.conicalButton, 2);
-
- connect(d_ptr->m_typeGroup, SIGNAL(buttonClicked(int)),
- this, SLOT(slotTypeChanged(int)));
- connect(d_ptr->m_ui.typeComboBox, SIGNAL(activated(int)),
- this, SLOT(slotTypeChanged(int)));
-
- QIcon iconPad(QLatin1String(":/trolltech/qtgradienteditor/images/spreadpad.png"));
- QIcon iconRepeat(QLatin1String(":/trolltech/qtgradienteditor/images/spreadrepeat.png"));
- QIcon iconReflect(QLatin1String(":/trolltech/qtgradienteditor/images/spreadreflect.png"));
-
- d_ptr->m_ui.spreadComboBox->addItem(iconPad, tr("Pad"));
- d_ptr->m_ui.spreadComboBox->addItem(iconRepeat, tr("Repeat"));
- d_ptr->m_ui.spreadComboBox->addItem(iconReflect, tr("Reflect"));
-
- d_ptr->m_ui.padButton->setIcon(iconPad);
- d_ptr->m_ui.repeatButton->setIcon(iconRepeat);
- d_ptr->m_ui.reflectButton->setIcon(iconReflect);
-
- d_ptr->m_spreadGroup = new QButtonGroup(this);
- d_ptr->m_spreadGroup->addButton(d_ptr->m_ui.padButton, 0);
- d_ptr->m_spreadGroup->addButton(d_ptr->m_ui.repeatButton, 1);
- d_ptr->m_spreadGroup->addButton(d_ptr->m_ui.reflectButton, 2);
- connect(d_ptr->m_spreadGroup, SIGNAL(buttonClicked(int)),
- this, SLOT(slotSpreadChanged(int)));
- connect(d_ptr->m_ui.spreadComboBox, SIGNAL(activated(int)),
- this, SLOT(slotSpreadChanged(int)));
-
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(startLinearChanged(const QPointF &)),
- this, SLOT(startLinearChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(endLinearChanged(const QPointF &)),
- this, SLOT(endLinearChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralRadialChanged(const QPointF &)),
- this, SLOT(centralRadialChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(focalRadialChanged(const QPointF &)),
- this, SLOT(focalRadialChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(radiusRadialChanged(qreal)),
- this, SLOT(radiusRadialChanged(qreal)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(centralConicalChanged(const QPointF &)),
- this, SLOT(centralConicalChanged(const QPointF &)));
- connect(d_ptr->m_ui.gradientWidget, SIGNAL(angleConicalChanged(qreal)),
- this, SLOT(angleConicalChanged(qreal)));
-
- QGradientStops stops = gradient().stops();
- d_ptr->m_gradientStopsController->setGradientStops(stops);
- d_ptr->m_ui.gradientWidget->setGradientStops(stops);
-
- // hide all unnecessary stuff ...
- d_ptr->m_ui.linearButton->hide();
- d_ptr->m_ui.radialButton->hide();
- d_ptr->m_ui.conicalButton->hide();
- d_ptr->m_ui.padButton->hide();
- d_ptr->m_ui.repeatButton->hide();
- d_ptr->m_ui.reflectButton->hide();
- d_ptr->m_ui.typeComboBox->hide();
- d_ptr->m_ui.spreadComboBox->hide();
- d_ptr->m_ui.detailsButton->hide();
- d_ptr->m_ui.frame->hide();
- d_ptr->m_ui.label1->hide();
- d_ptr->m_ui.label2->hide();
- d_ptr->m_ui.label3->hide();
- d_ptr->m_ui.label4->hide();
- d_ptr->m_ui.label5->hide();
- d_ptr->m_ui.spinBox1->hide();
- d_ptr->m_ui.spinBox2->hide();
- d_ptr->m_ui.spinBox3->hide();
- d_ptr->m_ui.spinBox4->hide();
- d_ptr->m_ui.spinBox5->hide();
- d_ptr->m_ui.line1Widget->hide();
-}
-
-QtGradientEditor::~QtGradientEditor()
-{
- if (d_ptr->m_hiddenWidget)
- delete d_ptr->m_hiddenWidget;
- delete d_ptr;
-}
-
-void QtGradientEditor::setGradient(const QGradient &grad)
-{
- if (grad == gradient())
- return;
-
- QGradient::Type type = grad.type();
- int idx = 0;
- switch (type) {
- case QGradient::LinearGradient: idx = 0; break;
- case QGradient::RadialGradient: idx = 1; break;
- case QGradient::ConicalGradient: idx = 2; break;
- default: return;
- }
- d_ptr->setType(type);
- d_ptr->m_ui.typeComboBox->setCurrentIndex(idx);
- d_ptr->m_ui.gradientWidget->setGradientType(type);
- d_ptr->m_typeGroup->button(idx)->setChecked(true);
-
- QGradient::Spread spread = grad.spread();
- switch (spread) {
- case QGradient::PadSpread: idx = 0; break;
- case QGradient::RepeatSpread: idx = 1; break;
- case QGradient::ReflectSpread: idx = 2; break;
- default: idx = 0; break;
- }
- d_ptr->m_ui.spreadComboBox->setCurrentIndex(idx);
- d_ptr->m_ui.gradientWidget->setGradientSpread(spread);
- d_ptr->m_spreadGroup->button(idx)->setChecked(true);
-
- if (type == QGradient::LinearGradient) {
- QLinearGradient *gr = (QLinearGradient *)(&grad);
- d_ptr->setStartLinear(gr->start());
- d_ptr->setEndLinear(gr->finalStop());
- d_ptr->m_ui.gradientWidget->setStartLinear(gr->start());
- d_ptr->m_ui.gradientWidget->setEndLinear(gr->finalStop());
- } else if (type == QGradient::RadialGradient) {
- QRadialGradient *gr = (QRadialGradient *)(&grad);
- d_ptr->setCentralRadial(gr->center());
- d_ptr->setFocalRadial(gr->focalPoint());
- d_ptr->setRadiusRadial(gr->radius());
- d_ptr->m_ui.gradientWidget->setCentralRadial(gr->center());
- d_ptr->m_ui.gradientWidget->setFocalRadial(gr->focalPoint());
- d_ptr->m_ui.gradientWidget->setRadiusRadial(gr->radius());
- } else if (type == QGradient::ConicalGradient) {
- QConicalGradient *gr = (QConicalGradient *)(&grad);
- d_ptr->setCentralConical(gr->center());
- d_ptr->setAngleConical(gr->angle());
- d_ptr->m_ui.gradientWidget->setCentralConical(gr->center());
- d_ptr->m_ui.gradientWidget->setAngleConical(gr->angle());
- }
-
- d_ptr->m_gradientStopsController->setGradientStops(grad.stops());
- d_ptr->m_ui.gradientWidget->setGradientStops(grad.stops());
- d_ptr->updateGradient(false);
-}
-
-QGradient QtGradientEditor::gradient() const
-{
- return d_ptr->m_gradient;
-}
-
-bool QtGradientEditor::isBackgroundCheckered() const
-{
- return d_ptr->m_backgroundCheckered;
-}
-
-void QtGradientEditor::setBackgroundCheckered(bool checkered)
-{
- if (d_ptr->m_backgroundCheckered == checkered)
- return;
-
- d_ptr->m_backgroundCheckered = checkered;
- d_ptr->m_ui.hueColorLine->setBackgroundCheckered(checkered);
- d_ptr->m_ui.saturationColorLine->setBackgroundCheckered(checkered);
- d_ptr->m_ui.valueColorLine->setBackgroundCheckered(checkered);
- d_ptr->m_ui.alphaColorLine->setBackgroundCheckered(checkered);
- d_ptr->m_ui.gradientWidget->setBackgroundCheckered(checkered);
- d_ptr->m_ui.gradientStopsWidget->setBackgroundCheckered(checkered);
- d_ptr->m_ui.colorButton->setBackgroundCheckered(checkered);
-}
-
-bool QtGradientEditor::detailsVisible() const
-{
- return d_ptr->m_details;
-}
-
-void QtGradientEditor::setDetailsVisible(bool visible)
-{
- d_ptr->showDetails(visible);
-}
-
-bool QtGradientEditor::isDetailsButtonVisible() const
-{
- return d_ptr->m_detailsButtonVisible;
-}
-
-void QtGradientEditor::setDetailsButtonVisible(bool visible)
-{
- if (d_ptr->m_detailsButtonVisible == visible)
- return;
-
- d_ptr->m_detailsButtonVisible = visible;
- d_ptr->m_ui.detailsButton->setVisible(visible);
-}
-
-QColor::Spec QtGradientEditor::spec() const
-{
- return d_ptr->m_gradientStopsController->spec();
-}
-
-void QtGradientEditor::setSpec(QColor::Spec spec)
-{
- d_ptr->m_gradientStopsController->setSpec(spec);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/QtGradientEditor/qtgradienteditor.h b/src/gui/extern/QtGradientEditor/qtgradienteditor.h
deleted file mode 100644
index 87101c1f98044e26f2660552d7d02c1d6ecb124d..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradienteditor.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTEDITOR_H
-#define QTGRADIENTEDITOR_H
-
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientEditor : public QWidget
-{
- Q_OBJECT
- Q_PROPERTY(QGradient gradient READ gradient WRITE setGradient)
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
- Q_PROPERTY(bool detailsVisible READ detailsVisible WRITE setDetailsVisible)
- Q_PROPERTY(bool detailsButtonVisible READ isDetailsButtonVisible WRITE setDetailsButtonVisible)
-public:
- QtGradientEditor(QWidget *parent = 0);
- ~QtGradientEditor();
-
- void setGradient(const QGradient &gradient);
- QGradient gradient() const;
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- bool detailsVisible() const;
- void setDetailsVisible(bool visible);
-
- bool isDetailsButtonVisible() const;
- void setDetailsButtonVisible(bool visible);
-
- QColor::Spec spec() const;
- void setSpec(QColor::Spec spec);
-
-signals:
-
- void gradientChanged(const QGradient &gradient);
- void aboutToShowDetails(bool details, int extenstionWidthHint);
-
-private:
- class QtGradientEditorPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientEditor)
- Q_DISABLE_COPY(QtGradientEditor)
- Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops))
- Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type))
- Q_PRIVATE_SLOT(d_func(), void slotSpreadChanged(int type))
- Q_PRIVATE_SLOT(d_func(), void slotStartLinearXChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotStartLinearYChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotEndLinearXChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotEndLinearYChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotCentralRadialXChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotCentralRadialYChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotFocalRadialXChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotFocalRadialYChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotRadiusRadialChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotCentralConicalXChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotCentralConicalYChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotAngleConicalChanged(double value))
- Q_PRIVATE_SLOT(d_func(), void slotDetailsChanged(bool details))
- Q_PRIVATE_SLOT(d_func(), void startLinearChanged(const QPointF &))
- Q_PRIVATE_SLOT(d_func(), void endLinearChanged(const QPointF &))
- Q_PRIVATE_SLOT(d_func(), void centralRadialChanged(const QPointF &))
- Q_PRIVATE_SLOT(d_func(), void focalRadialChanged(const QPointF &))
- Q_PRIVATE_SLOT(d_func(), void radiusRadialChanged(qreal))
- Q_PRIVATE_SLOT(d_func(), void centralConicalChanged(const QPointF &))
- Q_PRIVATE_SLOT(d_func(), void angleConicalChanged(qreal))
-};
-
-
-#include "qtgradientstopscontroller.h"
-#include "ui_qtgradienteditor.h"
-
-#include <QDoubleSpinBox>
-
-class QtGradientEditorPrivate
-{
- QtGradientEditor *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientEditor)
-public:
- QtGradientEditorPrivate() : m_gradient(QLinearGradient()) {}
-
- void slotGradientStopsChanged(const QGradientStops &stops);
- void slotTypeChanged(int type);
- void slotSpreadChanged(int spread);
- void slotStartLinearXChanged(double value);
- void slotStartLinearYChanged(double value);
- void slotEndLinearXChanged(double value);
- void slotEndLinearYChanged(double value);
- void slotCentralRadialXChanged(double value);
- void slotCentralRadialYChanged(double value);
- void slotFocalRadialXChanged(double value);
- void slotFocalRadialYChanged(double value);
- void slotRadiusRadialChanged(double value);
- void slotCentralConicalXChanged(double value);
- void slotCentralConicalYChanged(double value);
- void slotAngleConicalChanged(double value);
-
- void slotDetailsChanged(bool details);
-
- void startLinearChanged(const QPointF &point);
- void endLinearChanged(const QPointF &point);
- void centralRadialChanged(const QPointF &point);
- void focalRadialChanged(const QPointF &point);
- void radiusRadialChanged(qreal radius);
- void centralConicalChanged(const QPointF &point);
- void angleConicalChanged(qreal angle);
-
- void setStartLinear(const QPointF &point);
- void setEndLinear(const QPointF &point);
- void setCentralRadial(const QPointF &point);
- void setFocalRadial(const QPointF &point);
- void setRadiusRadial(qreal radius);
- void setCentralConical(const QPointF &point);
- void setAngleConical(qreal angle);
-
- void setType(QGradient::Type type);
- void showDetails(bool details);
-
- void setSpinBox(QDoubleSpinBox *spinBox, const char *slot, double max = 1.0, double step = 0.01, int decimals = 3);
- void reset();
- void setLayout(bool details);
- void layoutDetails(bool details);
- bool row4Visible() const;
- bool row5Visible() const;
- int extensionWidthHint() const;
-
- void setCombos(bool combos);
-
- QGradient gradient() const;
- void updateGradient(bool emitSignal);
-
- Ui::QtGradientEditor m_ui;
- QtGradientStopsController *m_gradientStopsController;
-
- QDoubleSpinBox *startLinearXSpinBox;
- QDoubleSpinBox *startLinearYSpinBox;
- QDoubleSpinBox *endLinearXSpinBox;
- QDoubleSpinBox *endLinearYSpinBox;
- QDoubleSpinBox *centralRadialXSpinBox;
- QDoubleSpinBox *centralRadialYSpinBox;
- QDoubleSpinBox *focalRadialXSpinBox;
- QDoubleSpinBox *focalRadialYSpinBox;
- QDoubleSpinBox *radiusRadialSpinBox;
- QDoubleSpinBox *centralConicalXSpinBox;
- QDoubleSpinBox *centralConicalYSpinBox;
- QDoubleSpinBox *angleConicalSpinBox;
-
- QButtonGroup *m_typeGroup;
- QButtonGroup *m_spreadGroup;
-
- QGradient::Type m_type;
-
- QGridLayout *m_gridLayout;
- QWidget *m_hiddenWidget;
- QGridLayout *m_hiddenLayout;
- bool m_details;
- bool m_detailsButtonVisible;
- bool m_backgroundCheckered;
-
- QGradient m_gradient;
-
- bool m_combos;
-};
-
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradienteditor.ui b/src/gui/extern/QtGradientEditor/qtgradienteditor.ui
deleted file mode 100644
index 80041e711ae85829314f0ac6ad31a1a28382d04f..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradienteditor.ui
+++ /dev/null
@@ -1,1254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <comment>*********************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-*********************************************************************</comment>
- <class>QtGradientEditor</class>
- <widget class="QWidget" name="QtGradientEditor">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>364</width>
- <height>455</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <widget class="QFrame" name="frame">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>69</y>
- <width>193</width>
- <height>150</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QtGradientWidget" name="gradientWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Gradient Editor</string>
- </property>
- <property name="whatsThis">
- <string>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="label1">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>69</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>1</string>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="spinBox1">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>69</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- </widget>
- <widget class="QLabel" name="label2">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>99</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>2</string>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="spinBox2">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>99</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- </widget>
- <widget class="QLabel" name="label3">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>129</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>3</string>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="spinBox3">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>129</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- </widget>
- <widget class="QLabel" name="label4">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>159</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>4</string>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="spinBox4">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>159</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- </widget>
- <widget class="QLabel" name="label5">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>189</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>5</string>
- </property>
- </widget>
- <widget class="QDoubleSpinBox" name="spinBox5">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>189</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- </widget>
- <widget class="QtGradientStopsWidget" name="gradientStopsWidget" native="true">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>225</y>
- <width>193</width>
- <height>67</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Gradient Stops Editor</string>
- </property>
- <property name="whatsThis">
- <string>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</string>
- </property>
- </widget>
- <widget class="QLabel" name="zoomLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>231</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>Zoom</string>
- </property>
- </widget>
- <widget class="QToolButton" name="zoomAllButton">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>260</y>
- <width>72</width>
- <height>26</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Reset Zoom</string>
- </property>
- <property name="text">
- <string>Reset Zoom</string>
- </property>
- </widget>
- <widget class="QLabel" name="positionLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>304</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="text">
- <string>Position</string>
- </property>
- </widget>
- <widget class="QLabel" name="hLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>335</y>
- <width>32</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Hue</string>
- </property>
- <property name="text">
- <string>H</string>
- </property>
- </widget>
- <widget class="QFrame" name="frame_2">
- <property name="geometry">
- <rect>
- <x>48</x>
- <y>333</y>
- <width>155</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QHBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QtColorLine" name="hueColorLine" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Hue</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="hueLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>335</y>
- <width>64</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Hue</string>
- </property>
- </widget>
- <widget class="QLabel" name="sLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>364</y>
- <width>32</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Saturation</string>
- </property>
- <property name="text">
- <string>S</string>
- </property>
- </widget>
- <widget class="QFrame" name="frame_5">
- <property name="geometry">
- <rect>
- <x>48</x>
- <y>362</y>
- <width>155</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QHBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QtColorLine" name="saturationColorLine" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Saturation</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="saturationLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>364</y>
- <width>64</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Sat</string>
- </property>
- </widget>
- <widget class="QLabel" name="vLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>393</y>
- <width>32</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Value</string>
- </property>
- <property name="text">
- <string>V</string>
- </property>
- </widget>
- <widget class="QFrame" name="frame_3">
- <property name="geometry">
- <rect>
- <x>48</x>
- <y>391</y>
- <width>155</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QHBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QtColorLine" name="valueColorLine" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Value</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="valueLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>393</y>
- <width>64</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Val</string>
- </property>
- </widget>
- <widget class="QLabel" name="aLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>422</y>
- <width>32</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Alpha</string>
- </property>
- <property name="text">
- <string>A</string>
- </property>
- </widget>
- <widget class="QFrame" name="frame_4">
- <property name="geometry">
- <rect>
- <x>48</x>
- <y>420</y>
- <width>155</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QHBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QtColorLine" name="alphaColorLine" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Alpha</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="alphaLabel">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>422</y>
- <width>64</width>
- <height>18</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Alpha</string>
- </property>
- </widget>
- <widget class="QComboBox" name="typeComboBox">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>40</y>
- <width>79</width>
- <height>22</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Type</string>
- </property>
- </widget>
- <widget class="QComboBox" name="spreadComboBox">
- <property name="geometry">
- <rect>
- <x>96</x>
- <y>40</y>
- <width>72</width>
- <height>22</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Spread</string>
- </property>
- </widget>
- <widget class="QLabel" name="colorLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>298</y>
- <width>32</width>
- <height>29</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Color</string>
- </property>
- </widget>
- <widget class="QtColorButton" name="colorButton">
- <property name="geometry">
- <rect>
- <x>48</x>
- <y>300</y>
- <width>26</width>
- <height>25</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Current stop's color</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="QRadioButton" name="hsvRadioButton">
- <property name="geometry">
- <rect>
- <x>80</x>
- <y>301</y>
- <width>49</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Show HSV specification</string>
- </property>
- <property name="text">
- <string>HSV</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QRadioButton" name="rgbRadioButton">
- <property name="geometry">
- <rect>
- <x>135</x>
- <y>301</y>
- <width>49</width>
- <height>23</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Show RGB specification</string>
- </property>
- <property name="text">
- <string>RGB</string>
- </property>
- </widget>
- <widget class="QWidget" name="positionWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>304</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QDoubleSpinBox" name="positionSpinBox">
- <property name="toolTip">
- <string>Current stop's position</string>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="minimum">
- <double>0.000000000000000</double>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.010000000000000</double>
- </property>
- <property name="value">
- <double>0.000000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="hueWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>333</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSpinBox" name="hueSpinBox">
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <number>359</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="saturationWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>362</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSpinBox" name="saturationSpinBox">
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <number>255</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="valueWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>391</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSpinBox" name="valueSpinBox">
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <number>255</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="alphaWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>420</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSpinBox" name="alphaSpinBox">
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <number>255</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="zoomWidget" native="true">
- <property name="geometry">
- <rect>
- <x>279</x>
- <y>231</y>
- <width>73</width>
- <height>23</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QSpinBox" name="zoomSpinBox">
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="minimum">
- <number>100</number>
- </property>
- <property name="maximum">
- <number>10000</number>
- </property>
- <property name="singleStep">
- <number>100</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="line1Widget" native="true">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>219</y>
- <width>143</width>
- <height>16</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="Line" name="line1">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="line2Widget" native="true">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>292</y>
- <width>143</width>
- <height>16</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="Line" name="line2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="zoomButtonsWidget" native="true">
- <property name="geometry">
- <rect>
- <x>209</x>
- <y>260</y>
- <width>64</width>
- <height>26</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QHBoxLayout">
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QToolButton" name="zoomInButton">
- <property name="toolTip">
- <string>Zoom In</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="zoomOutButton">
- <property name="toolTip">
- <string>Zoom Out</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QToolButton" name="detailsButton">
- <property name="geometry">
- <rect>
- <x>176</x>
- <y>40</y>
- <width>25</width>
- <height>22</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Ignored">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Toggle details extension</string>
- </property>
- <property name="text">
- <string>></string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="linearButton">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Linear Type</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="radialButton">
- <property name="geometry">
- <rect>
- <x>40</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Radial Type</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="conicalButton">
- <property name="geometry">
- <rect>
- <x>70</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Conical Type</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="padButton">
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Pad Spread</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="repeatButton">
- <property name="geometry">
- <rect>
- <x>140</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Repeat Spread</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="reflectButton">
- <property name="geometry">
- <rect>
- <x>170</x>
- <y>10</y>
- <width>30</width>
- <height>26</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Reflect Spread</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- </widget>
- <customwidgets>
- <customwidget>
- <class>QtColorButton</class>
- <extends>QToolButton</extends>
- <header>qtcolorbutton.h</header>
- </customwidget>
- <customwidget>
- <class>QtColorLine</class>
- <extends>QWidget</extends>
- <header>qtcolorline.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>QtGradientStopsWidget</class>
- <extends>QWidget</extends>
- <header>qtgradientstopswidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>QtGradientWidget</class>
- <extends>QWidget</extends>
- <header>qtgradientwidget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <tabstops>
- <tabstop>typeComboBox</tabstop>
- <tabstop>spreadComboBox</tabstop>
- <tabstop>detailsButton</tabstop>
- <tabstop>spinBox1</tabstop>
- <tabstop>spinBox2</tabstop>
- <tabstop>spinBox3</tabstop>
- <tabstop>spinBox4</tabstop>
- <tabstop>spinBox5</tabstop>
- <tabstop>zoomSpinBox</tabstop>
- <tabstop>zoomInButton</tabstop>
- <tabstop>zoomOutButton</tabstop>
- <tabstop>zoomAllButton</tabstop>
- <tabstop>colorButton</tabstop>
- <tabstop>hsvRadioButton</tabstop>
- <tabstop>rgbRadioButton</tabstop>
- <tabstop>positionSpinBox</tabstop>
- <tabstop>hueSpinBox</tabstop>
- <tabstop>saturationSpinBox</tabstop>
- <tabstop>valueSpinBox</tabstop>
- <tabstop>alphaSpinBox</tabstop>
- </tabstops>
- <resources>
- <include location="qtgradienteditor.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/src/gui/extern/QtGradientEditor/qtgradientmanager.cpp b/src/gui/extern/QtGradientEditor/qtgradientmanager.cpp
deleted file mode 100644
index 74308f8a988686c0668c462e45b9599be71b6460..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientmanager.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientmanager.h"
-#include <QtGui/QPixmap>
-#include <QtCore/QMetaEnum>
-
-QT_BEGIN_NAMESPACE
-
-QtGradientManager::QtGradientManager(QObject *parent)
- : QObject(parent)
-{
-}
-
-QMap<QString, QGradient> QtGradientManager::gradients() const
-{
- return m_idToGradient;
-}
-
-QString QtGradientManager::uniqueId(const QString &id) const
-{
- if (!m_idToGradient.contains(id))
- return id;
-
- QString base = id;
- while (base.count() > 0 && base.at(base.count() - 1).isDigit())
- base = base.left(base.count() - 1);
- QString newId = base;
- int counter = 0;
- while (m_idToGradient.contains(newId)) {
- ++counter;
- newId = base + QString::number(counter);
- }
- return newId;
-}
-
-QString QtGradientManager::addGradient(const QString &id, const QGradient &gradient)
-{
- QString newId = uniqueId(id);
-
- m_idToGradient[newId] = gradient;
-
- emit gradientAdded(newId, gradient);
-
- return newId;
-}
-
-void QtGradientManager::removeGradient(const QString &id)
-{
- if (!m_idToGradient.contains(id))
- return;
-
- emit gradientRemoved(id);
-
- m_idToGradient.remove(id);
-}
-
-void QtGradientManager::renameGradient(const QString &id, const QString &newId)
-{
- if (!m_idToGradient.contains(id))
- return;
-
- if (newId == id)
- return;
-
- QString changedId = uniqueId(newId);
- QGradient gradient = m_idToGradient.value(id);
-
- emit gradientRenamed(id, changedId);
-
- m_idToGradient.remove(id);
- m_idToGradient[changedId] = gradient;
-}
-
-void QtGradientManager::changeGradient(const QString &id, const QGradient &newGradient)
-{
- if (!m_idToGradient.contains(id))
- return;
-
- if (m_idToGradient.value(id) == newGradient)
- return;
-
- emit gradientChanged(id, newGradient);
-
- m_idToGradient[id] = newGradient;
-}
-
-void QtGradientManager::clear()
-{
- QMap<QString, QGradient> grads = gradients();
- QMapIterator<QString, QGradient> itGrad(grads);
- while (itGrad.hasNext()) {
- removeGradient(itGrad.next().key());
- }
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientmanager.h b/src/gui/extern/QtGradientEditor/qtgradientmanager.h
deleted file mode 100644
index 5e3b3ab57158b485b75c5657071e2edfb45aca04..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientmanager.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRADIENTMANAGER_H
-#define GRADIENTMANAGER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QSize>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtGui/QGradient>
-
-QT_BEGIN_NAMESPACE
-
-class QGradient;
-class QPixmap;
-class QColor;
-
-class QtGradientManager : public QObject
-{
- Q_OBJECT
-public:
- QtGradientManager(QObject *parent = 0);
-
- QMap<QString, QGradient> gradients() const;
-
- QString uniqueId(const QString &id) const;
-
-public slots:
-
- QString addGradient(const QString &id, const QGradient &gradient);
- void renameGradient(const QString &id, const QString &newId);
- void changeGradient(const QString &id, const QGradient &newGradient);
- void removeGradient(const QString &id);
-
- //utils
- void clear();
-
-signals:
-
- void gradientAdded(const QString &id, const QGradient &gradient);
- void gradientRenamed(const QString &id, const QString &newId);
- void gradientChanged(const QString &id, const QGradient &newGradient);
- void gradientRemoved(const QString &id);
-
-private:
-
- QMap<QString, QGradient> m_idToGradient;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.cpp b/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.cpp
deleted file mode 100644
index 8cf73b3dd5737fdd5f3025906625f4b94c562474..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-TRANSLATOR qdesigner_internal::QtGradientStopsController
-*/
-
-#include "qtgradientstopscontroller.h"
-#include "ui_qtgradienteditor.h"
-#include "qtgradientstopsmodel.h"
-
-#include <QtCore/QTimer>
-
-QT_BEGIN_NAMESPACE
-
-
-void QtGradientStopsControllerPrivate::enableCurrent(bool enable)
-{
- m_ui->positionLabel->setEnabled(enable);
- m_ui->colorLabel->setEnabled(enable);
- m_ui->hLabel->setEnabled(enable);
- m_ui->sLabel->setEnabled(enable);
- m_ui->vLabel->setEnabled(enable);
- m_ui->aLabel->setEnabled(enable);
- m_ui->hueLabel->setEnabled(enable);
- m_ui->saturationLabel->setEnabled(enable);
- m_ui->valueLabel->setEnabled(enable);
- m_ui->alphaLabel->setEnabled(enable);
-
- m_ui->positionSpinBox->setEnabled(enable);
- m_ui->colorButton->setEnabled(enable);
-
- m_ui->hueColorLine->setEnabled(enable);
- m_ui->saturationColorLine->setEnabled(enable);
- m_ui->valueColorLine->setEnabled(enable);
- m_ui->alphaColorLine->setEnabled(enable);
-
- m_ui->hueSpinBox->setEnabled(enable);
- m_ui->saturationSpinBox->setEnabled(enable);
- m_ui->valueSpinBox->setEnabled(enable);
- m_ui->alphaSpinBox->setEnabled(enable);
-}
-
-QtGradientStopsControllerPrivate::PositionColorMap QtGradientStopsControllerPrivate::stopsData(const PositionStopMap &stops) const
-{
- PositionColorMap data;
- PositionStopMap::ConstIterator itStop = stops.constBegin();
- while (itStop != stops.constEnd()) {
- QtGradientStop *stop = itStop.value();
- data[stop->position()] = stop->color();
-
- ++itStop;
- }
- return data;
-}
-
-QGradientStops QtGradientStopsControllerPrivate::makeGradientStops(const PositionColorMap &data) const
-{
- QGradientStops stops;
- PositionColorMap::ConstIterator itData = data.constBegin();
- while (itData != data.constEnd()) {
- stops << QPair<qreal, QColor>(itData.key(), itData.value());
-
- ++itData;
- }
- return stops;
-}
-
-void QtGradientStopsControllerPrivate::updateZoom(double zoom)
-{
- m_ui->gradientStopsWidget->setZoom(zoom);
- m_ui->zoomSpinBox->blockSignals(true);
- m_ui->zoomSpinBox->setValue(qRound(zoom * 100));
- m_ui->zoomSpinBox->blockSignals(false);
- bool zoomInEnabled = true;
- bool zoomOutEnabled = true;
- bool zoomAllEnabled = true;
- if (zoom <= 1) {
- zoomAllEnabled = false;
- zoomOutEnabled = false;
- } else if (zoom >= 100) {
- zoomInEnabled = false;
- }
- m_ui->zoomInButton->setEnabled(zoomInEnabled);
- m_ui->zoomOutButton->setEnabled(zoomOutEnabled);
- m_ui->zoomAllButton->setEnabled(zoomAllEnabled);
-}
-
-void QtGradientStopsControllerPrivate::slotHsvClicked()
-{
- QString h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "H", 0, QApplication::UnicodeUTF8);
- QString s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "S", 0, QApplication::UnicodeUTF8);
- QString v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "V", 0, QApplication::UnicodeUTF8);
-
- m_ui->hLabel->setText(h);
- m_ui->sLabel->setText(s);
- m_ui->vLabel->setText(v);
-
- h = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", 0, QApplication::UnicodeUTF8);
- s = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Sat", 0, QApplication::UnicodeUTF8);
- v = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Val", 0, QApplication::UnicodeUTF8);
-
- const QString hue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Hue", 0, QApplication::UnicodeUTF8);
- const QString saturation = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Saturation", 0, QApplication::UnicodeUTF8);
- const QString value = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Value", 0, QApplication::UnicodeUTF8);
-
- m_ui->hLabel->setToolTip(hue);
- m_ui->hueLabel->setText(h);
- m_ui->hueColorLine->setToolTip(hue);
- m_ui->hueColorLine->setColorComponent(QtColorLine::Hue);
-
- m_ui->sLabel->setToolTip(saturation);
- m_ui->saturationLabel->setText(s);
- m_ui->saturationColorLine->setToolTip(saturation);
- m_ui->saturationColorLine->setColorComponent(QtColorLine::Saturation);
-
- m_ui->vLabel->setToolTip(value);
- m_ui->valueLabel->setText(v);
- m_ui->valueColorLine->setToolTip(value);
- m_ui->valueColorLine->setColorComponent(QtColorLine::Value);
-
- setColorSpinBoxes(m_ui->colorButton->color());
-}
-
-void QtGradientStopsControllerPrivate::slotRgbClicked()
-{
- QString r = QApplication::translate("qdesigner_internal::QtGradientStopsController", "R", 0, QApplication::UnicodeUTF8);
- QString g = QApplication::translate("qdesigner_internal::QtGradientStopsController", "G", 0, QApplication::UnicodeUTF8);
- QString b = QApplication::translate("qdesigner_internal::QtGradientStopsController", "B", 0, QApplication::UnicodeUTF8);
-
- m_ui->hLabel->setText(r);
- m_ui->sLabel->setText(g);
- m_ui->vLabel->setText(b);
-
- QString red = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Red", 0, QApplication::UnicodeUTF8);
- QString green = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Green", 0, QApplication::UnicodeUTF8);
- QString blue = QApplication::translate("qdesigner_internal::QtGradientStopsController", "Blue", 0, QApplication::UnicodeUTF8);
-
- m_ui->hLabel->setToolTip(red);
- m_ui->hueLabel->setText(red);
- m_ui->hueColorLine->setToolTip(red);
- m_ui->hueColorLine->setColorComponent(QtColorLine::Red);
-
- m_ui->sLabel->setToolTip(green);
- m_ui->saturationLabel->setText(green);
- m_ui->saturationColorLine->setToolTip(green);
- m_ui->saturationColorLine->setColorComponent(QtColorLine::Green);
-
- m_ui->vLabel->setToolTip(blue);
- m_ui->valueLabel->setText(blue);
- m_ui->valueColorLine->setToolTip(blue);
- m_ui->valueColorLine->setColorComponent(QtColorLine::Blue);
-
- setColorSpinBoxes(m_ui->colorButton->color());
-}
-
-void QtGradientStopsControllerPrivate::setColorSpinBoxes(const QColor &color)
-{
- m_ui->hueSpinBox->blockSignals(true);
- m_ui->saturationSpinBox->blockSignals(true);
- m_ui->valueSpinBox->blockSignals(true);
- m_ui->alphaSpinBox->blockSignals(true);
- if (m_ui->hsvRadioButton->isChecked()) {
- if (m_ui->hueSpinBox->maximum() != 359)
- m_ui->hueSpinBox->setMaximum(359);
- if (m_ui->hueSpinBox->value() != color.hue())
- m_ui->hueSpinBox->setValue(color.hue());
- if (m_ui->saturationSpinBox->value() != color.saturation())
- m_ui->saturationSpinBox->setValue(color.saturation());
- if (m_ui->valueSpinBox->value() != color.value())
- m_ui->valueSpinBox->setValue(color.value());
- } else {
- if (m_ui->hueSpinBox->maximum() != 255)
- m_ui->hueSpinBox->setMaximum(255);
- if (m_ui->hueSpinBox->value() != color.red())
- m_ui->hueSpinBox->setValue(color.red());
- if (m_ui->saturationSpinBox->value() != color.green())
- m_ui->saturationSpinBox->setValue(color.green());
- if (m_ui->valueSpinBox->value() != color.blue())
- m_ui->valueSpinBox->setValue(color.blue());
- }
- m_ui->alphaSpinBox->setValue(color.alpha());
- m_ui->hueSpinBox->blockSignals(false);
- m_ui->saturationSpinBox->blockSignals(false);
- m_ui->valueSpinBox->blockSignals(false);
- m_ui->alphaSpinBox->blockSignals(false);
-}
-
-void QtGradientStopsControllerPrivate::slotCurrentStopChanged(QtGradientStop *stop)
-{
- if (!stop) {
- enableCurrent(false);
- return;
- }
- enableCurrent(true);
-
- QTimer::singleShot(0, q_ptr, SLOT(slotUpdatePositionSpinBox()));
-
- m_ui->colorButton->setColor(stop->color());
- m_ui->hueColorLine->setColor(stop->color());
- m_ui->saturationColorLine->setColor(stop->color());
- m_ui->valueColorLine->setColor(stop->color());
- m_ui->alphaColorLine->setColor(stop->color());
- setColorSpinBoxes(stop->color());
-}
-
-void QtGradientStopsControllerPrivate::slotStopMoved(QtGradientStop *stop, qreal newPos)
-{
- QTimer::singleShot(0, q_ptr, SLOT(slotUpdatePositionSpinBox()));
-
- PositionColorMap stops = stopsData(m_model->stops());
- stops.remove(stop->position());
- stops[newPos] = stop->color();
-
- QGradientStops gradStops = makeGradientStops(stops);
- emit q_ptr->gradientStopsChanged(gradStops);
-}
-
-void QtGradientStopsControllerPrivate::slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2)
-{
- QTimer::singleShot(0, q_ptr, SLOT(slotUpdatePositionSpinBox()));
-
- PositionColorMap stops = stopsData(m_model->stops());
- const qreal pos1 = stop1->position();
- const qreal pos2 = stop2->position();
- stops[pos1] = stop2->color();
- stops[pos2] = stop1->color();
-
- QGradientStops gradStops = makeGradientStops(stops);
- emit q_ptr->gradientStopsChanged(gradStops);
-}
-
-void QtGradientStopsControllerPrivate::slotStopAdded(QtGradientStop *stop)
-{
- PositionColorMap stops = stopsData(m_model->stops());
- stops[stop->position()] = stop->color();
-
- QGradientStops gradStops = makeGradientStops(stops);
- emit q_ptr->gradientStopsChanged(gradStops);
-}
-
-void QtGradientStopsControllerPrivate::slotStopRemoved(QtGradientStop *stop)
-{
- PositionColorMap stops = stopsData(m_model->stops());
- stops.remove(stop->position());
-
- QGradientStops gradStops = makeGradientStops(stops);
- emit q_ptr->gradientStopsChanged(gradStops);
-}
-
-void QtGradientStopsControllerPrivate::slotStopChanged(QtGradientStop *stop, const QColor &newColor)
-{
- if (m_model->currentStop() == stop) {
- m_ui->colorButton->setColor(newColor);
- m_ui->hueColorLine->setColor(newColor);
- m_ui->saturationColorLine->setColor(newColor);
- m_ui->valueColorLine->setColor(newColor);
- m_ui->alphaColorLine->setColor(newColor);
- setColorSpinBoxes(newColor);
- }
-
- PositionColorMap stops = stopsData(m_model->stops());
- stops[stop->position()] = newColor;
-
- QGradientStops gradStops = makeGradientStops(stops);
- emit q_ptr->gradientStopsChanged(gradStops);
-}
-
-void QtGradientStopsControllerPrivate::slotStopSelected(QtGradientStop *stop, bool selected)
-{
- Q_UNUSED(stop)
- Q_UNUSED(selected)
- QTimer::singleShot(0, q_ptr, SLOT(slotUpdatePositionSpinBox()));
-}
-
-void QtGradientStopsControllerPrivate::slotUpdatePositionSpinBox()
-{
- QtGradientStop *current = m_model->currentStop();
- if (!current)
- return;
-
- qreal min = 0.0;
- qreal max = 1.0;
- const qreal pos = current->position();
-
- QtGradientStop *first = m_model->firstSelected();
- QtGradientStop *last = m_model->lastSelected();
-
- if (first && last) {
- const qreal minPos = pos - first->position() - 0.0004999;
- const qreal maxPos = pos + 1.0 - last->position() + 0.0004999;
-
- if (max > maxPos)
- max = maxPos;
- if (min < minPos)
- min = minPos;
-
- if (first->position() == 0.0)
- min = pos;
- if (last->position() == 1.0)
- max = pos;
- }
-
- const int spinMin = qRound(m_ui->positionSpinBox->minimum() * 1000);
- const int spinMax = qRound(m_ui->positionSpinBox->maximum() * 1000);
-
- const int newMin = qRound(min * 1000);
- const int newMax = qRound(max * 1000);
-
- m_ui->positionSpinBox->blockSignals(true);
- if (spinMin != newMin || spinMax != newMax) {
- m_ui->positionSpinBox->setRange((double)newMin / 1000, (double)newMax / 1000);
- }
- if (m_ui->positionSpinBox->value() != pos)
- m_ui->positionSpinBox->setValue(pos);
- m_ui->positionSpinBox->blockSignals(false);
-}
-
-void QtGradientStopsControllerPrivate::slotChangeColor(const QColor &color)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
- m_model->changeStop(stop, color);
- QList<QtGradientStop *> stops = m_model->selectedStops();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (s != stop)
- m_model->changeStop(s, color);
- }
-}
-
-void QtGradientStopsControllerPrivate::slotChangeHue(const QColor &color)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
- m_model->changeStop(stop, color);
- QList<QtGradientStop *> stops = m_model->selectedStops();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (s != stop) {
- QColor c = s->color();
- if (m_ui->hsvRadioButton->isChecked())
- c.setHsvF(color.hueF(), c.saturationF(), c.valueF(), c.alphaF());
- else
- c.setRgbF(color.redF(), c.greenF(), c.blueF(), c.alphaF());
- m_model->changeStop(s, c);
- }
- }
-}
-
-void QtGradientStopsControllerPrivate::slotChangeHue(int color)
-{
- QColor c = m_ui->hueColorLine->color();
- if (m_ui->hsvRadioButton->isChecked())
- c.setHsvF((qreal)color / 360.0, c.saturationF(), c.valueF(), c.alphaF());
- else
- c.setRed(color);
- slotChangeHue(c);
-}
-
-void QtGradientStopsControllerPrivate::slotChangeSaturation(const QColor &color)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
- m_model->changeStop(stop, color);
- QList<QtGradientStop *> stops = m_model->selectedStops();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (s != stop) {
- QColor c = s->color();
- if (m_ui->hsvRadioButton->isChecked()) {
- c.setHsvF(c.hueF(), color.saturationF(), c.valueF(), c.alphaF());
- int hue = c.hue();
- if (hue == 360 || hue == -1)
- c.setHsvF(0.0, c.saturationF(), c.valueF(), c.alphaF());
- } else {
- c.setRgbF(c.redF(), color.greenF(), c.blueF(), c.alphaF());
- }
- m_model->changeStop(s, c);
- }
- }
-}
-
-void QtGradientStopsControllerPrivate::slotChangeSaturation(int color)
-{
- QColor c = m_ui->saturationColorLine->color();
- if (m_ui->hsvRadioButton->isChecked())
- c.setHsvF(c.hueF(), (qreal)color / 255, c.valueF(), c.alphaF());
- else
- c.setGreen(color);
- slotChangeSaturation(c);
-}
-
-void QtGradientStopsControllerPrivate::slotChangeValue(const QColor &color)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
- m_model->changeStop(stop, color);
- QList<QtGradientStop *> stops = m_model->selectedStops();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (s != stop) {
- QColor c = s->color();
- if (m_ui->hsvRadioButton->isChecked()) {
- c.setHsvF(c.hueF(), c.saturationF(), color.valueF(), c.alphaF());
- int hue = c.hue();
- if (hue == 360 || hue == -1)
- c.setHsvF(0.0, c.saturationF(), c.valueF(), c.alphaF());
- } else {
- c.setRgbF(c.redF(), c.greenF(), color.blueF(), c.alphaF());
- }
- m_model->changeStop(s, c);
- }
- }
-}
-
-void QtGradientStopsControllerPrivate::slotChangeValue(int color)
-{
- QColor c = m_ui->valueColorLine->color();
- if (m_ui->hsvRadioButton->isChecked())
- c.setHsvF(c.hueF(), c.saturationF(), (qreal)color / 255, c.alphaF());
- else
- c.setBlue(color);
- slotChangeValue(c);
-}
-
-void QtGradientStopsControllerPrivate::slotChangeAlpha(const QColor &color)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
- m_model->changeStop(stop, color);
- QList<QtGradientStop *> stops = m_model->selectedStops();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (s != stop) {
- QColor c = s->color();
- if (m_ui->hsvRadioButton->isChecked()) {
- c.setHsvF(c.hueF(), c.saturationF(), c.valueF(), color.alphaF());
- int hue = c.hue();
- if (hue == 360 || hue == -1)
- c.setHsvF(0.0, c.saturationF(), c.valueF(), c.alphaF());
- } else {
- c.setRgbF(c.redF(), c.greenF(), c.blueF(), color.alphaF());
- }
- m_model->changeStop(s, c);
- }
- }
-}
-
-void QtGradientStopsControllerPrivate::slotChangeAlpha(int color)
-{
- QColor c = m_ui->alphaColorLine->color();
- if (m_ui->hsvRadioButton->isChecked())
- c.setHsvF(c.hueF(), c.saturationF(), c.valueF(), (qreal)color / 255);
- else
- c.setAlpha(color);
- slotChangeAlpha(c);
-}
-
-void QtGradientStopsControllerPrivate::slotChangePosition(double value)
-{
- QtGradientStop *stop = m_model->currentStop();
- if (!stop)
- return;
-
- m_model->moveStops(value);
-}
-
-void QtGradientStopsControllerPrivate::slotChangeZoom(int value)
-{
- updateZoom(value / 100.0);
-}
-
-void QtGradientStopsControllerPrivate::slotZoomIn()
-{
- double newZoom = m_ui->gradientStopsWidget->zoom() * 2;
- if (newZoom > 100)
- newZoom = 100;
- updateZoom(newZoom);
-}
-
-void QtGradientStopsControllerPrivate::slotZoomOut()
-{
- double newZoom = m_ui->gradientStopsWidget->zoom() / 2;
- if (newZoom < 1)
- newZoom = 1;
- updateZoom(newZoom);
-}
-
-void QtGradientStopsControllerPrivate::slotZoomAll()
-{
- updateZoom(1);
-}
-
-void QtGradientStopsControllerPrivate::slotZoomChanged(double zoom)
-{
- updateZoom(zoom);
-}
-
-QtGradientStopsController::QtGradientStopsController(QObject *parent)
- : QObject(parent)
-{
- d_ptr = new QtGradientStopsControllerPrivate();
- d_ptr->q_ptr = this;
-
- d_ptr->m_spec = QColor::Hsv;
-}
-
-#include <QDebug>
-#include <QFileInfo>
-#include <QFileDialog>
-
-void QtGradientStopsController::setUi(Ui::QtGradientEditor *ui)
-{
- d_ptr->m_ui = ui;
-
- d_ptr->m_ui->hueColorLine->setColorComponent(QtColorLine::Hue);
- d_ptr->m_ui->saturationColorLine->setColorComponent(QtColorLine::Saturation);
- d_ptr->m_ui->valueColorLine->setColorComponent(QtColorLine::Value);
- d_ptr->m_ui->alphaColorLine->setColorComponent(QtColorLine::Alpha);
-
- d_ptr->m_model = new QtGradientStopsModel(this);
- d_ptr->m_ui->gradientStopsWidget->setGradientStopsModel(d_ptr->m_model);
- connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
-
- connect(d_ptr->m_ui->hueColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeHue(const QColor &)));
- connect(d_ptr->m_ui->saturationColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeSaturation(const QColor &)));
- connect(d_ptr->m_ui->valueColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeValue(const QColor &)));
- connect(d_ptr->m_ui->alphaColorLine, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeAlpha(const QColor &)));
- connect(d_ptr->m_ui->colorButton, SIGNAL(colorChanged(const QColor &)),
- this, SLOT(slotChangeColor(const QColor &)));
-
- connect(d_ptr->m_ui->hueSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotChangeHue(int)));
- connect(d_ptr->m_ui->saturationSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotChangeSaturation(int)));
- connect(d_ptr->m_ui->valueSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotChangeValue(int)));
- connect(d_ptr->m_ui->alphaSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotChangeAlpha(int)));
-
- connect(d_ptr->m_ui->positionSpinBox, SIGNAL(valueChanged(double)),
- this, SLOT(slotChangePosition(double)));
-
- connect(d_ptr->m_ui->zoomSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotChangeZoom(int)));
- connect(d_ptr->m_ui->zoomInButton, SIGNAL(clicked()),
- this, SLOT(slotZoomIn()));
- connect(d_ptr->m_ui->zoomOutButton, SIGNAL(clicked()),
- this, SLOT(slotZoomOut()));
- connect(d_ptr->m_ui->zoomAllButton, SIGNAL(clicked()),
- this, SLOT(slotZoomAll()));
- connect(d_ptr->m_ui->gradientStopsWidget, SIGNAL(zoomChanged(double)),
- this, SLOT(slotZoomChanged(double)));
-
- connect(d_ptr->m_ui->hsvRadioButton, SIGNAL(clicked()),
- this, SLOT(slotHsvClicked()));
- connect(d_ptr->m_ui->rgbRadioButton, SIGNAL(clicked()),
- this, SLOT(slotRgbClicked()));
-
- d_ptr->enableCurrent(false);
- d_ptr->m_ui->zoomInButton->setIcon(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/zoomin.png")));
- d_ptr->m_ui->zoomOutButton->setIcon(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/zoomout.png")));
- d_ptr->updateZoom(1);
-}
-
-QtGradientStopsController::~QtGradientStopsController()
-{
- delete d_ptr;
-}
-
-void QtGradientStopsController::setGradientStops(const QGradientStops &stops)
-{
- d_ptr->m_model->clear();
- QVectorIterator<QPair<qreal, QColor> > it(stops);
- QtGradientStop *first = 0;
- while (it.hasNext()) {
- QPair<qreal, QColor> pair = it.next();
- QtGradientStop *stop = d_ptr->m_model->addStop(pair.first, pair.second);
- if (!first)
- first = stop;
- }
- if (first)
- d_ptr->m_model->setCurrentStop(first);
-}
-
-QGradientStops QtGradientStopsController::gradientStops() const
-{
- QGradientStops stops;
- QList<QtGradientStop *> stopsList = d_ptr->m_model->stops().values();
- QListIterator<QtGradientStop *> itStop(stopsList);
- while (itStop.hasNext()) {
- QtGradientStop *stop = itStop.next();
- stops << QPair<qreal, QColor>(stop->position(), stop->color());
- }
- return stops;
-}
-
-QColor::Spec QtGradientStopsController::spec() const
-{
- return d_ptr->m_spec;
-}
-
-void QtGradientStopsController::setSpec(QColor::Spec spec)
-{
- if (d_ptr->m_spec == spec)
- return;
-
- d_ptr->m_spec = spec;
- if (d_ptr->m_spec == QColor::Rgb) {
- d_ptr->m_ui->rgbRadioButton->setChecked(true);
- d_ptr->slotRgbClicked();
- } else {
- d_ptr->m_ui->hsvRadioButton->setChecked(true);
- d_ptr->slotHsvClicked();
- }
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.h b/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.h
deleted file mode 100644
index deea8e8350c0ee18e85cf00facff1cac0cc560bc..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopscontroller.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTSTOPSCONTROLLER_H
-#define QTGRADIENTSTOPSCONTROLLER_H
-
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-
-namespace Ui {
- class QtGradientEditor;
-}
-
-class QtGradientStopsController : public QObject
-{
- Q_OBJECT
-public:
- QtGradientStopsController(QObject *parent = 0);
- ~QtGradientStopsController();
-
- void setUi(Ui::QtGradientEditor *editor);
-
- void setGradientStops(const QGradientStops &stops);
- QGradientStops gradientStops() const;
-
- QColor::Spec spec() const;
- void setSpec(QColor::Spec spec);
-
-signals:
-
- void gradientStopsChanged(const QGradientStops &stops);
-
-private:
- class QtGradientStopsControllerPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientStopsController)
- Q_DISABLE_COPY(QtGradientStopsController)
- Q_PRIVATE_SLOT(d_func(), void slotHsvClicked())
- Q_PRIVATE_SLOT(d_func(), void slotRgbClicked())
- Q_PRIVATE_SLOT(d_func(), void slotCurrentStopChanged(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotStopMoved(QtGradientStop *stop, qreal newPos))
- Q_PRIVATE_SLOT(d_func(), void slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2))
- Q_PRIVATE_SLOT(d_func(), void slotStopChanged(QtGradientStop *stop, const QColor &newColor))
- Q_PRIVATE_SLOT(d_func(), void slotStopSelected(QtGradientStop *stop, bool selected))
- Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotUpdatePositionSpinBox())
- Q_PRIVATE_SLOT(d_func(), void slotChangeColor(const QColor &color))
- Q_PRIVATE_SLOT(d_func(), void slotChangeHue(const QColor &color))
- Q_PRIVATE_SLOT(d_func(), void slotChangeSaturation(const QColor &color))
- Q_PRIVATE_SLOT(d_func(), void slotChangeValue(const QColor &color))
- Q_PRIVATE_SLOT(d_func(), void slotChangeAlpha(const QColor &color))
- Q_PRIVATE_SLOT(d_func(), void slotChangeHue(int))
- Q_PRIVATE_SLOT(d_func(), void slotChangeSaturation(int))
- Q_PRIVATE_SLOT(d_func(), void slotChangeValue(int))
- Q_PRIVATE_SLOT(d_func(), void slotChangeAlpha(int))
- //Q_PRIVATE_SLOT(d_func(), void slotChangePosition(double newPos))
- Q_PRIVATE_SLOT(d_func(), void slotChangePosition(double value))
- Q_PRIVATE_SLOT(d_func(), void slotChangeZoom(int value))
- Q_PRIVATE_SLOT(d_func(), void slotZoomIn())
- Q_PRIVATE_SLOT(d_func(), void slotZoomOut())
- Q_PRIVATE_SLOT(d_func(), void slotZoomAll())
- Q_PRIVATE_SLOT(d_func(), void slotZoomChanged(double))
-};
-
-#include "qtgradientstopsmodel.h"
-
-class QtGradientStopsControllerPrivate
-{
- QtGradientStopsController *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientStopsController)
-public:
- typedef QMap<qreal, QColor> PositionColorMap;
- typedef QMap<qreal, QtGradientStop *> PositionStopMap;
-
- void slotHsvClicked();
- void slotRgbClicked();
-
- void slotCurrentStopChanged(QtGradientStop *stop);
- void slotStopMoved(QtGradientStop *stop, qreal newPos);
- void slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2);
- void slotStopChanged(QtGradientStop *stop, const QColor &newColor);
- void slotStopSelected(QtGradientStop *stop, bool selected);
- void slotStopAdded(QtGradientStop *stop);
- void slotStopRemoved(QtGradientStop *stop);
- void slotUpdatePositionSpinBox();
-
- void slotChangeColor(const QColor &color);
- void slotChangeHue(const QColor &color);
- void slotChangeSaturation(const QColor &color);
- void slotChangeValue(const QColor &color);
- void slotChangeAlpha(const QColor &color);
- void slotChangeHue(int color);
- void slotChangeSaturation(int color);
- void slotChangeValue(int color);
- void slotChangeAlpha(int color);
- void slotChangePosition(double value);
-
- void slotChangeZoom(int value);
- void slotZoomIn();
- void slotZoomOut();
- void slotZoomAll();
- void slotZoomChanged(double zoom);
-
- void enableCurrent(bool enable);
- void setColorSpinBoxes(const QColor &color);
- PositionColorMap stopsData(const PositionStopMap &stops) const;
- QGradientStops makeGradientStops(const PositionColorMap &data) const;
- void updateZoom(double zoom);
-
- QtGradientStopsModel *m_model;
- QColor::Spec m_spec;
-
- Ui::QtGradientEditor *m_ui;
-};
-
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.cpp b/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.cpp
deleted file mode 100644
index 1888dd2133c6883c9759e5212a48186401cfd1f9..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientstopsmodel.h"
-#include <QtGui/QColor>
-
-QT_BEGIN_NAMESPACE
-
-
-qreal QtGradientStop::position() const
-{
- return d_ptr->m_position;
-}
-
-QColor QtGradientStop::color() const
-{
- return d_ptr->m_color;
-}
-
-QtGradientStopsModel *QtGradientStop::gradientModel() const
-{
- return d_ptr->m_model;
-}
-
-void QtGradientStop::setColor(const QColor &color)
-{
- d_ptr->m_color = color;
-}
-
-void QtGradientStop::setPosition(qreal position)
-{
- d_ptr->m_position = position;
-}
-
-QtGradientStop::QtGradientStop(QtGradientStopsModel *model)
-{
- d_ptr = new QtGradientStopPrivate();
- d_ptr->m_position = 0;
- d_ptr->m_color = Qt::white;
- d_ptr->m_model = model;
-}
-
-QtGradientStop::~QtGradientStop()
-{
- delete d_ptr;
-}
-
-class QtGradientStopsModelPrivate
-{
- QtGradientStopsModel *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientStopsModel)
-public:
- QMap<qreal, QtGradientStop *> m_posToStop;
- QMap<QtGradientStop *, qreal> m_stopToPos;
- QMap<QtGradientStop *, bool> m_selection;
- QtGradientStop *m_current;
-};
-
-
-
-QtGradientStopsModel::QtGradientStopsModel(QObject *parent)
- : QObject(parent)
-{
- d_ptr = new QtGradientStopsModelPrivate;
- d_ptr->q_ptr = this;
- d_ptr->m_current = 0;
-}
-
-QtGradientStopsModel::~QtGradientStopsModel()
-{
- clear();
- delete d_ptr;
-}
-
-QtGradientStopsModel::PositionStopMap QtGradientStopsModel::stops() const
-{
- return d_ptr->m_posToStop;
-}
-
-QtGradientStop *QtGradientStopsModel::at(qreal pos) const
-{
- if (d_ptr->m_posToStop.contains(pos))
- return d_ptr->m_posToStop[pos];
- return 0;
-}
-
-QColor QtGradientStopsModel::color(qreal pos) const
-{
- PositionStopMap gradStops = stops();
- if (gradStops.isEmpty())
- return QColor::fromRgbF(pos, pos, pos, 1.0);
- if (gradStops.contains(pos))
- return gradStops[pos]->color();
-
- gradStops[pos] = 0;
- PositionStopMap::ConstIterator itStop = gradStops.constFind(pos);
- if (itStop == gradStops.constBegin()) {
- ++itStop;
- return itStop.value()->color();
- }
- if (itStop == --gradStops.constEnd()) {
- --itStop;
- return itStop.value()->color();
- }
- PositionStopMap::ConstIterator itPrev = itStop;
- PositionStopMap::ConstIterator itNext = itStop;
- --itPrev;
- ++itNext;
-
- double prevX = itPrev.key();
- double nextX = itNext.key();
-
- double coefX = (pos - prevX) / (nextX - prevX);
- QColor prevCol = itPrev.value()->color();
- QColor nextCol = itNext.value()->color();
-
- QColor newColor;
- newColor.setRgbF((nextCol.redF() - prevCol.redF() ) * coefX + prevCol.redF(),
- (nextCol.greenF() - prevCol.greenF()) * coefX + prevCol.greenF(),
- (nextCol.blueF() - prevCol.blueF() ) * coefX + prevCol.blueF(),
- (nextCol.alphaF() - prevCol.alphaF()) * coefX + prevCol.alphaF());
- return newColor;
-}
-
-QList<QtGradientStop *> QtGradientStopsModel::selectedStops() const
-{
- return d_ptr->m_selection.keys();
-}
-
-QtGradientStop *QtGradientStopsModel::currentStop() const
-{
- return d_ptr->m_current;
-}
-
-bool QtGradientStopsModel::isSelected(QtGradientStop *stop) const
-{
- if (d_ptr->m_selection.contains(stop))
- return true;
- return false;
-}
-
-QtGradientStop *QtGradientStopsModel::addStop(qreal pos, const QColor &color)
-{
- qreal newPos = pos;
- if (pos < 0.0)
- newPos = 0.0;
- if (pos > 1.0)
- newPos = 1.0;
- if (d_ptr->m_posToStop.contains(newPos))
- return 0;
- QtGradientStop *stop = new QtGradientStop();
- stop->setPosition(newPos);
- stop->setColor(color);
-
- d_ptr->m_posToStop[newPos] = stop;
- d_ptr->m_stopToPos[stop] = newPos;
-
- emit stopAdded(stop);
-
- return stop;
-}
-
-void QtGradientStopsModel::removeStop(QtGradientStop *stop)
-{
- if (!d_ptr->m_stopToPos.contains(stop))
- return;
- if (currentStop() == stop)
- setCurrentStop(0);
- selectStop(stop, false);
-
- emit stopRemoved(stop);
-
- qreal pos = d_ptr->m_stopToPos[stop];
- d_ptr->m_stopToPos.remove(stop);
- d_ptr->m_posToStop.remove(pos);
- delete stop;
-}
-
-void QtGradientStopsModel::moveStop(QtGradientStop *stop, qreal newPos)
-{
- if (!d_ptr->m_stopToPos.contains(stop))
- return;
- if (d_ptr->m_posToStop.contains(newPos))
- return;
-
- if (newPos > 1.0)
- newPos = 1.0;
- else if (newPos < 0.0)
- newPos = 0.0;
-
- emit stopMoved(stop, newPos);
-
- const qreal oldPos = stop->position();
- stop->setPosition(newPos);
- d_ptr->m_stopToPos[stop] = newPos;
- d_ptr->m_posToStop.remove(oldPos);
- d_ptr->m_posToStop[newPos] = stop;
-}
-
-void QtGradientStopsModel::swapStops(QtGradientStop *stop1, QtGradientStop *stop2)
-{
- if (stop1 == stop2)
- return;
- if (!d_ptr->m_stopToPos.contains(stop1))
- return;
- if (!d_ptr->m_stopToPos.contains(stop2))
- return;
-
- emit stopsSwapped(stop1, stop2);
-
- const qreal pos1 = stop1->position();
- const qreal pos2 = stop2->position();
- stop1->setPosition(pos2);
- stop2->setPosition(pos1);
- d_ptr->m_stopToPos[stop1] = pos2;
- d_ptr->m_stopToPos[stop2] = pos1;
- d_ptr->m_posToStop[pos1] = stop2;
- d_ptr->m_posToStop[pos2] = stop1;
-}
-
-void QtGradientStopsModel::changeStop(QtGradientStop *stop, const QColor &newColor)
-{
- if (!d_ptr->m_stopToPos.contains(stop))
- return;
- if (stop->color() == newColor)
- return;
-
- emit stopChanged(stop, newColor);
-
- stop->setColor(newColor);
-}
-
-void QtGradientStopsModel::selectStop(QtGradientStop *stop, bool select)
-{
- if (!d_ptr->m_stopToPos.contains(stop))
- return;
- bool selected = d_ptr->m_selection.contains(stop);
- if (select == selected)
- return;
-
- emit stopSelected(stop, select);
-
- if (select)
- d_ptr->m_selection[stop] = true;
- else
- d_ptr->m_selection.remove(stop);
-}
-
-void QtGradientStopsModel::setCurrentStop(QtGradientStop *stop)
-{
- if (stop && !d_ptr->m_stopToPos.contains(stop))
- return;
- if (stop == currentStop())
- return;
-
- emit currentStopChanged(stop);
-
- d_ptr->m_current = stop;
-}
-
-QtGradientStop *QtGradientStopsModel::firstSelected() const
-{
- PositionStopMap stopList = stops();
- PositionStopMap::ConstIterator itStop = stopList.constBegin();
- while (itStop != stopList.constEnd()) {
- QtGradientStop *stop = itStop.value();
- if (isSelected(stop))
- return stop;
- ++itStop;
- };
- return 0;
-}
-
-QtGradientStop *QtGradientStopsModel::lastSelected() const
-{
- PositionStopMap stopList = stops();
- PositionStopMap::ConstIterator itStop = stopList.constEnd();
- while (itStop != stopList.constBegin()) {
- --itStop;
-
- QtGradientStop *stop = itStop.value();
- if (isSelected(stop))
- return stop;
- };
- return 0;
-}
-
-QtGradientStopsModel *QtGradientStopsModel::clone() const
-{
- QtGradientStopsModel *model = new QtGradientStopsModel();
-
- QMap<qreal, QtGradientStop *> stopsToClone = stops();
- QMapIterator<qreal, QtGradientStop *> it(stopsToClone);
- while (it.hasNext()) {
- it.next();
- model->addStop(it.key(), it.value()->color());
- }
- // clone selection and current also
- return model;
-}
-
-void QtGradientStopsModel::moveStops(double newPosition)
-{
- QtGradientStop *current = currentStop();
- if (!current)
- return;
-
- double newPos = newPosition;
-
- if (newPos > 1)
- newPos = 1;
- else if (newPos < 0)
- newPos = 0;
-
- if (newPos == current->position())
- return;
-
- double offset = newPos - current->position();
-
- QtGradientStop *first = firstSelected();
- QtGradientStop *last = lastSelected();
-
- if (first && last) { // multiselection
- double maxOffset = 1.0 - last->position();
- double minOffset = -first->position();
-
- if (offset > maxOffset)
- offset = maxOffset;
- else if (offset < minOffset)
- offset = minOffset;
-
- }
-
- if (offset == 0)
- return;
-
- bool forward = (offset > 0) ? false : true;
-
- PositionStopMap stopList;
-
- QList<QtGradientStop *> selected = selectedStops();
- QListIterator<QtGradientStop *> it(selected);
- while (it.hasNext()) {
- QtGradientStop *stop = it.next();
- stopList[stop->position()] = stop;
- }
- stopList[current->position()] = current;
-
- PositionStopMap::ConstIterator itStop = forward ? stopList.constBegin() : stopList.constEnd();
- while (itStop != (forward ? stopList.constEnd() : stopList.constBegin())) {
- if (!forward)
- --itStop;
- QtGradientStop *stop = itStop.value();
- double pos = stop->position() + offset;
- if (pos > 1)
- pos = 1;
- if (pos < 0)
- pos = 0;
-
- if (current == stop)
- pos = newPos;
-
- QtGradientStop *oldStop = at(pos);
- if (oldStop && !stopList.values().contains(oldStop))
- removeStop(oldStop);
- moveStop(stop, pos);
-
- if (forward)
- ++itStop;
- }
-}
-
-void QtGradientStopsModel::clear()
-{
- QList<QtGradientStop *> stopsList = stops().values();
- QListIterator<QtGradientStop *> it(stopsList);
- while (it.hasNext())
- removeStop(it.next());
-}
-
-void QtGradientStopsModel::clearSelection()
-{
- QList<QtGradientStop *> stopsList = selectedStops();
- QListIterator<QtGradientStop *> it(stopsList);
- while (it.hasNext())
- selectStop(it.next(), false);
-}
-
-void QtGradientStopsModel::flipAll()
-{
- QMap<qreal, QtGradientStop *> stopsMap = stops();
- QMapIterator<qreal, QtGradientStop *> itStop(stopsMap);
- itStop.toBack();
-
- QMap<QtGradientStop *, bool> swappedList;
-
- while (itStop.hasPrevious()) {
- itStop.previous();
-
- QtGradientStop *stop = itStop.value();
- if (swappedList.contains(stop))
- continue;
- const double newPos = 1.0 - itStop.key();
- if (stopsMap.contains(newPos)) {
- QtGradientStop *swapped = stopsMap.value(newPos);
- swappedList[swapped] = true;
- swapStops(stop, swapped);
- } else {
- moveStop(stop, newPos);
- }
- }
-}
-
-void QtGradientStopsModel::selectAll()
-{
- QList<QtGradientStop *> stopsList = stops().values();
- QListIterator<QtGradientStop *> it(stopsList);
- while (it.hasNext())
- selectStop(it.next(), true);
-}
-
-void QtGradientStopsModel::deleteStops()
-{
- QList<QtGradientStop *> selected = selectedStops();
- QListIterator<QtGradientStop *> itSel(selected);
- while (itSel.hasNext()) {
- QtGradientStop *stop = itSel.next();
- removeStop(stop);
- }
- QtGradientStop *current = currentStop();
- if (current)
- removeStop(current);
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.h b/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.h
deleted file mode 100644
index 44e4feab4adbd4a84358a5c01fd8e5982a75d7a3..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopsmodel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTSTOPSMODEL_H
-#define QTGRADIENTSTOPSMODEL_H
-
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-
-QT_BEGIN_NAMESPACE
-
-class QColor;
-
-class QtGradientStopsModel;
-
-class QtGradientStop
-{
-public:
- qreal position() const;
- QColor color() const;
- QtGradientStopsModel *gradientModel() const;
-
-private:
- void setColor(const QColor &color);
- void setPosition(qreal position);
- friend class QtGradientStopsModel;
- QtGradientStop(QtGradientStopsModel *model = 0);
- ~QtGradientStop();
- class QtGradientStopPrivate *d_ptr;
-};
-
-class QtGradientStopsModel : public QObject
-{
- Q_OBJECT
-public:
- typedef QMap<qreal, QtGradientStop *> PositionStopMap;
-
- QtGradientStopsModel(QObject *parent = 0);
- ~QtGradientStopsModel();
-
- PositionStopMap stops() const;
- QtGradientStop *at(qreal pos) const;
- QColor color(qreal pos) const; // calculated between points
- QList<QtGradientStop *> selectedStops() const;
- QtGradientStop *currentStop() const;
- bool isSelected(QtGradientStop *stop) const;
- QtGradientStop *firstSelected() const;
- QtGradientStop *lastSelected() const;
- QtGradientStopsModel *clone() const;
-
- QtGradientStop *addStop(qreal pos, const QColor &color);
- void removeStop(QtGradientStop *stop);
- void moveStop(QtGradientStop *stop, qreal newPos);
- void swapStops(QtGradientStop *stop1, QtGradientStop *stop2);
- void changeStop(QtGradientStop *stop, const QColor &newColor);
- void selectStop(QtGradientStop *stop, bool select);
- void setCurrentStop(QtGradientStop *stop);
-
- void moveStops(double newPosition); // moves current stop to newPos and all selected stops are moved accordingly
- void clear();
- void clearSelection();
- void flipAll();
- void selectAll();
- void deleteStops();
-
-signals:
- void stopAdded(QtGradientStop *stop);
- void stopRemoved(QtGradientStop *stop);
- void stopMoved(QtGradientStop *stop, qreal newPos);
- void stopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2);
- void stopChanged(QtGradientStop *stop, const QColor &newColor);
- void stopSelected(QtGradientStop *stop, bool selected);
- void currentStopChanged(QtGradientStop *stop);
-
-private:
- class QtGradientStopsModelPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientStopsModel)
- Q_DISABLE_COPY(QtGradientStopsModel)
-};
-
-#include <QColor>
-class QtGradientStopPrivate
-{
-public:
- qreal m_position;
- QColor m_color;
- QtGradientStopsModel *m_model;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopswidget.cpp b/src/gui/extern/QtGradientEditor/qtgradientstopswidget.cpp
deleted file mode 100644
index b8ba9e2f5b336e688fcc0a9de9e15efc58d18425..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopswidget.cpp
+++ /dev/null
@@ -1,1092 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientstopswidget.h"
-#include "qtgradientstopsmodel.h"
-
-#include <QtCore/QMap>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QRubberBand>
-#include <QtGui/QMenu>
-
-QT_BEGIN_NAMESPACE
-
-double QtGradientStopsWidgetPrivate::fromViewport(int x) const
-{
- QSize size = q_ptr->viewport()->size();
- int w = size.width();
- int max = q_ptr->horizontalScrollBar()->maximum();
- int val = q_ptr->horizontalScrollBar()->value();
- return ((double)x * m_scaleFactor + w * val) / (w * (m_scaleFactor + max));
-}
-
-double QtGradientStopsWidgetPrivate::toViewport(double x) const
-{
- QSize size = q_ptr->viewport()->size();
- int w = size.width();
- int max = q_ptr->horizontalScrollBar()->maximum();
- int val = q_ptr->horizontalScrollBar()->value();
- return w * (x * (m_scaleFactor + max) - val) / m_scaleFactor;
-}
-
-QtGradientStop *QtGradientStopsWidgetPrivate::stopAt(const QPoint &viewportPos) const
-{
- double posY = m_handleSize / 2;
- QListIterator<QtGradientStop *> itStop(m_stops);
- while (itStop.hasNext()) {
- QtGradientStop *stop = itStop.next();
-
- double posX = toViewport(stop->position());
-
- double x = viewportPos.x() - posX;
- double y = viewportPos.y() - posY;
-
- if ((m_handleSize * m_handleSize / 4) > (x * x + y * y))
- return stop;
- }
- return 0;
-}
-
-QList<QtGradientStop *> QtGradientStopsWidgetPrivate::stopsAt(const QPoint &viewportPos) const
-{
- QList<QtGradientStop *> stops;
- double posY = m_handleSize / 2;
- QListIterator<QtGradientStop *> itStop(m_stops);
- while (itStop.hasNext()) {
- QtGradientStop *stop = itStop.next();
-
- double posX = toViewport(stop->position());
-
- double x = viewportPos.x() - posX;
- double y = viewportPos.y() - posY;
-
- if ((m_handleSize * m_handleSize / 4) > (x * x + y * y))
- stops.append(stop);
- }
- return stops;
-}
-
-void QtGradientStopsWidgetPrivate::setupMove(QtGradientStop *stop, int x)
-{
- m_model->setCurrentStop(stop);
-
- int viewportX = qRound(toViewport(stop->position()));
- m_moveOffset = x - viewportX;
-
- QList<QtGradientStop *> stops = m_stops;
- m_stops.clear();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (m_model->isSelected(s) || s == stop) {
- m_moveStops[s] = s->position() - stop->position();
- m_stops.append(s);
- } else {
- m_moveOriginal[s->position()] = s->color();
- }
- }
- itStop.toFront();
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (!m_model->isSelected(s))
- m_stops.append(s);
- }
- m_stops.removeAll(stop);
- m_stops.prepend(stop);
-}
-
-void QtGradientStopsWidgetPrivate::ensureVisible(double x)
-{
- double viewX = toViewport(x);
- if (viewX < 0 || viewX > q_ptr->viewport()->size().width()) {
- int max = q_ptr->horizontalScrollBar()->maximum();
- int newVal = qRound(x * (max + m_scaleFactor) - m_scaleFactor / 2);
- q_ptr->horizontalScrollBar()->setValue(newVal);
- }
-}
-
-void QtGradientStopsWidgetPrivate::ensureVisible(QtGradientStop *stop)
-{
- if (!stop)
- return;
- ensureVisible(stop->position());
-}
-
-QtGradientStop *QtGradientStopsWidgetPrivate::newStop(const QPoint &viewportPos)
-{
- QtGradientStop *copyStop = stopAt(viewportPos);
- double posX = fromViewport(viewportPos.x());
- QtGradientStop *stop = m_model->at(posX);
- if (!stop) {
- QColor newColor;
- if (copyStop)
- newColor = copyStop->color();
- else
- newColor = m_model->color(posX);
- if (!newColor.isValid())
- newColor = Qt::white;
- stop = m_model->addStop(posX, newColor);
- }
- return stop;
-}
-
-void QtGradientStopsWidgetPrivate::slotStopAdded(QtGradientStop *stop)
-{
- m_stops.append(stop);
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotStopRemoved(QtGradientStop *stop)
-{
- m_stops.removeAll(stop);
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotStopMoved(QtGradientStop *stop, qreal newPos)
-{
- Q_UNUSED(stop)
- Q_UNUSED(newPos)
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2)
-{
- Q_UNUSED(stop1)
- Q_UNUSED(stop2)
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotStopChanged(QtGradientStop *stop, const QColor &newColor)
-{
- Q_UNUSED(stop)
- Q_UNUSED(newColor)
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotStopSelected(QtGradientStop *stop, bool selected)
-{
- Q_UNUSED(stop)
- Q_UNUSED(selected)
- q_ptr->viewport()->update();
-}
-
-void QtGradientStopsWidgetPrivate::slotCurrentStopChanged(QtGradientStop *stop)
-{
- Q_UNUSED(stop)
-
- if (!m_model)
- return;
- q_ptr->viewport()->update();
- if (stop) {
- m_stops.removeAll(stop);
- m_stops.prepend(stop);
- }
-}
-
-void QtGradientStopsWidgetPrivate::slotNewStop()
-{
- if (!m_model)
- return;
-
- QtGradientStop *stop = newStop(m_clickPos);
-
- if (!stop)
- return;
-
- m_model->clearSelection();
- m_model->selectStop(stop, true);
- m_model->setCurrentStop(stop);
-}
-
-void QtGradientStopsWidgetPrivate::slotDelete()
-{
- if (!m_model)
- return;
-
- m_model->deleteStops();
-}
-
-void QtGradientStopsWidgetPrivate::slotFlipAll()
-{
- if (!m_model)
- return;
-
- m_model->flipAll();
-}
-
-void QtGradientStopsWidgetPrivate::slotSelectAll()
-{
- if (!m_model)
- return;
-
- m_model->selectAll();
-}
-
-void QtGradientStopsWidgetPrivate::slotZoomIn()
-{
- double newZoom = q_ptr->zoom() * 2;
- if (newZoom > 100)
- newZoom = 100;
- if (newZoom == q_ptr->zoom())
- return;
-
- q_ptr->setZoom(newZoom);
- emit q_ptr->zoomChanged(q_ptr->zoom());
-}
-
-void QtGradientStopsWidgetPrivate::slotZoomOut()
-{
- double newZoom = q_ptr->zoom() / 2;
- if (newZoom < 1)
- newZoom = 1;
- if (newZoom == q_ptr->zoom())
- return;
-
- q_ptr->setZoom(newZoom);
- emit q_ptr->zoomChanged(q_ptr->zoom());
-}
-
-void QtGradientStopsWidgetPrivate::slotResetZoom()
-{
- if (1 == q_ptr->zoom())
- return;
-
- q_ptr->setZoom(1);
- emit q_ptr->zoomChanged(1);
-}
-
-QtGradientStopsWidget::QtGradientStopsWidget(QWidget *parent)
- : QAbstractScrollArea(parent)
-{
- d_ptr = new QtGradientStopsWidgetPrivate;
- d_ptr->q_ptr = this;
- d_ptr->m_backgroundCheckered = true;
- d_ptr->m_model = 0;
- d_ptr->m_handleSize = 25.0;
- d_ptr->m_scaleFactor = 1000;
- d_ptr->m_moving = false;
- d_ptr->m_zoom = 1;
- d_ptr->m_rubber = new QRubberBand(QRubberBand::Rectangle, this);
-#ifndef QT_NO_DRAGANDDROP
- d_ptr->m_dragStop = 0;
- d_ptr->m_changedStop = 0;
- d_ptr->m_clonedStop = 0;
- d_ptr->m_dragModel = 0;
-#endif
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- horizontalScrollBar()->setRange(0, (int)(d_ptr->m_scaleFactor * (d_ptr->m_zoom - 1) + 0.5));
- horizontalScrollBar()->setPageStep(d_ptr->m_scaleFactor);
- horizontalScrollBar()->setSingleStep(4);
- viewport()->setAutoFillBackground(false);
-
- setAcceptDrops(true);
-
- setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred));
-}
-
-QtGradientStopsWidget::~QtGradientStopsWidget()
-{
- delete d_ptr;
-}
-
-QSize QtGradientStopsWidget::sizeHint() const
-{
- return QSize(qRound(2 * d_ptr->m_handleSize), qRound(3 * d_ptr->m_handleSize) + horizontalScrollBar()->sizeHint().height());
-}
-
-QSize QtGradientStopsWidget::minimumSizeHint() const
-{
- return QSize(qRound(2 * d_ptr->m_handleSize), qRound(3 * d_ptr->m_handleSize) + horizontalScrollBar()->minimumSizeHint().height());
-}
-
-void QtGradientStopsWidget::setBackgroundCheckered(bool checkered)
-{
- if (d_ptr->m_backgroundCheckered == checkered)
- return;
- d_ptr->m_backgroundCheckered = checkered;
- update();
-}
-
-bool QtGradientStopsWidget::isBackgroundCheckered() const
-{
- return d_ptr->m_backgroundCheckered;
-}
-
-void QtGradientStopsWidget::setGradientStopsModel(QtGradientStopsModel *model)
-{
- if (d_ptr->m_model == model)
- return;
-
- if (d_ptr->m_model) {
- disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
-
- d_ptr->m_stops.clear();
- }
-
- d_ptr->m_model = model;
-
- if (d_ptr->m_model) {
- connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
- this, SLOT(slotStopAdded(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
- this, SLOT(slotStopRemoved(QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
- this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
- connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
- this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
- connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
- this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
- connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
- this, SLOT(slotStopSelected(QtGradientStop *, bool)));
- connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
- this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
-
- QList<QtGradientStop *> stops = d_ptr->m_model->stops().values();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext())
- d_ptr->slotStopAdded(itStop.next());
-
- QList<QtGradientStop *> selected = d_ptr->m_model->selectedStops();
- QListIterator<QtGradientStop *> itSelect(selected);
- while (itSelect.hasNext())
- d_ptr->slotStopSelected(itSelect.next(), true);
-
- d_ptr->slotCurrentStopChanged(d_ptr->m_model->currentStop());
- }
-}
-
-void QtGradientStopsWidget::mousePressEvent(QMouseEvent *e)
-{
- typedef QtGradientStopsModel::PositionStopMap PositionStopMap;
- if (!d_ptr->m_model)
- return;
-
- if (e->button() != Qt::LeftButton)
- return;
-
- d_ptr->m_moving = true;
-
- d_ptr->m_moveStops.clear();
- d_ptr->m_moveOriginal.clear();
- d_ptr->m_clickPos = e->pos();
- QtGradientStop *stop = d_ptr->stopAt(e->pos());
- if (stop) {
- if (e->modifiers() & Qt::ControlModifier) {
- d_ptr->m_model->selectStop(stop, !d_ptr->m_model->isSelected(stop));
- } else if (e->modifiers() & Qt::ShiftModifier) {
- QtGradientStop *oldCurrent = d_ptr->m_model->currentStop();
- if (oldCurrent) {
- PositionStopMap stops = d_ptr->m_model->stops();
- PositionStopMap::ConstIterator itSt = stops.constFind(oldCurrent->position());
- if (itSt != stops.constEnd()) {
- while (itSt != stops.constFind(stop->position())) {
- d_ptr->m_model->selectStop(itSt.value(), true);
- if (oldCurrent->position() < stop->position())
- ++itSt;
- else
- --itSt;
- }
- }
- }
- d_ptr->m_model->selectStop(stop, true);
- } else {
- if (!d_ptr->m_model->isSelected(stop)) {
- d_ptr->m_model->clearSelection();
- d_ptr->m_model->selectStop(stop, true);
- }
- }
- d_ptr->setupMove(stop, e->pos().x());
- } else {
- d_ptr->m_model->clearSelection();
- d_ptr->m_rubber->setGeometry(QRect(d_ptr->m_clickPos, QSize()));
- d_ptr->m_rubber->show();
- }
- viewport()->update();
-}
-
-void QtGradientStopsWidget::mouseReleaseEvent(QMouseEvent *e)
-{
- if (!d_ptr->m_model)
- return;
-
- if (e->button() != Qt::LeftButton)
- return;
-
- d_ptr->m_moving = false;
- d_ptr->m_rubber->hide();
- d_ptr->m_moveStops.clear();
- d_ptr->m_moveOriginal.clear();
-}
-
-void QtGradientStopsWidget::mouseMoveEvent(QMouseEvent *e)
-{
- typedef QtGradientStopsWidgetPrivate::PositionColorMap PositionColorMap;
- typedef QtGradientStopsModel::PositionStopMap PositionStopMap;
- typedef QtGradientStopsWidgetPrivate::StopPositionMap StopPositionMap;
- if (!d_ptr->m_model)
- return;
-
- if (!(e->buttons() & Qt::LeftButton))
- return;
-
- if (!d_ptr->m_moving)
- return;
-
- if (!d_ptr->m_moveStops.isEmpty()) {
- double maxOffset = 0.0;
- double minOffset = 0.0;
- bool first = true;
- StopPositionMap::ConstIterator itStop = d_ptr->m_moveStops.constBegin();
- while (itStop != d_ptr->m_moveStops.constEnd()) {
- double offset = itStop.value();
-
- if (first) {
- maxOffset = offset;
- minOffset = offset;
- first = false;
- } else {
- if (maxOffset < offset)
- maxOffset = offset;
- else if (minOffset > offset)
- minOffset = offset;
- }
- ++itStop;
- }
-
- double viewportMin = d_ptr->toViewport(-minOffset);
- double viewportMax = d_ptr->toViewport(1.0 - maxOffset);
-
- PositionStopMap newPositions;
-
- int viewportX = e->pos().x() - d_ptr->m_moveOffset;
-
- if (viewportX > viewport()->size().width())
- viewportX = viewport()->size().width();
- else if (viewportX < 0)
- viewportX = 0;
-
- double posX = d_ptr->fromViewport(viewportX);
-
- if (viewportX > viewportMax)
- posX = 1.0 - maxOffset;
- else if (viewportX < viewportMin)
- posX = -minOffset;
-
- itStop = d_ptr->m_moveStops.constBegin();
- while (itStop != d_ptr->m_moveStops.constEnd()) {
- QtGradientStop *stop = itStop.key();
-
- newPositions[posX + itStop.value()] = stop;
-
- ++itStop;
- }
-
- bool forward = true;
- PositionStopMap::ConstIterator itNewPos = newPositions.constBegin();
- if (itNewPos.value()->position() < itNewPos.key())
- forward = false;
-
- itNewPos = forward ? newPositions.constBegin() : newPositions.constEnd();
- while (itNewPos != (forward ? newPositions.constEnd() : newPositions.constBegin())) {
- if (!forward)
- --itNewPos;
- QtGradientStop *stop = itNewPos.value();
- double newPos = itNewPos.key();
- if (newPos > 1)
- newPos = 1;
- else if (newPos < 0)
- newPos = 0;
-
- QtGradientStop *existingStop = d_ptr->m_model->at(newPos);
- if (existingStop && !d_ptr->m_moveStops.contains(existingStop))
- d_ptr->m_model->removeStop(existingStop);
- d_ptr->m_model->moveStop(stop, newPos);
-
- if (forward)
- ++itNewPos;
- }
-
- PositionColorMap::ConstIterator itOld = d_ptr->m_moveOriginal.constBegin();
- while (itOld != d_ptr->m_moveOriginal.constEnd()) {
- double position = itOld.key();
- if (!d_ptr->m_model->at(position))
- d_ptr->m_model->addStop(position, itOld.value());
-
- ++itOld;
- }
-
- } else {
- QRect r(QRect(d_ptr->m_clickPos, e->pos()).normalized());
- r.translate(1, 0);
- d_ptr->m_rubber->setGeometry(r);
- //d_ptr->m_model->clearSelection();
-
- int xv1 = d_ptr->m_clickPos.x();
- int xv2 = e->pos().x();
- if (xv1 > xv2) {
- int temp = xv1;
- xv1 = xv2;
- xv2 = temp;
- }
- int yv1 = d_ptr->m_clickPos.y();
- int yv2 = e->pos().y();
- if (yv1 > yv2) {
- int temp = yv1;
- yv1 = yv2;
- yv2 = temp;
- }
-
- QPoint p1, p2;
-
- if (yv2 < d_ptr->m_handleSize / 2) {
- p1 = QPoint(xv1, yv2);
- p2 = QPoint(xv2, yv2);
- } else if (yv1 > d_ptr->m_handleSize / 2) {
- p1 = QPoint(xv1, yv1);
- p2 = QPoint(xv2, yv1);
- } else {
- p1 = QPoint(xv1, qRound(d_ptr->m_handleSize / 2));
- p2 = QPoint(xv2, qRound(d_ptr->m_handleSize / 2));
- }
-
- QList<QtGradientStop *> beginList = d_ptr->stopsAt(p1);
- QList<QtGradientStop *> endList = d_ptr->stopsAt(p2);
-
- double x1 = d_ptr->fromViewport(xv1);
- double x2 = d_ptr->fromViewport(xv2);
-
- QListIterator<QtGradientStop *> itStop(d_ptr->m_stops);
- while (itStop.hasNext()) {
- QtGradientStop *stop = itStop.next();
- if ((stop->position() >= x1 && stop->position() <= x2) ||
- beginList.contains(stop) || endList.contains(stop))
- d_ptr->m_model->selectStop(stop, true);
- else
- d_ptr->m_model->selectStop(stop, false);
- }
- }
-}
-
-void QtGradientStopsWidget::mouseDoubleClickEvent(QMouseEvent *e)
-{
- if (!d_ptr->m_model)
- return;
-
- if (e->button() != Qt::LeftButton)
- return;
-
- if (d_ptr->m_clickPos != e->pos()) {
- mousePressEvent(e);
- return;
- }
- d_ptr->m_moving = true;
- d_ptr->m_moveStops.clear();
- d_ptr->m_moveOriginal.clear();
-
- QtGradientStop *stop = d_ptr->newStop(e->pos());
-
- if (!stop)
- return;
-
- d_ptr->m_model->clearSelection();
- d_ptr->m_model->selectStop(stop, true);
-
- d_ptr->setupMove(stop, e->pos().x());
-
- viewport()->update();
-}
-
-void QtGradientStopsWidget::keyPressEvent(QKeyEvent *e)
-{
- typedef QtGradientStopsModel::PositionStopMap PositionStopMap;
- if (!d_ptr->m_model)
- return;
-
- if (e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace) {
- d_ptr->m_model->deleteStops();
- } else if (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right ||
- e->key() == Qt::Key_Home || e->key() == Qt::Key_End) {
- PositionStopMap stops = d_ptr->m_model->stops();
- if (stops.isEmpty())
- return;
- QtGradientStop *newCurrent = 0;
- QtGradientStop *current = d_ptr->m_model->currentStop();
- if (!current || e->key() == Qt::Key_Home || e->key() == Qt::Key_End) {
- if (e->key() == Qt::Key_Left || e->key() == Qt::Key_Home)
- newCurrent = stops.constBegin().value();
- else if (e->key() == Qt::Key_Right || e->key() == Qt::Key_End)
- newCurrent = (--stops.constEnd()).value();
- } else {
- PositionStopMap::ConstIterator itStop = stops.constBegin();
- while (itStop.value() != current)
- ++itStop;
- if (e->key() == Qt::Key_Left && itStop != stops.constBegin())
- --itStop;
- else if (e->key() == Qt::Key_Right && itStop != --stops.constEnd())
- ++itStop;
- newCurrent = itStop.value();
- }
- d_ptr->m_model->clearSelection();
- d_ptr->m_model->selectStop(newCurrent, true);
- d_ptr->m_model->setCurrentStop(newCurrent);
- d_ptr->ensureVisible(newCurrent);
- } else if (e->key() == Qt::Key_A) {
- if (e->modifiers() & Qt::ControlModifier)
- d_ptr->m_model->selectAll();
- }
-}
-
-void QtGradientStopsWidget::paintEvent(QPaintEvent *e)
-{
- Q_UNUSED(e)
- if (!d_ptr->m_model)
- return;
-
- QtGradientStopsModel *model = d_ptr->m_model;
-#ifndef QT_NO_DRAGANDDROP
- if (d_ptr->m_dragModel)
- model = d_ptr->m_dragModel;
-#endif
-
- QSize size = viewport()->size();
- int w = size.width();
- double h = size.height() - d_ptr->m_handleSize;
- if (w <= 0)
- return;
-
- QPixmap pix(size);
- QPainter p;
-
- if (d_ptr->m_backgroundCheckered) {
- int pixSize = 20;
- QPixmap pm(2 * pixSize, 2 * pixSize);
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::white);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::white);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black);
-
- p.begin(&pix);
- p.setBrushOrigin((size.width() % pixSize + pixSize) / 2, (size.height() % pixSize + pixSize) / 2);
- p.fillRect(viewport()->rect(), pm);
- p.setBrushOrigin(0, 0);
- } else {
- p.begin(viewport());
- }
-
- double viewBegin = (double)w * horizontalScrollBar()->value() / d_ptr->m_scaleFactor;
-
- int val = horizontalScrollBar()->value();
- int max = horizontalScrollBar()->maximum();
-
- double begin = (double)val / (d_ptr->m_scaleFactor + max);
- double end = (double)(val + d_ptr->m_scaleFactor) / (d_ptr->m_scaleFactor + max);
- double width = end - begin;
-
- if (h > 0) {
- QLinearGradient lg(0, 0, w, 0);
- QMap<qreal, QtGradientStop *> stops = model->stops();
- QMapIterator<qreal, QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *stop = itStop.next().value();
- double pos = stop->position();
- if (pos >= begin && pos <= end) {
- double gradPos = (pos - begin) / width;
- QColor c = stop->color();
- lg.setColorAt(gradPos, c);
- }
- //lg.setColorAt(stop->position(), stop->color());
- }
- lg.setColorAt(0, model->color(begin));
- lg.setColorAt(1, model->color(end));
- QImage img(w, 1, QImage::Format_ARGB32_Premultiplied);
- QPainter p1(&img);
- p1.setCompositionMode(QPainter::CompositionMode_Source);
-
- /*
- if (viewBegin != 0)
- p1.translate(-viewBegin, 0);
- if (d_ptr->m_zoom != 1)
- p1.scale(d_ptr->m_zoom, 1);
- */
- p1.fillRect(0, 0, w, 1, lg);
-
- p.fillRect(QRectF(0, d_ptr->m_handleSize, w, h), QPixmap::fromImage(img));
- }
-
-
- double handleWidth = d_ptr->m_handleSize * d_ptr->m_scaleFactor / (w * (d_ptr->m_scaleFactor + max));
-
- QColor insideColor = QColor::fromRgb(0x20, 0x20, 0x20, 0xFF);
- QColor borderColor = QColor(Qt::white);
- QColor drawColor;
- QColor back1 = QColor(Qt::lightGray);
- QColor back2 = QColor(Qt::darkGray);
- QColor back = QColor::fromRgb((back1.red() + back2.red()) / 2,
- (back1.green() + back2.green()) / 2,
- (back1.blue() + back2.blue()) / 2);
-
- QPen pen;
- p.setRenderHint(QPainter::Antialiasing);
- QListIterator<QtGradientStop *> itStop(d_ptr->m_stops);
- itStop.toBack();
- while (itStop.hasPrevious()) {
- QtGradientStop *stop = itStop.previous();
- double x = stop->position();
- if (x >= begin - handleWidth / 2 && x <= end + handleWidth / 2) {
- double viewX = x * w * (d_ptr->m_scaleFactor + max) / d_ptr->m_scaleFactor - viewBegin;
- p.save();
- QColor c = stop->color();
-#ifndef QT_NO_DRAGANDDROP
- if (stop == d_ptr->m_dragStop)
- c = d_ptr->m_dragColor;
-#endif
- if ((0.3 * c.redF() + 0.59 * c.greenF() + 0.11 * c.blueF()) * c.alphaF() +
- (0.3 * back.redF() + 0.59 * back.greenF() + 0.11 * back.blueF()) * (1.0 - c.alphaF()) < 0.5) {
- drawColor = QColor::fromRgb(0xC0, 0xC0, 0xC0, 0xB0);
- } else {
- drawColor = QColor::fromRgb(0x40, 0x40, 0x40, 0x80);
- }
- QRectF rect(viewX - d_ptr->m_handleSize / 2, 0, d_ptr->m_handleSize, d_ptr->m_handleSize);
- rect.adjust(0.5, 0.5, -0.5, -0.5);
- if (h > 0) {
- pen.setWidthF(1);
- QLinearGradient lg(0, d_ptr->m_handleSize, 0, d_ptr->m_handleSize + h / 2);
- lg.setColorAt(0, drawColor);
- QColor alphaZero = drawColor;
- alphaZero.setAlpha(0);
- lg.setColorAt(1, alphaZero);
- pen.setBrush(lg);
- p.setPen(pen);
- p.drawLine(QPointF(viewX, d_ptr->m_handleSize), QPointF(viewX, d_ptr->m_handleSize + h / 2));
-
- pen.setWidthF(1);
- pen.setBrush(drawColor);
- p.setPen(pen);
- QRectF r1 = rect.adjusted(0.5, 0.5, -0.5, -0.5);
- QRectF r2 = rect.adjusted(1.5, 1.5, -1.5, -1.5);
- QColor inColor = QColor::fromRgb(0x80, 0x80, 0x80, 0x80);
- if (!d_ptr->m_model->isSelected(stop)) {
- p.setBrush(c);
- p.drawEllipse(rect);
- } else {
- pen.setBrush(insideColor);
- pen.setWidthF(2);
- p.setPen(pen);
- p.setBrush(Qt::NoBrush);
- p.drawEllipse(r1);
-
- pen.setBrush(inColor);
- pen.setWidthF(1);
- p.setPen(pen);
- p.setBrush(c);
- p.drawEllipse(r2);
- }
-
- if (d_ptr->m_model->currentStop() == stop) {
- p.setBrush(Qt::NoBrush);
- pen.setWidthF(5);
- pen.setBrush(drawColor);
- int corr = 4;
- if (!d_ptr->m_model->isSelected(stop)) {
- corr = 3;
- pen.setWidthF(7);
- }
- p.setPen(pen);
- p.drawEllipse(rect.adjusted(corr, corr, -corr, -corr));
- }
-
- }
- p.restore();
- }
- }
- if (d_ptr->m_backgroundCheckered) {
- p.end();
- p.begin(viewport());
- p.drawPixmap(0, 0, pix);
- }
- p.end();
-}
-
-void QtGradientStopsWidget::focusInEvent(QFocusEvent *e)
-{
- Q_UNUSED(e)
- viewport()->update();
-}
-
-void QtGradientStopsWidget::focusOutEvent(QFocusEvent *e)
-{
- Q_UNUSED(e)
- viewport()->update();
-}
-
-void QtGradientStopsWidget::contextMenuEvent(QContextMenuEvent *e)
-{
- if (!d_ptr->m_model)
- return;
-
- d_ptr->m_clickPos = e->pos();
-
- QMenu menu(this);
- QAction *newStopAction = new QAction(tr("New Stop"), &menu);
- QAction *deleteAction = new QAction(tr("Delete"), &menu);
- QAction *flipAllAction = new QAction(tr("Flip All"), &menu);
- QAction *selectAllAction = new QAction(tr("Select All"), &menu);
- QAction *zoomInAction = new QAction(tr("Zoom In"), &menu);
- QAction *zoomOutAction = new QAction(tr("Zoom Out"), &menu);
- QAction *zoomAllAction = new QAction(tr("Reset Zoom"), &menu);
- if (d_ptr->m_model->selectedStops().isEmpty() && !d_ptr->m_model->currentStop())
- deleteAction->setEnabled(false);
- if (zoom() <= 1) {
- zoomOutAction->setEnabled(false);
- zoomAllAction->setEnabled(false);
- } else if (zoom() >= 100) {
- zoomInAction->setEnabled(false);
- }
- connect(newStopAction, SIGNAL(triggered()), this, SLOT(slotNewStop()));
- connect(deleteAction, SIGNAL(triggered()), this, SLOT(slotDelete()));
- connect(flipAllAction, SIGNAL(triggered()), this, SLOT(slotFlipAll()));
- connect(selectAllAction, SIGNAL(triggered()), this, SLOT(slotSelectAll()));
- connect(zoomInAction, SIGNAL(triggered()), this, SLOT(slotZoomIn()));
- connect(zoomOutAction, SIGNAL(triggered()), this, SLOT(slotZoomOut()));
- connect(zoomAllAction, SIGNAL(triggered()), this, SLOT(slotResetZoom()));
- menu.addAction(newStopAction);
- menu.addAction(deleteAction);
- menu.addAction(flipAllAction);
- menu.addAction(selectAllAction);
- menu.addSeparator();
- menu.addAction(zoomInAction);
- menu.addAction(zoomOutAction);
- menu.addAction(zoomAllAction);
- menu.exec(e->globalPos());
-}
-
-void QtGradientStopsWidget::wheelEvent(QWheelEvent *e)
-{
- int numDegrees = e->delta() / 8;
- int numSteps = numDegrees / 15;
-
- int shift = numSteps;
- if (shift < 0)
- shift = -shift;
- int pow = 1 << shift;
- //const double c = 0.7071067; // 2 steps per doubled value
- const double c = 0.5946036; // 4 steps pre doubled value
- // in general c = pow(2, 1 / n) / 2; where n is the step
- double factor = pow * c;
-
- double newZoom = zoom();
- if (numSteps < 0)
- newZoom /= factor;
- else
- newZoom *= factor;
- if (newZoom > 100)
- newZoom = 100;
- if (newZoom < 1)
- newZoom = 1;
-
- if (newZoom == zoom())
- return;
-
- setZoom(newZoom);
- emit zoomChanged(zoom());
-}
-
-#ifndef QT_NO_DRAGANDDROP
-void QtGradientStopsWidget::dragEnterEvent(QDragEnterEvent *event)
-{
- const QMimeData *mime = event->mimeData();
- if (!mime->hasColor())
- return;
- event->accept();
- d_ptr->m_dragModel = d_ptr->m_model->clone();
-
- d_ptr->m_dragColor = qvariant_cast<QColor>(mime->colorData());
- update();
-}
-
-void QtGradientStopsWidget::dragMoveEvent(QDragMoveEvent *event)
-{
- QRectF rect = viewport()->rect();
- rect.adjust(0, d_ptr->m_handleSize, 0, 0);
- double x = d_ptr->fromViewport(event->pos().x());
- QtGradientStop *dragStop = d_ptr->stopAt(event->pos());
- if (dragStop) {
- event->accept();
- d_ptr->removeClonedStop();
- d_ptr->changeStop(dragStop->position());
- } else if (rect.contains(event->pos())) {
- event->accept();
- if (d_ptr->m_model->at(x)) {
- d_ptr->removeClonedStop();
- d_ptr->changeStop(x);
- } else {
- d_ptr->restoreChangedStop();
- d_ptr->cloneStop(x);
- }
- } else {
- event->ignore();
- d_ptr->removeClonedStop();
- d_ptr->restoreChangedStop();
- }
-
- update();
-}
-
-void QtGradientStopsWidget::dragLeaveEvent(QDragLeaveEvent *event)
-{
- event->accept();
- d_ptr->clearDrag();
- update();
-}
-
-void QtGradientStopsWidget::dropEvent(QDropEvent *event)
-{
- event->accept();
- if (!d_ptr->m_dragModel)
- return;
-
- if (d_ptr->m_changedStop)
- d_ptr->m_model->changeStop(d_ptr->m_model->at(d_ptr->m_changedStop->position()), d_ptr->m_dragColor);
- else if (d_ptr->m_clonedStop)
- d_ptr->m_model->addStop(d_ptr->m_clonedStop->position(), d_ptr->m_dragColor);
-
- d_ptr->clearDrag();
- update();
-}
-
-void QtGradientStopsWidgetPrivate::clearDrag()
-{
- removeClonedStop();
- restoreChangedStop();
- delete m_dragModel;
- m_dragModel = 0;
-}
-
-void QtGradientStopsWidgetPrivate::removeClonedStop()
-{
- if (!m_clonedStop)
- return;
- m_dragModel->removeStop(m_clonedStop);
- m_clonedStop = 0;
-}
-
-void QtGradientStopsWidgetPrivate::restoreChangedStop()
-{
- if (!m_changedStop)
- return;
- m_dragModel->changeStop(m_changedStop, m_model->at(m_changedStop->position())->color());
- m_changedStop = 0;
- m_dragStop = 0;
-}
-
-void QtGradientStopsWidgetPrivate::changeStop(qreal pos)
-{
- QtGradientStop *stop = m_dragModel->at(pos);
- if (!stop)
- return;
-
- m_dragModel->changeStop(stop, m_dragColor);
- m_changedStop = stop;
- m_dragStop = m_model->at(stop->position());
-}
-
-void QtGradientStopsWidgetPrivate::cloneStop(qreal pos)
-{
- if (m_clonedStop) {
- m_dragModel->moveStop(m_clonedStop, pos);
- return;
- }
- QtGradientStop *stop = m_dragModel->at(pos);
- if (stop)
- return;
-
- m_clonedStop = m_dragModel->addStop(pos, m_dragColor);
-}
-
-#endif
-
-void QtGradientStopsWidget::setZoom(double zoom)
-{
- double z = zoom;
- if (z < 1)
- z = 1;
- else if (z > 100)
- z = 100;
-
- if (d_ptr->m_zoom == z)
- return;
-
- d_ptr->m_zoom = z;
- int oldMax = horizontalScrollBar()->maximum();
- int oldVal = horizontalScrollBar()->value();
- horizontalScrollBar()->setRange(0, qRound(d_ptr->m_scaleFactor * (d_ptr->m_zoom - 1)));
- int newMax = horizontalScrollBar()->maximum();
- double newVal = (oldVal + (double)d_ptr->m_scaleFactor / 2) * (newMax + d_ptr->m_scaleFactor)
- / (oldMax + d_ptr->m_scaleFactor) - (double)d_ptr->m_scaleFactor / 2;
- horizontalScrollBar()->setValue(qRound(newVal));
- viewport()->update();
-}
-
-double QtGradientStopsWidget::zoom() const
-{
- return d_ptr->m_zoom;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/gui/extern/QtGradientEditor/qtgradientstopswidget.h b/src/gui/extern/QtGradientEditor/qtgradientstopswidget.h
deleted file mode 100644
index c9c0b11fe39bd9f16eb594bdfb3d70bfc78b7d3f..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientstopswidget.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTSTOPSWIDGET_H
-#define QTGRADIENTSTOPSWIDGET_H
-
-#include <QtGui/QAbstractScrollArea>
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientStopsModel;
-class QtGradientStopsWidgetPrivate;
-
-class QtGradientStopsWidget : public QAbstractScrollArea
-{
- Q_OBJECT
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
-public:
- QtGradientStopsWidget(QWidget *parent = 0);
- ~QtGradientStopsWidget();
-
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- void setGradientStopsModel(QtGradientStopsModel *model);
-
- void setZoom(double zoom);
- double zoom() const;
-
-signals:
-
- void zoomChanged(double zoom);
-
-protected:
- void paintEvent(QPaintEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
- void keyPressEvent(QKeyEvent *e);
- void focusInEvent(QFocusEvent *e);
- void focusOutEvent(QFocusEvent *e);
- void contextMenuEvent(QContextMenuEvent *e);
- void wheelEvent(QWheelEvent *e);
-#ifndef QT_NO_DRAGANDDROP
- void dragEnterEvent(QDragEnterEvent *event);
- void dragMoveEvent(QDragMoveEvent *event);
- void dragLeaveEvent(QDragLeaveEvent *event);
- void dropEvent(QDropEvent *event);
-#endif
-
-private:
- QtGradientStopsWidgetPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientStopsWidget)
- Q_DISABLE_COPY(QtGradientStopsWidget)
- Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotStopMoved(QtGradientStop *stop, qreal newPos))
- Q_PRIVATE_SLOT(d_func(), void slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2))
- Q_PRIVATE_SLOT(d_func(), void slotStopChanged(QtGradientStop *stop, const QColor &newColor))
- Q_PRIVATE_SLOT(d_func(), void slotStopSelected(QtGradientStop *stop, bool selected))
- Q_PRIVATE_SLOT(d_func(), void slotCurrentStopChanged(QtGradientStop *stop))
- Q_PRIVATE_SLOT(d_func(), void slotNewStop())
- Q_PRIVATE_SLOT(d_func(), void slotDelete())
- Q_PRIVATE_SLOT(d_func(), void slotFlipAll())
- Q_PRIVATE_SLOT(d_func(), void slotSelectAll())
- Q_PRIVATE_SLOT(d_func(), void slotZoomIn())
- Q_PRIVATE_SLOT(d_func(), void slotZoomOut())
- Q_PRIVATE_SLOT(d_func(), void slotResetZoom())
-};
-
-#include "qtgradientstopsmodel.h"
-#include <QRubberBand>
-
-class QtGradientStopsWidgetPrivate
-{
- QtGradientStopsWidget *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientStopsWidget)
-public:
- typedef QMap<qreal, QColor> PositionColorMap;
- typedef QMap<QtGradientStop *, qreal> StopPositionMap;
-
- void slotStopAdded(QtGradientStop *stop);
- void slotStopRemoved(QtGradientStop *stop);
- void slotStopMoved(QtGradientStop *stop, qreal newPos);
- void slotStopsSwapped(QtGradientStop *stop1, QtGradientStop *stop2);
- void slotStopChanged(QtGradientStop *stop, const QColor &newColor);
- void slotStopSelected(QtGradientStop *stop, bool selected);
- void slotCurrentStopChanged(QtGradientStop *stop);
- void slotNewStop();
- void slotDelete();
- void slotFlipAll();
- void slotSelectAll();
- void slotZoomIn();
- void slotZoomOut();
- void slotResetZoom();
-
- double fromViewport(int x) const;
- double toViewport(double x) const;
- QtGradientStop *stopAt(const QPoint &viewportPos) const;
- QList<QtGradientStop *> stopsAt(const QPoint &viewportPos) const;
- void setupMove(QtGradientStop *stop, int x);
- void ensureVisible(double x); // x = stop position
- void ensureVisible(QtGradientStop *stop);
- QtGradientStop *newStop(const QPoint &viewportPos);
-
- bool m_backgroundCheckered;
- QtGradientStopsModel *m_model;
- double m_handleSize;
- int m_scaleFactor;
- double m_zoom;
-
-#ifndef QT_NO_DRAGANDDROP
- QtGradientStop *m_dragStop;
- QtGradientStop *m_changedStop;
- QtGradientStop *m_clonedStop;
- QtGradientStopsModel *m_dragModel;
- QColor m_dragColor;
- void clearDrag();
- void removeClonedStop();
- void restoreChangedStop();
- void changeStop(qreal pos);
- void cloneStop(qreal pos);
-#endif
-
- QRubberBand *m_rubber;
- QPoint m_clickPos;
-
- QList<QtGradientStop *> m_stops;
-
- bool m_moving;
- int m_moveOffset;
- StopPositionMap m_moveStops;
-
- PositionColorMap m_moveOriginal;
-};
-
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientutils.cpp b/src/gui/extern/QtGradientEditor/qtgradientutils.cpp
deleted file mode 100644
index dd36f87c80ad3784563b76390bb86777e0257e23..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientutils.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientutils.h"
-#include "qtgradientmanager.h"
-#include <QtGui/QLinearGradient>
-#include <QtGui/QRadialGradient>
-#include <QtGui/QConicalGradient>
-#include <QtXml/QDomDocument>
-#include <QtCore/QDebug>
-
-QT_BEGIN_NAMESPACE
-
-static QString gradientTypeToString(QGradient::Type type)
-{
- if (type == QGradient::LinearGradient)
- return QLatin1String("LinearGradient");
- if (type == QGradient::RadialGradient)
- return QLatin1String("RadialGradient");
- if (type == QGradient::ConicalGradient)
- return QLatin1String("ConicalGradient");
- return QLatin1String("NoGradient");
-}
-
-static QGradient::Type stringToGradientType(const QString &name)
-{
- if (name == QLatin1String("LinearGradient"))
- return QGradient::LinearGradient;
- if (name == QLatin1String("RadialGradient"))
- return QGradient::RadialGradient;
- if (name == QLatin1String("ConicalGradient"))
- return QGradient::ConicalGradient;
- return QGradient::NoGradient;
-}
-
-static QString gradientSpreadToString(QGradient::Spread spread)
-{
- if (spread == QGradient::PadSpread)
- return QLatin1String("PadSpread");
- if (spread == QGradient::RepeatSpread)
- return QLatin1String("RepeatSpread");
- if (spread == QGradient::ReflectSpread)
- return QLatin1String("ReflectSpread");
- return QLatin1String("PadSpread");
-}
-
-static QGradient::Spread stringToGradientSpread(const QString &name)
-{
- if (name == QLatin1String("PadSpread"))
- return QGradient::PadSpread;
- if (name == QLatin1String("RepeatSpread"))
- return QGradient::RepeatSpread;
- if (name == QLatin1String("ReflectSpread"))
- return QGradient::ReflectSpread;
- return QGradient::PadSpread;
-}
-
-static QString gradientCoordinateModeToString(QGradient::CoordinateMode mode)
-{
- if (mode == QGradient::LogicalMode)
- return QLatin1String("LogicalMode");
- if (mode == QGradient::StretchToDeviceMode)
- return QLatin1String("StretchToDeviceMode");
- if (mode == QGradient::ObjectBoundingMode)
- return QLatin1String("ObjectBoundingMode");
- return QLatin1String("StretchToDeviceMode");
-}
-
-static QGradient::CoordinateMode stringToGradientCoordinateMode(const QString &name)
-{
- if (name == QLatin1String("LogicalMode"))
- return QGradient::LogicalMode;
- if (name == QLatin1String("StretchToDeviceMode"))
- return QGradient::StretchToDeviceMode;
- if (name == QLatin1String("ObjectBoundingMode"))
- return QGradient::ObjectBoundingMode;
- return QGradient::StretchToDeviceMode;
-}
-
-static QDomElement saveColor(QDomDocument &doc, const QColor &color)
-{
- QDomElement colorElem = doc.createElement(QLatin1String("colorData"));
-
- colorElem.setAttribute(QLatin1String("r"), QString::number(color.red()));
- colorElem.setAttribute(QLatin1String("g"), QString::number(color.green()));
- colorElem.setAttribute(QLatin1String("b"), QString::number(color.blue()));
- colorElem.setAttribute(QLatin1String("a"), QString::number(color.alpha()));
-
- return colorElem;
-}
-
-static QDomElement saveGradientStop(QDomDocument &doc, const QGradientStop &stop)
-{
- QDomElement stopElem = doc.createElement(QLatin1String("stopData"));
-
- stopElem.setAttribute(QLatin1String("position"), QString::number(stop.first));
-
- const QDomElement colorElem = saveColor(doc, stop.second);
- stopElem.appendChild(colorElem);
-
- return stopElem;
-}
-
-static QDomElement saveGradient(QDomDocument &doc, const QGradient &gradient)
-{
- QDomElement gradElem = doc.createElement(QLatin1String("gradientData"));
-
- const QGradient::Type type = gradient.type();
- gradElem.setAttribute(QLatin1String("type"), gradientTypeToString(type));
- gradElem.setAttribute(QLatin1String("spread"), gradientSpreadToString(gradient.spread()));
- gradElem.setAttribute(QLatin1String("coordinateMode"), gradientCoordinateModeToString(gradient.coordinateMode()));
-
- QGradientStops stops = gradient.stops();
- QVectorIterator<QGradientStop > it(stops);
- while (it.hasNext())
- gradElem.appendChild(saveGradientStop(doc, it.next()));
-
- if (type == QGradient::LinearGradient) {
- const QLinearGradient &g = *static_cast<const QLinearGradient *>(&gradient);
- gradElem.setAttribute(QLatin1String("startX"), QString::number(g.start().x()));
- gradElem.setAttribute(QLatin1String("startY"), QString::number(g.start().y()));
- gradElem.setAttribute(QLatin1String("endX"), QString::number(g.finalStop().x()));
- gradElem.setAttribute(QLatin1String("endY"), QString::number(g.finalStop().y()));
- } else if (type == QGradient::RadialGradient) {
- const QRadialGradient &g = *static_cast<const QRadialGradient *>(&gradient);
- gradElem.setAttribute(QLatin1String("centerX"), QString::number(g.center().x()));
- gradElem.setAttribute(QLatin1String("centerY"), QString::number(g.center().y()));
- gradElem.setAttribute(QLatin1String("focalX"), QString::number(g.focalPoint().x()));
- gradElem.setAttribute(QLatin1String("focalY"), QString::number(g.focalPoint().y()));
- gradElem.setAttribute(QLatin1String("radius"), QString::number(g.radius()));
- } else if (type == QGradient::ConicalGradient) {
- const QConicalGradient &g = *static_cast<const QConicalGradient*>(&gradient);
- gradElem.setAttribute(QLatin1String("centerX"), QString::number(g.center().x()));
- gradElem.setAttribute(QLatin1String("centerY"), QString::number(g.center().y()));
- gradElem.setAttribute(QLatin1String("angle"), QString::number(g.angle()));
- }
-
- return gradElem;
-}
-
-static QColor loadColor(const QDomElement &elem)
-{
- if (elem.tagName() != QLatin1String("colorData"))
- return QColor();
-
- return QColor(elem.attribute(QLatin1String("r")).toInt(),
- elem.attribute(QLatin1String("g")).toInt(),
- elem.attribute(QLatin1String("b")).toInt(),
- elem.attribute(QLatin1String("a")).toInt());
-}
-
-static QGradientStop loadGradientStop(const QDomElement &elem)
-{
- if (elem.tagName() != QLatin1String("stopData"))
- return QGradientStop();
-
- const qreal pos = static_cast<qreal>(elem.attribute(QLatin1String("position")).toDouble());
- return qMakePair(pos, loadColor(elem.firstChild().toElement()));
-}
-
-static QGradient loadGradient(const QDomElement &elem)
-{
- if (elem.tagName() != QLatin1String("gradientData"))
- return QLinearGradient();
-
- const QGradient::Type type = stringToGradientType(elem.attribute(QLatin1String("type")));
- const QGradient::Spread spread = stringToGradientSpread(elem.attribute(QLatin1String("spread")));
- const QGradient::CoordinateMode mode = stringToGradientCoordinateMode(elem.attribute(QLatin1String("coordinateMode")));
-
- QGradient gradient = QLinearGradient();
-
- if (type == QGradient::LinearGradient) {
- QLinearGradient g;
- g.setStart(elem.attribute(QLatin1String("startX")).toDouble(), elem.attribute(QLatin1String("startY")).toDouble());
- g.setFinalStop(elem.attribute(QLatin1String("endX")).toDouble(), elem.attribute(QLatin1String("endY")).toDouble());
- gradient = g;
- } else if (type == QGradient::RadialGradient) {
- QRadialGradient g;
- g.setCenter(elem.attribute(QLatin1String("centerX")).toDouble(), elem.attribute(QLatin1String("centerY")).toDouble());
- g.setFocalPoint(elem.attribute(QLatin1String("focalX")).toDouble(), elem.attribute(QLatin1String("focalY")).toDouble());
- g.setRadius(elem.attribute(QLatin1String("radius")).toDouble());
- gradient = g;
- } else if (type == QGradient::ConicalGradient) {
- QConicalGradient g;
- g.setCenter(elem.attribute(QLatin1String("centerX")).toDouble(), elem.attribute(QLatin1String("centerY")).toDouble());
- g.setAngle(elem.attribute(QLatin1String("angle")).toDouble());
- gradient = g;
- }
-
- QDomElement stopElem = elem.firstChildElement();
- while (!stopElem.isNull()) {
- QGradientStop stop = loadGradientStop(stopElem);
-
- gradient.setColorAt(stop.first, stop.second);
-
- stopElem = stopElem.nextSiblingElement();
- }
-
- gradient.setSpread(spread);
- gradient.setCoordinateMode(mode);
-
- return gradient;
-}
-
-QString QtGradientUtils::saveState(const QtGradientManager *manager)
-{
- QDomDocument doc;
-
- QDomElement rootElem = doc.createElement(QLatin1String("gradients"));
-
- QMap<QString, QGradient> grads = manager->gradients();
- QMapIterator<QString, QGradient> itGrad(grads);
- while (itGrad.hasNext()) {
- itGrad.next();
- QDomElement idElem = doc.createElement(QLatin1String("gradient"));
- idElem.setAttribute(QLatin1String("name"), itGrad.key());
- QDomElement gradElem = saveGradient(doc, itGrad.value());
- idElem.appendChild(gradElem);
-
- rootElem.appendChild(idElem);
- }
-
- doc.appendChild(rootElem);
-
- return doc.toString();
-}
-
-void QtGradientUtils::restoreState(QtGradientManager *manager, const QString &state)
-{
- manager->clear();
-
- QDomDocument doc;
- doc.setContent(state);
-
- QDomElement rootElem = doc.documentElement();
-
- QDomElement gradElem = rootElem.firstChildElement();
- while (!gradElem.isNull()) {
- const QString name = gradElem.attribute(QLatin1String("name"));
- const QGradient gradient = loadGradient(gradElem.firstChildElement());
-
- manager->addGradient(name, gradient);
- gradElem = gradElem.nextSiblingElement();
- }
-}
-
-QPixmap QtGradientUtils::gradientPixmap(const QGradient &gradient, const QSize &size, bool checkeredBackground)
-{
- QImage image(size, QImage::Format_ARGB32);
- QPainter p(&image);
- p.setCompositionMode(QPainter::CompositionMode_Source);
-
- if (checkeredBackground) {
- int pixSize = 20;
- QPixmap pm(2 * pixSize, 2 * pixSize);
-
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::lightGray);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::lightGray);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::darkGray);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::darkGray);
-
- p.setBrushOrigin((size.width() % pixSize + pixSize) / 2, (size.height() % pixSize + pixSize) / 2);
- p.fillRect(0, 0, size.width(), size.height(), pm);
- p.setBrushOrigin(0, 0);
- p.setCompositionMode(QPainter::CompositionMode_SourceOver);
- }
-
- const qreal scaleFactor = 0.999999;
- p.scale(scaleFactor, scaleFactor);
- QGradient grad = gradient;
- grad.setCoordinateMode(QGradient::StretchToDeviceMode);
- p.fillRect(QRect(0, 0, size.width(), size.height()), grad);
- p.drawRect(QRect(0, 0, size.width() - 1, size.height() - 1));
-
- return QPixmap::fromImage(image);
-}
-
-static QString styleSheetFillName(const QGradient &gradient)
-{
- QString result;
-
- switch (gradient.type()) {
- case QGradient::LinearGradient:
- result += QLatin1String("qlineargradient");
- break;
- case QGradient::RadialGradient:
- result += QLatin1String("qradialgradient");
- break;
- case QGradient::ConicalGradient:
- result += QLatin1String("qconicalgradient");
- break;
- default:
- qWarning() << "QtGradientUtils::styleSheetFillName(): gradient type" << gradient.type() << "not supported!";
- break;
- }
-
- return result;
-}
-
-static QStringList styleSheetParameters(const QGradient &gradient)
-{
- QStringList result;
-
- if (gradient.type() != QGradient::ConicalGradient) {
- QString spread;
- switch (gradient.spread()) {
- case QGradient::PadSpread:
- spread = QLatin1String("pad");
- break;
- case QGradient::ReflectSpread:
- spread = QLatin1String("reflect");
- break;
- case QGradient::RepeatSpread:
- spread = QLatin1String("repeat");
- break;
- default:
- qWarning() << "QtGradientUtils::styleSheetParameters(): gradient spread" << gradient.spread() << "not supported!";
- break;
- }
- result << QLatin1String("spread:") + spread;
- }
-
- switch (gradient.type()) {
- case QGradient::LinearGradient: {
- const QLinearGradient *linearGradient = static_cast<const QLinearGradient*>(&gradient);
- result << QLatin1String("x1:") + QString::number(linearGradient->start().x())
- << QLatin1String("y1:") + QString::number(linearGradient->start().y())
- << QLatin1String("x2:") + QString::number(linearGradient->finalStop().x())
- << QLatin1String("y2:") + QString::number(linearGradient->finalStop().y());
- break;
- }
- case QGradient::RadialGradient: {
- const QRadialGradient *radialGradient = static_cast<const QRadialGradient*>(&gradient);
- result << QLatin1String("cx:") + QString::number(radialGradient->center().x())
- << QLatin1String("cy:") + QString::number(radialGradient->center().y())
- << QLatin1String("radius:") + QString::number(radialGradient->radius())
- << QLatin1String("fx:") + QString::number(radialGradient->focalPoint().x())
- << QLatin1String("fy:") + QString::number(radialGradient->focalPoint().y());
- break;
- }
- case QGradient::ConicalGradient: {
- const QConicalGradient *conicalGradient = static_cast<const QConicalGradient*>(&gradient);
- result << QLatin1String("cx:") + QString::number(conicalGradient->center().x())
- << QLatin1String("cy:") + QString::number(conicalGradient->center().y())
- << QLatin1String("angle:") + QString::number(conicalGradient->angle());
- break;
- }
- default:
- qWarning() << "QtGradientUtils::styleSheetParameters(): gradient type" << gradient.type() << "not supported!";
- break;
- }
-
- return result;
-}
-
-static QStringList styleSheetStops(const QGradient &gradient)
-{
- QStringList result;
- foreach (QGradientStop stop, gradient.stops()) {
- const QColor color = stop.second;
-
- const QString stopDescription = QLatin1String("stop:") + QString::number(stop.first) + QLatin1String(" rgba(")
- + QString::number(color.red()) + QLatin1String(", ")
- + QString::number(color.green()) + QLatin1String(", ")
- + QString::number(color.blue()) + QLatin1String(", ")
- + QString::number(color.alpha()) + QLatin1Char(')');
- result << stopDescription;
- }
-
- return result;
-}
-
-QString QtGradientUtils::styleSheetCode(const QGradient &gradient)
-{
- QStringList gradientParameters;
- gradientParameters << styleSheetParameters(gradient) << styleSheetStops(gradient);
-
- return styleSheetFillName(gradient) + QLatin1Char('(') + gradientParameters.join(QLatin1String(", ")) + QLatin1Char(')');
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientutils.h b/src/gui/extern/QtGradientEditor/qtgradientutils.h
deleted file mode 100644
index 02e52748e4005f511e9de47a7b12e0bae34536fe..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientutils.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRADIENTUTILS_H
-#define GRADIENTUTILS_H
-
-#include <QtGui/QGradient>
-#include <QtGui/QPainter>
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientManager;
-
-class QtGradientUtils
-{
-public:
- static QString styleSheetCode(const QGradient &gradient);
- // utils methods, they could be outside of this class
- static QString saveState(const QtGradientManager *manager);
- static void restoreState(QtGradientManager *manager, const QString &state);
-
- static QPixmap gradientPixmap(const QGradient &gradient, const QSize &size = QSize(64, 64), bool checkeredBackground = false);
-
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientview.cpp b/src/gui/extern/QtGradientEditor/qtgradientview.cpp
deleted file mode 100644
index d4d245b953ee1555402bd1e3a04a134ba3ad03ca..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientview.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientview.h"
-#include "qtgradientmanager.h"
-#include "qtgradientdialog.h"
-#include "qtgradientutils.h"
-#include <QtGui/QPainter>
-#include <QtGui/QMessageBox>
-#include <QtGui/QClipboard>
-
-QT_BEGIN_NAMESPACE
-
-void QtGradientView::slotGradientAdded(const QString &id, const QGradient &gradient)
-{
- QListWidgetItem *item = new QListWidgetItem(QtGradientUtils::gradientPixmap(gradient), id, m_ui.listWidget);
- item->setToolTip(id);
- item->setSizeHint(QSize(72, 84));
- item->setFlags(item->flags() | Qt::ItemIsEditable);
-
- m_idToItem[id] = item;
- m_itemToId[item] = id;
-}
-
-void QtGradientView::slotGradientRenamed(const QString &id, const QString &newId)
-{
- if (!m_idToItem.contains(id))
- return;
-
- QListWidgetItem *item = m_idToItem.value(id);
- item->setText(newId);
- item->setToolTip(newId);
- m_itemToId[item] = newId;
- m_idToItem.remove(id);
- m_idToItem[newId] = item;
-}
-
-void QtGradientView::slotGradientChanged(const QString &id, const QGradient &newGradient)
-{
- if (!m_idToItem.contains(id))
- return;
-
- QListWidgetItem *item = m_idToItem.value(id);
- item->setIcon(QtGradientUtils::gradientPixmap(newGradient));
-}
-
-void QtGradientView::slotGradientRemoved(const QString &id)
-{
- if (!m_idToItem.contains(id))
- return;
-
- QListWidgetItem *item = m_idToItem.value(id);
- delete item;
- m_itemToId.remove(item);
- m_idToItem.remove(id);
-}
-
-void QtGradientView::slotNewGradient()
-{
- bool ok;
- QListWidgetItem *item = m_ui.listWidget->currentItem();
- QGradient grad = QLinearGradient();
- if (item)
- grad = m_manager->gradients().value(m_itemToId.value(item));
- QGradient gradient = QtGradientDialog::getGradient(&ok, grad, this);
- if (!ok)
- return;
-
- QString id = m_manager->addGradient(tr("Grad"), gradient);
- m_ui.listWidget->setCurrentItem(m_idToItem.value(id));
-}
-
-void QtGradientView::slotEditGradient()
-{
- bool ok;
- QListWidgetItem *item = m_ui.listWidget->currentItem();
- if (!item)
- return;
-
- const QString id = m_itemToId.value(item);
- QGradient grad = m_manager->gradients().value(id);
- QGradient gradient = QtGradientDialog::getGradient(&ok, grad, this);
- if (!ok)
- return;
-
- m_manager->changeGradient(id, gradient);
-}
-
-void QtGradientView::slotRemoveGradient()
-{
- QListWidgetItem *item = m_ui.listWidget->currentItem();
- if (!item)
- return;
-
- if (QMessageBox::question(this, tr("Remove Gradient"),
- tr("Are you sure you want to remove the selected gradient?"),
- QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Yes)
- return;
-
- const QString id = m_itemToId.value(item);
- m_manager->removeGradient(id);
-}
-
-void QtGradientView::slotRenameGradient()
-{
- QListWidgetItem *item = m_ui.listWidget->currentItem();
- if (!item)
- return;
-
- m_ui.listWidget->editItem(item);
-}
-
-void QtGradientView::slotRenameGradient(QListWidgetItem *item)
-{
- if (!item)
- return;
-
- const QString id = m_itemToId.value(item);
- m_manager->renameGradient(id, item->text());
-}
-
-void QtGradientView::slotCurrentItemChanged(QListWidgetItem *item)
-{
- m_editAction->setEnabled(item);
- m_renameAction->setEnabled(item);
- m_removeAction->setEnabled(item);
- emit currentGradientChanged(m_itemToId.value(item));
-}
-
-void QtGradientView::slotGradientActivated(QListWidgetItem *item)
-{
- const QString id = m_itemToId.value(item);
- if (!id.isEmpty())
- emit gradientActivated(id);
-}
-
-QtGradientView::QtGradientView(QWidget *parent)
- : QWidget(parent)
-{
- m_manager = 0;
-
- m_ui.setupUi(this);
-
- m_ui.listWidget->setViewMode(QListView::IconMode);
- m_ui.listWidget->setMovement(QListView::Static);
- m_ui.listWidget->setTextElideMode(Qt::ElideRight);
- m_ui.listWidget->setResizeMode(QListWidget::Adjust);
- m_ui.listWidget->setIconSize(QSize(64, 64));
- m_ui.listWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
-
- QPalette pal = m_ui.listWidget->viewport()->palette();
- int pixSize = 18;
- QPixmap pm(2 * pixSize, 2 * pixSize);
-
- QColor c1 = palette().color(QPalette::Midlight);
- QColor c2 = palette().color(QPalette::Dark);
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, c1);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, c1);
- pmp.fillRect(0, pixSize, pixSize, pixSize, c2);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, c2);
-
- pal.setBrush(QPalette::Base, QBrush(pm));
- m_ui.listWidget->viewport()->setPalette(pal);
-
- connect(m_ui.listWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotGradientActivated(QListWidgetItem *)));
- connect(m_ui.listWidget, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(slotRenameGradient(QListWidgetItem *)));
- connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(slotCurrentItemChanged(QListWidgetItem *)));
-
- m_newAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/plus.png")), tr("New..."), this);
- m_editAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/edit.png")), tr("Edit..."), this);
- m_renameAction = new QAction(tr("Rename"), this);
- m_removeAction = new QAction(QIcon(QLatin1String(":/trolltech/qtgradienteditor/images/minus.png")), tr("Remove"), this);
-
- connect(m_newAction, SIGNAL(triggered()), this, SLOT(slotNewGradient()));
- connect(m_editAction, SIGNAL(triggered()), this, SLOT(slotEditGradient()));
- connect(m_removeAction, SIGNAL(triggered()), this, SLOT(slotRemoveGradient()));
- connect(m_renameAction, SIGNAL(triggered()), this, SLOT(slotRenameGradient()));
-
- m_ui.listWidget->addAction(m_newAction);
- m_ui.listWidget->addAction(m_editAction);
- m_ui.listWidget->addAction(m_renameAction);
- m_ui.listWidget->addAction(m_removeAction);
-
- m_ui.newButton->setDefaultAction(m_newAction);
- m_ui.editButton->setDefaultAction(m_editAction);
- m_ui.renameButton->setDefaultAction(m_renameAction);
- m_ui.removeButton->setDefaultAction(m_removeAction);
-
- m_ui.listWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
-}
-
-void QtGradientView::setGradientManager(QtGradientManager *manager)
-{
- if (m_manager == manager)
- return;
-
- if (m_manager) {
- disconnect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
- this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
- disconnect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
- this, SLOT(slotGradientRenamed(const QString &, const QString &)));
- disconnect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
- this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
- disconnect(m_manager, SIGNAL(gradientRemoved(const QString &)),
- this, SLOT(slotGradientRemoved(const QString &)));
-
- m_ui.listWidget->clear();
- m_idToItem.clear();
- m_itemToId.clear();
- }
-
- m_manager = manager;
-
- if (!m_manager)
- return;
-
- QMap<QString, QGradient> gradients = m_manager->gradients();
- QMapIterator<QString, QGradient> itGrad(gradients);
- while (itGrad.hasNext()) {
- itGrad.next();
- slotGradientAdded(itGrad.key(), itGrad.value());
- }
-
- connect(m_manager, SIGNAL(gradientAdded(const QString &, const QGradient &)),
- this, SLOT(slotGradientAdded(const QString &, const QGradient &)));
- connect(m_manager, SIGNAL(gradientRenamed(const QString &, const QString &)),
- this, SLOT(slotGradientRenamed(const QString &, const QString &)));
- connect(m_manager, SIGNAL(gradientChanged(const QString &, const QGradient &)),
- this, SLOT(slotGradientChanged(const QString &, const QGradient &)));
- connect(m_manager, SIGNAL(gradientRemoved(const QString &)),
- this, SLOT(slotGradientRemoved(const QString &)));
-}
-
-QtGradientManager *QtGradientView::gradientManager() const
-{
- return m_manager;
-}
-
-void QtGradientView::setCurrentGradient(const QString &id)
-{
- QListWidgetItem *item = m_idToItem.value(id);
- if (!item)
- return;
-
- m_ui.listWidget->setCurrentItem(item);
-}
-
-QString QtGradientView::currentGradient() const
-{
- return m_itemToId.value(m_ui.listWidget->currentItem());
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientview.h b/src/gui/extern/QtGradientEditor/qtgradientview.h
deleted file mode 100644
index a72c7348703fef4eeb59499bea11fcee786e13c7..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientview.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRADIENTVIEW_H
-#define GRADIENTVIEW_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QMap>
-#include "ui_qtgradientview.h"
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientManager;
-class QListViewItem;
-class QAction;
-
-class QtGradientView : public QWidget
-{
- Q_OBJECT
-public:
- QtGradientView(QWidget *parent = 0);
-
- void setGradientManager(QtGradientManager *manager);
- QtGradientManager *gradientManager() const;
-
- void setCurrentGradient(const QString &id);
- QString currentGradient() const;
-
-signals:
- void currentGradientChanged(const QString &id);
- void gradientActivated(const QString &id);
-
-private slots:
- void slotGradientAdded(const QString &id, const QGradient &gradient);
- void slotGradientRenamed(const QString &id, const QString &newId);
- void slotGradientChanged(const QString &id, const QGradient &newGradient);
- void slotGradientRemoved(const QString &id);
- void slotNewGradient();
- void slotEditGradient();
- void slotRemoveGradient();
- void slotRenameGradient();
- void slotRenameGradient(QListWidgetItem *item);
- void slotCurrentItemChanged(QListWidgetItem *item);
- void slotGradientActivated(QListWidgetItem *item);
-
-private:
- QMap<QString, QListWidgetItem *> m_idToItem;
- QMap<QListWidgetItem *, QString> m_itemToId;
-
- QAction *m_newAction;
- QAction *m_editAction;
- QAction *m_renameAction;
- QAction *m_removeAction;
-
- QtGradientManager *m_manager;
- Ui::QtGradientView m_ui;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/extern/QtGradientEditor/qtgradientview.ui b/src/gui/extern/QtGradientEditor/qtgradientview.ui
deleted file mode 100644
index af7267ea2b0be7220a95caa6fdd3b450ff3555ea..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientview.ui
+++ /dev/null
@@ -1,135 +0,0 @@
-<ui version="4.0" >
- <class>QtGradientView</class>
- <widget class="QWidget" name="QtGradientView" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>484</width>
- <height>228</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Gradient View</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QToolButton" name="newButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>New...</string>
- </property>
- <property name="toolButtonStyle" >
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <property name="autoRaise" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="editButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Edit...</string>
- </property>
- <property name="toolButtonStyle" >
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <property name="autoRaise" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="renameButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Rename</string>
- </property>
- <property name="toolButtonStyle" >
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <property name="autoRaise" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Remove</string>
- </property>
- <property name="toolButtonStyle" >
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <property name="autoRaise" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>71</width>
- <height>26</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QListWidget" name="listWidget" />
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>listWidget</tabstop>
- <tabstop>newButton</tabstop>
- <tabstop>editButton</tabstop>
- <tabstop>renameButton</tabstop>
- <tabstop>removeButton</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.cpp b/src/gui/extern/QtGradientEditor/qtgradientviewdialog.cpp
deleted file mode 100644
index 38b583b6d422e0cb366447588d232142183ca41f..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientviewdialog.h"
-#include "qtgradientmanager.h"
-#include <QtGui/QPushButton>
-
-QT_BEGIN_NAMESPACE
-
-QtGradientViewDialog::QtGradientViewDialog(QWidget *parent)
- : QDialog(parent)
-{
- m_ui.setupUi(this);
- m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- connect(m_ui.gradientView, SIGNAL(currentGradientChanged(const QString &)),
- this, SLOT(slotGradientSelected(const QString &)));
- connect(m_ui.gradientView, SIGNAL(gradientActivated(const QString &)),
- this, SLOT(slotGradientActivated(const QString &)));
-}
-
-void QtGradientViewDialog::setGradientManager(QtGradientManager *manager)
-{
- m_ui.gradientView->setGradientManager(manager);
-}
-
-QGradient QtGradientViewDialog::getGradient(bool *ok, QtGradientManager *manager, QWidget *parent, const QString &caption)
-{
- QtGradientViewDialog dlg(parent);
- dlg.setGradientManager(manager);
- dlg.setWindowTitle(caption);
- QGradient grad = QLinearGradient();
- const int res = dlg.exec();
- if (res == QDialog::Accepted)
- grad = dlg.m_ui.gradientView->gradientManager()->gradients().value(dlg.m_ui.gradientView->currentGradient());
- if (ok)
- *ok = res == QDialog::Accepted;
- return grad;
-}
-
-void QtGradientViewDialog::slotGradientSelected(const QString &id)
-{
- m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!id.isEmpty());
-}
-
-void QtGradientViewDialog::slotGradientActivated(const QString &id)
-{
- Q_UNUSED(id)
- accept();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.h b/src/gui/extern/QtGradientEditor/qtgradientviewdialog.h
deleted file mode 100644
index ad901b9c2f9402eebd3c6279add383d0fd8653d2..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRADIENTVIEWDIALOG_H
-#define GRADIENTVIEWDIALOG_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QMap>
-#include "ui_qtgradientviewdialog.h"
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientManager;
-
-class QtGradientViewDialog : public QDialog
-{
- Q_OBJECT
-public:
- QtGradientViewDialog(QWidget *parent = 0);
-
- void setGradientManager(QtGradientManager *manager);
- QtGradientManager *gradientManager() const;
-
- static QGradient getGradient(bool *ok, QtGradientManager *manager, QWidget *parent = 0, const QString &caption = tr("Select Gradient", 0));
-
-private slots:
- void slotGradientSelected(const QString &id);
- void slotGradientActivated(const QString &id);
-
-private:
- Ui::QtGradientViewDialog m_ui;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.ui b/src/gui/extern/QtGradientEditor/qtgradientviewdialog.ui
deleted file mode 100644
index d2119987eafeb3d69412d142296ab163445fa467..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientviewdialog.ui
+++ /dev/null
@@ -1,121 +0,0 @@
-<ui version="4.0" >
- <comment>*********************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-*********************************************************************</comment>
- <class>QtGradientViewDialog</class>
- <widget class="QDialog" name="QtGradientViewDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>178</width>
- <height>72</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Select Gradient</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QtGradientView" name="gradientView" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>QtGradientView</class>
- <extends>QFrame</extends>
- <header>qtgradientview.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>QtGradientViewDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>72</x>
- <y>224</y>
- </hint>
- <hint type="destinationlabel" >
- <x>21</x>
- <y>243</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>QtGradientViewDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>168</x>
- <y>233</y>
- </hint>
- <hint type="destinationlabel" >
- <x>152</x>
- <y>251</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/src/gui/extern/QtGradientEditor/qtgradientwidget.cpp b/src/gui/extern/QtGradientEditor/qtgradientwidget.cpp
deleted file mode 100644
index 447418ceaee5e00156720c42768f21918f28c67a..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientwidget.cpp
+++ /dev/null
@@ -1,819 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtgradientwidget.h"
-#include <QtCore/QMap>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
-#include <QtGui/QMouseEvent>
-
-#define _USE_MATH_DEFINES
-
-
-#include "math.h"
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientWidgetPrivate
-{
- QtGradientWidget *q_ptr;
- Q_DECLARE_PUBLIC(QtGradientWidget)
-public:
- QPointF fromViewport(const QPointF &point) const;
- QPointF toViewport(const QPointF &point) const;
-// void setupDrag(QtGradientStop *stop, int x);
-
- QPointF checkRange(const QPointF &point) const;
- QRectF pointRect(const QPointF &point, double size) const;
-
- double correctAngle(double angle) const;
- void setAngleConical(double angle);
-
- void paintPoint(QPainter *painter, const QPointF &point, double size) const;
-
- double m_handleSize;
- bool m_backgroundCheckered;
-
- QGradientStops m_gradientStops;
- QGradient::Type m_gradientType;
- QGradient::Spread m_gradientSpread;
- QPointF m_startLinear;
- QPointF m_endLinear;
- QPointF m_centralRadial;
- QPointF m_focalRadial;
- qreal m_radiusRadial;
- QPointF m_centralConical;
- qreal m_angleConical;
-
- enum Handle
- {
- NoHandle,
- StartLinearHandle,
- EndLinearHandle,
- CentralRadialHandle,
- FocalRadialHandle,
- RadiusRadialHandle,
- CentralConicalHandle,
- AngleConicalHandle
- };
-
- Handle m_dragHandle;
- QPointF m_dragOffset;
- //double m_radiusOffset;
- double m_radiusFactor;
- double m_dragRadius;
- double m_angleOffset;
- double m_dragAngle;
-};
-
-double QtGradientWidgetPrivate::correctAngle(double angle) const
-{
- double a = angle;
- while (a >= 360)
- a -= 360;
- while (a < 0)
- a += 360;
- return a;
-}
-
-void QtGradientWidgetPrivate::setAngleConical(double angle)
-{
- double a = correctAngle(angle);
- if (m_angleConical == a)
- return;
- m_angleConical = a;
- emit q_ptr->angleConicalChanged(m_angleConical);
-}
-
-QRectF QtGradientWidgetPrivate::pointRect(const QPointF &point, double size) const
-{
- return QRectF(point.x() - size / 2, point.y() - size / 2, size, size);
-}
-
-QPointF QtGradientWidgetPrivate::checkRange(const QPointF &point) const
-{
- QPointF p = point;
- if (p.x() > 1)
- p.setX(1);
- else if (p.x() < 0)
- p.setX(0);
- if (p.y() > 1)
- p.setY(1);
- else if (p.y() < 0)
- p.setY(0);
- return p;
-}
-
-QPointF QtGradientWidgetPrivate::fromViewport(const QPointF &point) const
-{
- QSize size = q_ptr->size();
- return QPointF(point.x() / size.width(), point.y() / size.height());
-}
-
-QPointF QtGradientWidgetPrivate::toViewport(const QPointF &point) const
-{
- QSize size = q_ptr->size();
- return QPointF(point.x() * size.width(), point.y() * size.height());
-}
-
-void QtGradientWidgetPrivate::paintPoint(QPainter *painter, const QPointF &point, double size) const
-{
- QPointF pf = toViewport(point);
- QRectF rf = pointRect(pf, size);
-
- QPen pen;
- pen.setWidthF(1);
- QColor alphaZero = Qt::white;
- alphaZero.setAlpha(0);
-
- painter->save();
- painter->drawEllipse(rf);
-
- /*
- painter->save();
-
- QLinearGradient lgV(0, rf.top(), 0, rf.bottom());
- lgV.setColorAt(0, alphaZero);
- lgV.setColorAt(0.25, Qt::white);
- lgV.setColorAt(0.25, Qt::white);
- lgV.setColorAt(1, alphaZero);
- pen.setBrush(lgV);
- painter->setPen(pen);
-
- painter->drawLine(QPointF(pf.x(), rf.top()), QPointF(pf.x(), rf.bottom()));
-
- QLinearGradient lgH(rf.left(), 0, rf.right(), 0);
- lgH.setColorAt(0, alphaZero);
- lgH.setColorAt(0.5, Qt::white);
- lgH.setColorAt(1, alphaZero);
- pen.setBrush(lgH);
- painter->setPen(pen);
-
- painter->drawLine(QPointF(rf.left(), pf.y()), QPointF(rf.right(), pf.y()));
-
- painter->restore();
- */
-
- painter->restore();
-}
-
-/*
-void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x)
-{
- m_model->setCurrentStop(stop);
-
- int viewportX = qRound(toViewport(stop->position()));
- m_dragOffset = x - viewportX;
-
- QList<QtGradientStop *> stops = m_stops;
- m_stops.clear();
- QListIterator<QtGradientStop *> itStop(stops);
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (m_model->isSelected(s) || s == stop) {
- m_dragStops[s] = s->position() - stop->position();
- m_stops.append(s);
- } else {
- m_dragOriginal[s->position()] = s->color();
- }
- }
- itStop.toFront();
- while (itStop.hasNext()) {
- QtGradientStop *s = itStop.next();
- if (!m_model->isSelected(s))
- m_stops.append(s);
- }
- m_stops.removeAll(stop);
- m_stops.prepend(stop);
-}
-*/
-////////////////////////////
-
-QtGradientWidget::QtGradientWidget(QWidget *parent)
- : QWidget(parent)
-{
- d_ptr = new QtGradientWidgetPrivate;
- d_ptr->q_ptr = this;
- d_ptr->m_backgroundCheckered = true;
- d_ptr->m_handleSize = 20.0;
- d_ptr->m_gradientType = QGradient::LinearGradient;
- d_ptr->m_startLinear = QPointF(0, 0);
- d_ptr->m_endLinear = QPointF(1, 1);
- d_ptr->m_centralRadial = QPointF(0.5, 0.5);
- d_ptr->m_focalRadial = QPointF(0.5, 0.5);
- d_ptr->m_radiusRadial = 0.5;
- d_ptr->m_centralConical = QPointF(0.5, 0.5);
- d_ptr->m_angleConical = 0;
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::NoHandle;
-
- setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
-}
-
-QtGradientWidget::~QtGradientWidget()
-{
- delete d_ptr;
-}
-
-QSize QtGradientWidget::sizeHint() const
-{
- return QSize(176, 176);
-}
-
-QSize QtGradientWidget::minimumSizeHint() const
-{
- return QSize(128, 128);
-}
-
-int QtGradientWidget::heightForWidth(int w) const
-{
- return w;
-}
-
-void QtGradientWidget::setBackgroundCheckered(bool checkered)
-{
- if (d_ptr->m_backgroundCheckered == checkered)
- return;
- d_ptr->m_backgroundCheckered = checkered;
- update();
-}
-
-bool QtGradientWidget::isBackgroundCheckered() const
-{
- return d_ptr->m_backgroundCheckered;
-}
-
-void QtGradientWidget::mousePressEvent(QMouseEvent *e)
-{
- if (e->button() != Qt::LeftButton)
- return;
-
- QPoint p = e->pos();
- if (d_ptr->m_gradientType == QGradient::LinearGradient) {
- QPointF startPoint = d_ptr->toViewport(d_ptr->m_startLinear);
- double x = p.x() - startPoint.x();
- double y = p.y() - startPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::StartLinearHandle;
- d_ptr->m_dragOffset = QPointF(x, y);
- update();
- return;
- }
-
- QPointF endPoint = d_ptr->toViewport(d_ptr->m_endLinear);
- x = p.x() - endPoint.x();
- y = p.y() - endPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::EndLinearHandle;
- d_ptr->m_dragOffset = QPointF(x, y);
- update();
- return;
- }
- } else if (d_ptr->m_gradientType == QGradient::RadialGradient) {
- QPointF focalPoint = d_ptr->toViewport(d_ptr->m_focalRadial);
- double x = p.x() - focalPoint.x();
- double y = p.y() - focalPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 9) > (x * x + y * y)) {
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::FocalRadialHandle;
- d_ptr->m_dragOffset = QPointF(x, y);
- update();
- return;
- }
-
- QPointF centralPoint = d_ptr->toViewport(d_ptr->m_centralRadial);
- x = p.x() - centralPoint.x();
- y = p.y() - centralPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::CentralRadialHandle;
- d_ptr->m_dragOffset = QPointF(x, y);
- update();
- return;
- }
-
- QPointF central = d_ptr->toViewport(d_ptr->m_centralRadial);
- QRectF r = d_ptr->pointRect(central, 2 * d_ptr->m_handleSize / 3);
- QRectF r1(0, r.y(), size().width(), r.height());
- QRectF r2(r.x(), 0, r.width(), r.y());
- QRectF r3(r.x(), r.y() + r.height(), r.width(), size().height() - r.y() - r.height());
- QPointF pF(p.x(), p.y());
- if (r1.contains(pF) || r2.contains(pF) || r3.contains(pF)) {
- x = pF.x() / size().width() - d_ptr->m_centralRadial.x();
- y = pF.y() / size().height() - d_ptr->m_centralRadial.y();
- double clickRadius = sqrt(x * x + y * y);
- //d_ptr->m_radiusOffset = d_ptr->m_radiusRadial - clickRadius;
- d_ptr->m_radiusFactor = d_ptr->m_radiusRadial / clickRadius;
- if (d_ptr->m_radiusFactor == 0)
- d_ptr->m_radiusFactor = 1;
- d_ptr->m_dragRadius = d_ptr->m_radiusRadial;
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::RadiusRadialHandle;
- mouseMoveEvent(e);
- update();
- return;
- }
- } else if (d_ptr->m_gradientType == QGradient::ConicalGradient) {
- QPointF centralPoint = d_ptr->toViewport(d_ptr->m_centralConical);
- double x = p.x() - centralPoint.x();
- double y = p.y() - centralPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::CentralConicalHandle;
- d_ptr->m_dragOffset = QPointF(x, y);
- update();
- return;
- }
- double radius = size().width();
- if (size().height() < radius)
- radius = size().height();
- radius /= 2;
- double corr = d_ptr->m_handleSize / 3;
- radius -= corr;
- QPointF vp = d_ptr->toViewport(d_ptr->m_centralConical);
- x = p.x() - vp.x();
- y = p.y() - vp.y();
- if (((radius - corr) * (radius - corr) < (x * x + y * y)) &&
- ((radius + corr) * (radius + corr) > (x * x + y * y))) {
- QPointF central = d_ptr->toViewport(d_ptr->m_centralConical);
- QPointF current(e->pos().x(), e->pos().y());
- x = current.x() - central.x();
- y = current.y() - central.y();
- x /= size().width() / 2;
- y /= size().height() / 2;
- double r = sqrt(x * x + y * y);
-
- double arcSin = asin(y / r);
- double arcCos = acos(x / r);
-
- double angle = arcCos * 180 / M_PI;
- if (arcSin > 0) {
- angle = -angle;
- }
-
- d_ptr->m_angleOffset = d_ptr->m_angleConical - angle;
- d_ptr->m_dragAngle = d_ptr->m_angleConical;
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::AngleConicalHandle;
- update();
- return;
- }
- }
-}
-
-void QtGradientWidget::mouseReleaseEvent(QMouseEvent *e)
-{
- Q_UNUSED(e)
- d_ptr->m_dragHandle = QtGradientWidgetPrivate::NoHandle;
- update();
-}
-
-void QtGradientWidget::mouseMoveEvent(QMouseEvent *e)
-{
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::NoHandle)
- return;
-
- QPointF newPos = QPointF((double)e->pos().x() - d_ptr->m_dragOffset.x(),
- (double)e->pos().y() - d_ptr->m_dragOffset.y());
- QPointF newPoint = d_ptr->fromViewport(newPos);
- if (newPoint.x() < 0)
- newPoint.setX(0);
- else if (newPoint.x() > 1)
- newPoint.setX(1);
- if (newPoint.y() < 0)
- newPoint.setY(0);
- else if (newPoint.y() > 1)
- newPoint.setY(1);
-
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::StartLinearHandle) {
- d_ptr->m_startLinear = newPoint;
- emit startLinearChanged(newPoint);
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::EndLinearHandle) {
- d_ptr->m_endLinear = newPoint;
- emit endLinearChanged(newPoint);
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::CentralRadialHandle) {
- d_ptr->m_centralRadial = newPoint;
- emit centralRadialChanged(newPoint);
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::FocalRadialHandle) {
- d_ptr->m_focalRadial = newPoint;
- emit focalRadialChanged(newPoint);
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::RadiusRadialHandle) {
- QPointF centralPoint = d_ptr->toViewport(d_ptr->m_centralRadial);
- QPointF pF(e->pos().x(), e->pos().y());
- double x = pF.x() - centralPoint.x();
- double y = pF.y() - centralPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- if (d_ptr->m_radiusRadial != d_ptr->m_dragRadius) {
- d_ptr->m_radiusRadial = d_ptr->m_dragRadius;
- emit radiusRadialChanged(d_ptr->m_radiusRadial);
- }
- } else {
- x = pF.x() / size().width() - d_ptr->m_centralRadial.x();
- y = pF.y() / size().height() - d_ptr->m_centralRadial.y();
- double moveRadius = sqrt(x * x + y * y);
- //double newRadius = moveRadius + d_ptr->m_radiusOffset;
- double newRadius = moveRadius * d_ptr->m_radiusFactor;
- if (newRadius > 2)
- newRadius = 2;
- d_ptr->m_radiusRadial = newRadius;
- emit radiusRadialChanged(d_ptr->m_radiusRadial);
- }
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::CentralConicalHandle) {
- d_ptr->m_centralConical = newPoint;
- emit centralConicalChanged(newPoint);
- } else if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::AngleConicalHandle) {
- QPointF centralPoint = d_ptr->toViewport(d_ptr->m_centralConical);
- QPointF pF(e->pos().x(), e->pos().y());
- double x = pF.x() - centralPoint.x();
- double y = pF.y() - centralPoint.y();
-
- if ((d_ptr->m_handleSize * d_ptr->m_handleSize / 4) > (x * x + y * y)) {
- if (d_ptr->m_angleConical != d_ptr->m_dragAngle) {
- d_ptr->m_angleConical = d_ptr->m_dragAngle;
- emit angleConicalChanged(d_ptr->m_angleConical);
- }
- } else {
- QPointF central = d_ptr->toViewport(d_ptr->m_centralConical);
- QPointF current = pF;
- x = current.x() - central.x();
- y = current.y() - central.y();
- x /= size().width() / 2;
- y /= size().height() / 2;
- double r = sqrt(x * x + y * y);
-
- double arcSin = asin(y / r);
- double arcCos = acos(x / r);
-
- double angle = arcCos * 180 / M_PI;
- if (arcSin > 0) {
- angle = -angle;
- }
-
- angle += d_ptr->m_angleOffset;
-
- d_ptr->setAngleConical(angle);
- }
- }
- update();
-}
-
-void QtGradientWidget::mouseDoubleClickEvent(QMouseEvent *e)
-{
- mousePressEvent(e);
-}
-
-void QtGradientWidget::paintEvent(QPaintEvent *e)
-{
- Q_UNUSED(e)
-
- QPainter p(this);
-
- if (d_ptr->m_backgroundCheckered) {
- int pixSize = 40;
- QPixmap pm(2 * pixSize, 2 * pixSize);
-
- QPainter pmp(&pm);
- pmp.fillRect(0, 0, pixSize, pixSize, Qt::white);
- pmp.fillRect(pixSize, pixSize, pixSize, pixSize, Qt::white);
- pmp.fillRect(0, pixSize, pixSize, pixSize, Qt::black);
- pmp.fillRect(pixSize, 0, pixSize, pixSize, Qt::black);
-
- p.setBrushOrigin((size().width() % pixSize + pixSize) / 2, (size().height() % pixSize + pixSize) / 2);
- p.fillRect(rect(), pm);
- p.setBrushOrigin(0, 0);
- }
-
- QGradient *gradient = 0;
- switch (d_ptr->m_gradientType) {
- case QGradient::LinearGradient:
- gradient = new QLinearGradient(d_ptr->m_startLinear, d_ptr->m_endLinear);
- break;
- case QGradient::RadialGradient:
- gradient = new QRadialGradient(d_ptr->m_centralRadial, d_ptr->m_radiusRadial, d_ptr->m_focalRadial);
- break;
- case QGradient::ConicalGradient:
- gradient = new QConicalGradient(d_ptr->m_centralConical, d_ptr->m_angleConical);
- break;
- default:
- break;
- }
- if (!gradient)
- return;
-
- gradient->setStops(d_ptr->m_gradientStops);
- gradient->setSpread(d_ptr->m_gradientSpread);
-
- p.save();
- p.scale(size().width(), size().height());
- p.fillRect(QRect(0, 0, 1, 1), *gradient);
- p.restore();
-
- p.setRenderHint(QPainter::Antialiasing);
-
- QColor c = QColor::fromRgbF(0.5, 0.5, 0.5, 0.5);
- QBrush br(c);
- p.setBrush(br);
- QPen pen(Qt::white);
- pen.setWidthF(1);
- p.setPen(pen);
- QPen dragPen = pen;
- dragPen.setWidthF(2);
- if (d_ptr->m_gradientType == QGradient::LinearGradient) {
- p.save();
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::StartLinearHandle)
- p.setPen(dragPen);
- d_ptr->paintPoint(&p, d_ptr->m_startLinear, d_ptr->m_handleSize);
- p.restore();
-
- p.save();
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::EndLinearHandle)
- p.setPen(dragPen);
- d_ptr->paintPoint(&p, d_ptr->m_endLinear, d_ptr->m_handleSize);
- p.restore();
- } else if (d_ptr->m_gradientType == QGradient::RadialGradient) {
- QPointF central = d_ptr->toViewport(d_ptr->m_centralRadial);
-
- p.save();
- QRectF r = d_ptr->pointRect(central, 2 * d_ptr->m_handleSize / 3);
- QRectF r1(0, r.y(), size().width(), r.height());
- QRectF r2(r.x(), 0, r.width(), r.y());
- QRectF r3(r.x(), r.y() + r.height(), r.width(), size().height() - r.y() - r.height());
- p.fillRect(r1, c);
- p.fillRect(r2, c);
- p.fillRect(r3, c);
- p.setBrush(Qt::NoBrush);
- p.save();
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::CentralRadialHandle)
- p.setPen(dragPen);
- d_ptr->paintPoint(&p, d_ptr->m_centralRadial, d_ptr->m_handleSize);
- p.restore();
-
- QRectF rect = QRectF(central.x() - d_ptr->m_radiusRadial * size().width(),
- central.y() - d_ptr->m_radiusRadial * size().height(),
- 2 * d_ptr->m_radiusRadial * size().width(),
- 2 * d_ptr->m_radiusRadial * size().height());
- p.setClipRect(r1);
- p.setClipRect(r2, Qt::UniteClip);
- p.setClipRect(r3, Qt::UniteClip);
- p.drawEllipse(rect);
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::RadiusRadialHandle) {
- p.save();
- p.setPen(dragPen);
- QRectF rect = QRectF(central.x() - d_ptr->m_radiusRadial / d_ptr->m_radiusFactor * size().width(),
- central.y() - d_ptr->m_radiusRadial / d_ptr->m_radiusFactor * size().height(),
- 2 * d_ptr->m_radiusRadial / d_ptr->m_radiusFactor * size().width(),
- 2 * d_ptr->m_radiusRadial / d_ptr->m_radiusFactor * size().height());
- p.drawEllipse(rect);
-
- p.restore();
- }
- p.restore();
-
- p.save();
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::FocalRadialHandle)
- p.setPen(dragPen);
- d_ptr->paintPoint(&p, d_ptr->m_focalRadial, 2 * d_ptr->m_handleSize / 3);
- p.restore();
- } else if (d_ptr->m_gradientType == QGradient::ConicalGradient) {
- double radius = size().width();
- if (size().height() < radius)
- radius = size().height();
- radius /= 2;
- double corr = d_ptr->m_handleSize / 3;
- radius -= corr;
- QPointF central = d_ptr->toViewport(d_ptr->m_centralConical);
-
- p.save();
- p.setBrush(Qt::NoBrush);
- QPen pen2(c);
- pen2.setWidthF(2 * d_ptr->m_handleSize / 3);
- p.setPen(pen2);
- p.drawEllipse(d_ptr->pointRect(central, 2 * radius));
- p.restore();
-
- p.save();
- p.setBrush(Qt::NoBrush);
- int pointCount = 2;
- for (int i = 0; i < pointCount; i++) {
- QPointF ang(cos(M_PI * (i * 180.0 / pointCount + d_ptr->m_angleConical) / 180) * size().width() / 2,
- -sin(M_PI * (i * 180.0 / pointCount + d_ptr->m_angleConical) / 180) * size().height() / 2);
- double mod = sqrt(ang.x() * ang.x() + ang.y() * ang.y());
- p.drawLine(QPointF(central.x() + ang.x() * (radius - corr) / mod,
- central.y() + ang.y() * (radius - corr) / mod),
- QPointF(central.x() + ang.x() * (radius + corr) / mod,
- central.y() + ang.y() * (radius + corr) / mod));
- p.drawLine(QPointF(central.x() - ang.x() * (radius - corr) / mod,
- central.y() - ang.y() * (radius - corr) / mod),
- QPointF(central.x() - ang.x() * (radius + corr) / mod,
- central.y() - ang.y() * (radius + corr) / mod));
- }
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::AngleConicalHandle) {
- p.save();
- p.setPen(dragPen);
- QPointF ang(cos(M_PI * (d_ptr->m_angleConical - d_ptr->m_angleOffset) / 180) * size().width() / 2,
- -sin(M_PI * (d_ptr->m_angleConical - d_ptr->m_angleOffset) / 180) * size().height() / 2);
- double mod = sqrt(ang.x() * ang.x() + ang.y() * ang.y());
- p.drawLine(QPointF(central.x() + ang.x() * (radius - corr) / mod,
- central.y() + ang.y() * (radius - corr) / mod),
- QPointF(central.x() + ang.x() * (radius + corr) / mod,
- central.y() + ang.y() * (radius + corr) / mod));
- p.restore();
- }
-
- p.restore();
-
- p.save();
- if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::CentralConicalHandle)
- p.setPen(dragPen);
- d_ptr->paintPoint(&p, d_ptr->m_centralConical, d_ptr->m_handleSize);
- p.restore();
-
- }
-
- delete gradient;
-}
-
-void QtGradientWidget::setGradientStops(const QGradientStops &stops)
-{
- d_ptr->m_gradientStops = stops;
- update();
-}
-
-QGradientStops QtGradientWidget::gradientStops() const
-{
- return d_ptr->m_gradientStops;
-}
-
-void QtGradientWidget::setGradientType(QGradient::Type type)
-{
- if (type == QGradient::NoGradient)
- return;
- if (d_ptr->m_gradientType == type)
- return;
-
- d_ptr->m_gradientType = type;
- update();
-}
-
-QGradient::Type QtGradientWidget::gradientType() const
-{
- return d_ptr->m_gradientType;
-}
-
-void QtGradientWidget::setGradientSpread(QGradient::Spread spread)
-{
- if (d_ptr->m_gradientSpread == spread)
- return;
-
- d_ptr->m_gradientSpread = spread;
- update();
-}
-
-QGradient::Spread QtGradientWidget::gradientSpread() const
-{
- return d_ptr->m_gradientSpread;
-}
-
-void QtGradientWidget::setStartLinear(const QPointF &point)
-{
- if (d_ptr->m_startLinear == point)
- return;
-
- d_ptr->m_startLinear = d_ptr->checkRange(point);
- update();
-}
-
-QPointF QtGradientWidget::startLinear() const
-{
- return d_ptr->m_startLinear;
-}
-
-void QtGradientWidget::setEndLinear(const QPointF &point)
-{
- if (d_ptr->m_endLinear == point)
- return;
-
- d_ptr->m_endLinear = d_ptr->checkRange(point);
- update();
-}
-
-QPointF QtGradientWidget::endLinear() const
-{
- return d_ptr->m_endLinear;
-}
-
-void QtGradientWidget::setCentralRadial(const QPointF &point)
-{
- if (d_ptr->m_centralRadial == point)
- return;
-
- d_ptr->m_centralRadial = point;
- update();
-}
-
-QPointF QtGradientWidget::centralRadial() const
-{
- return d_ptr->m_centralRadial;
-}
-
-void QtGradientWidget::setFocalRadial(const QPointF &point)
-{
- if (d_ptr->m_focalRadial == point)
- return;
-
- d_ptr->m_focalRadial = point;
- update();
-}
-
-QPointF QtGradientWidget::focalRadial() const
-{
- return d_ptr->m_focalRadial;
-}
-
-void QtGradientWidget::setRadiusRadial(qreal radius)
-{
- if (d_ptr->m_radiusRadial == radius)
- return;
-
- d_ptr->m_radiusRadial = radius;
- update();
-}
-
-qreal QtGradientWidget::radiusRadial() const
-{
- return d_ptr->m_radiusRadial;
-}
-
-void QtGradientWidget::setCentralConical(const QPointF &point)
-{
- if (d_ptr->m_centralConical == point)
- return;
-
- d_ptr->m_centralConical = point;
- update();
-}
-
-QPointF QtGradientWidget::centralConical() const
-{
- return d_ptr->m_centralConical;
-}
-
-void QtGradientWidget::setAngleConical(qreal angle)
-{
- if (d_ptr->m_angleConical == angle)
- return;
-
- d_ptr->m_angleConical = angle;
- update();
-}
-
-qreal QtGradientWidget::angleConical() const
-{
- return d_ptr->m_angleConical;
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/extern/QtGradientEditor/qtgradientwidget.h b/src/gui/extern/QtGradientEditor/qtgradientwidget.h
deleted file mode 100644
index 5abef8cc90f9d816a96dc13eb54f4b830b2cf583..0000000000000000000000000000000000000000
--- a/src/gui/extern/QtGradientEditor/qtgradientwidget.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** 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.0, 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTGRADIENTWIDGET_H
-#define QTGRADIENTWIDGET_H
-
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class QtGradientWidget : public QWidget
-{
- Q_OBJECT
- Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered)
-public:
- QtGradientWidget(QWidget *parent = 0);
- ~QtGradientWidget();
-
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
- int heightForWidth(int w) const;
-
- bool isBackgroundCheckered() const;
- void setBackgroundCheckered(bool checkered);
-
- QGradientStops gradientStops() const;
-
- void setGradientType(QGradient::Type type);
- QGradient::Type gradientType() const;
-
- void setGradientSpread(QGradient::Spread spread);
- QGradient::Spread gradientSpread() const;
-
- void setStartLinear(const QPointF &point);
- QPointF startLinear() const;
-
- void setEndLinear(const QPointF &point);
- QPointF endLinear() const;
-
- void setCentralRadial(const QPointF &point);
- QPointF centralRadial() const;
-
- void setFocalRadial(const QPointF &point);
- QPointF focalRadial() const;
-
- void setRadiusRadial(qreal radius);
- qreal radiusRadial() const;
-
- void setCentralConical(const QPointF &point);
- QPointF centralConical() const;
-
- void setAngleConical(qreal angle);
- qreal angleConical() const;
-
-public slots:
- void setGradientStops(const QGradientStops &stops);
-signals:
-
- void startLinearChanged(const QPointF &point);
- void endLinearChanged(const QPointF &point);
- void centralRadialChanged(const QPointF &point);
- void focalRadialChanged(const QPointF &point);
- void radiusRadialChanged(qreal radius);
- void centralConicalChanged(const QPointF &point);
- void angleConicalChanged(qreal angle);
-
-protected:
- void paintEvent(QPaintEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
-
-private:
- class QtGradientWidgetPrivate *d_ptr;
- Q_DECLARE_PRIVATE(QtGradientWidget)
- Q_DISABLE_COPY(QtGradientWidget)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/overview.svg b/src/gui/overview.svg
deleted file mode 100644
index e9c3ee6b9b36a72014613d519c83ed40ed80da8a..0000000000000000000000000000000000000000
--- a/src/gui/overview.svg
+++ /dev/null
@@ -1,3557 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1134.4014"
- height="2004.3864"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="overview.svg">
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.7"
- inkscape:cx="672.71152"
- inkscape:cy="242.51247"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1600"
- inkscape:window-height="1180"
- inkscape:window-x="2558"
- inkscape:window-y="-3"
- inkscape:window-maximized="1"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <defs
- id="defs4">
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4931"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4560"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4216"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4189"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4082"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4031"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3978"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect5303"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect5291"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- is_visible="true"
- id="path-effect4567"
- effect="spiro" />
- <inkscape:path-effect
- is_visible="true"
- id="path-effect4563"
- effect="spiro" />
- <marker
- style="overflow:visible"
- id="Arrow1Send"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Send">
- <path
- transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4042"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- is_visible="true"
- id="path-effect3842"
- effect="spiro" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- is_visible="true"
- id="path-effect4567-1"
- effect="spiro" />
- <marker
- style="overflow:visible"
- id="Arrow1Mendl"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mendl">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill:#ff5300;fill-rule:evenodd;stroke:#ff5300;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path5064"
- inkscape:connector-curvature="0" />
- </marker>
- <marker
- style="overflow:visible"
- id="Arrow1MendM"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1MendM">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill:#ff5300;fill-rule:evenodd;stroke:#ff5300;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path5067"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect3978-9"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4031-2"
- is_visible="true" />
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4082-9"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9-3"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8-8"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360-1"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9-2"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8-3"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360-3"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9-33"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8-2"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360-6"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9-0"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8-6"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360-8"
- is_visible="true" />
- <marker
- style="overflow:visible"
- id="Arrow1Mend-9-6"
- refX="0"
- refY="0"
- orient="auto"
- inkscape:stockid="Arrow1Mend">
- <path
- transform="matrix(-0.4,0,0,-0.4,-4,0)"
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
- id="path4036-8-9"
- inkscape:connector-curvature="0" />
- </marker>
- <inkscape:path-effect
- effect="spiro"
- id="path-effect4360-0"
- is_visible="true" />
- </defs>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:groupmode="layer"
- inkscape:label="Layer 1"
- transform="translate(218.44914,-44.074036)">
- <rect
- ry="31.13793"
- rx="27.761255"
- y="1427.1985"
- x="40.562874"
- height="72.675117"
- width="211.87343"
- id="rect3812"
- style="opacity:0.62151394;fill:#868686;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3814"
- y="1457.1985"
- x="71.277168"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:18px"
- y="1457.1985"
- x="71.277168"
- id="tspan3816"
- sodipodi:role="line">GUI</tspan></text>
- <rect
- ry="50.815468"
- rx="45.304909"
- y="1197.0989"
- x="353.86966"
- height="111.95358"
- width="280.6315"
- id="rect4468-1"
- style="opacity:0.62151394;fill:#0163ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6"
- y="1254.1279"
- x="378.62656"
- style="font-size:19.85348511px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:26.47131348px"
- y="1254.1279"
- x="378.62656"
- id="tspan4472-0"
- sodipodi:role="line">BlockSliceView</tspan></text>
- <rect
- ry="30.714285"
- rx="27.383551"
- y="1398.1431"
- x="338.07401"
- height="128.92316"
- width="331.31259"
- id="rect4468-1-2"
- style="opacity:0.62151394;fill:#01ff50;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0"
- y="1431.478"
- x="362.31766"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:16px"
- y="1431.478"
- x="362.31766"
- id="tspan4472-0-8"
- sodipodi:role="line">DisplayAdaptor</tspan></text>
- <rect
- ry="29.860447"
- rx="27.383551"
- y="1618.4058"
- x="341.81332"
- height="59.720894"
- width="281.06708"
- id="rect3812-7"
- style="opacity:0.62151394;fill:#0163ff;fill-opacity:0.56279069;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-5"
- y="1662.1055"
- x="358.96848"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:16px"
- y="1662.1055"
- x="358.96848"
- id="tspan4472-0-8-3"
- sodipodi:role="line">DisplayPropertiesItem </tspan></text>
- <path
- inkscape:connector-curvature="0"
- inkscape:original-d="m 397.94785,1528.2324 1.42857,90"
- inkscape:path-effect="#path-effect4563"
- id="path4561"
- d="m 397.94785,1528.2324 1.42857,90"
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- inkscape:connector-curvature="0"
- inkscape:original-d="m 500.30035,1397.1919 2.24078,-84.499"
- inkscape:path-effect="#path-effect4567"
- id="path4565"
- d="m 500.30035,1397.1919 2.24078,-84.499"
- style="fill:none;stroke:#ff5300;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1MendM)"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4937"
- y="1333.0051"
- x="530.71515"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- y="1333.0051"
- x="530.71515"
- id="tspan4939"
- sodipodi:role="line">requestRedraw()</tspan></text>
- <path
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0"
- inkscape:original-d="m 517.67668,1617.8575 0,-83.8427"
- inkscape:path-effect="#path-effect4567-1"
- id="path4565-4"
- d="m 517.67668,1617.8575 0,-83.8427"
- style="fill:none;stroke:#ff5300;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mendl)"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4968"
- y="1572.0857"
- x="366.1803"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- y="1572.0857"
- x="366.1803"
- id="tspan4970"
- sodipodi:role="line"><contains></tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4972"
- y="1553.3978"
- x="528.30975"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- y="1553.3978"
- x="528.30975"
- id="tspan4974"
- sodipodi:role="line">- optionChanged()</tspan><tspan
- id="tspan4976"
- y="1568.3978"
- x="528.30975"
- sodipodi:role="line">- colorSelected(QColor)</tspan><tspan
- id="tspan4978"
- y="1583.3978"
- x="528.30975"
- sodipodi:role="line">- colormapSelected()</tspan><tspan
- id="tspan4980"
- y="1598.3978"
- x="528.30975"
- sodipodi:role="line">- comboBoxSelectionChanged()</tspan><tspan
- id="tspan4982"
- y="1613.3978"
- x="528.30975"
- sodipodi:role="line" /></text>
- <text
- sodipodi:linespacing="125%"
- id="text5005"
- y="1634.12"
- x="365.02762"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- y="1634.12"
- x="365.02762"
- id="tspan5007"
- sodipodi:role="line">QTreeWidgetItem</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text5005-2"
- y="1226.684"
- x="389.43652"
- style="font-size:19.85348511px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- y="1226.684"
- x="389.43652"
- id="tspan5007-4"
- sodipodi:role="line">QGraphicsView</tspan></text>
- <flowRoot
- xml:space="preserve"
- id="flowRoot5207"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"><flowRegion
- id="flowRegion5209"><rect
- id="rect5211"
- width="1.0101526"
- height="14.142136"
- x="104.04572"
- y="1492.7887" /></flowRegion><flowPara
- id="flowPara5213" /></flowRoot> <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- x="347.49246"
- y="1453.3928"
- id="text5215"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan5217"
- x="347.49246"
- y="1453.3928">- configure(block, sliceInformation) -> size info</tspan><tspan
- sodipodi:role="line"
- x="347.49246"
- y="1468.3928"
- id="tspan5223">- draw( CellView[][] cells )</tspan><tspan
- sodipodi:role="line"
- x="347.49246"
- y="1483.3928"
- id="tspan5219">- addConfigurationItem(QTreeWidgetItem*rootItem)</tspan><tspan
- sodipodi:role="line"
- x="347.49246"
- y="1498.3928"
- id="tspan5221" /></text>
- <image
- y="107.36346"
- x="-11.687358"
- id="image3129"
- xlink:href="data:image/png;base64,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
-/L5B1Dc2YnCgP/5pyHJ4NVW2Z/L/369/VewhEBERERERDatvf+e7hmUyJAQCATicDgz09w/jqIiI
-iIgKIxQMIhyJwGG3we5wDntfoVAIVdXVCIaCkCFBKYuIv4xDfiIiIiIiIkoiSYAAFEXhGfxERERU
-VgL+APp6uiGEgM1mR38kDEmSUOvxwFnhGra+hBDqaylFxF9blQOG/ERERERERPsEAaEoUBRFt3TR
-opPi38uyjLraWhww+wAsXboUra2t8TrLlj2T1ygK0QcRERGNHKFgEAHfIDz1DbA7HAgGg3A6nQiH
-Qhjo7wMgw1lh8Uz8tL5isulLDfkVlE3CD87JT0RERERENGIsW/YMli17Bk899W/cfucdGD9hAq67
-7vpiD4uIiIhGKCEEwqEQaurqYHc4sHz5clx00UV48823YHc4UOPxIBIOARY+pZjc16OP/RXBYDBe
-9sqrr2L7zk8t91VuGPITERERERGNMJIkwevx4OzPn4VtW7fq1uns6MDVV38fZyw5E9/93vewp60t
-Xtbb04Of/OQnOP30M/C1r30NH3+8XrePcDiMG264AQ8/8jAAYOXKV3DJJZdi8eLTcNlll+O9998r
-/MYRERFR+RBAhdsNSZaxfPly/Pa3t+Ciiy/FdddfjzfffAuyJKPC7baWy0f7CoXDWLtuLf7nf/4H
-wWAQy5cvx0033QyX2229rzLDkJ+IiIiIiGiEURQFnZ2deOCBP2Pe/Hm6de6+5x7MmDEDD//lz5g9
-ezbuvefeeNkf/nA3Jk2ajEcfeRgXXvhF3HLLLZr2ff39uOaaH2HGjJk479zzAAC33HorfvjDH+Lv
-f38SF1xwHu684w9Ds4FERERUFux2O+w2O1577TX89re34KGHH8EXLjgft9z6O1x3/fV49901ah17
-5lnnY31VVFTg97ffAWeFC9/85jfj/R5wwAGW+yo3ZbBFYp/8CAUREREREVHWzN4bieg/wvg9VPK8
-/ABQ7/XiV7+6ObV+9Pt3312D3//+Nrhdbiw5/Qx8/RvfiJe99Z83cecdd8LlcuGIww/DEYcfltLH
-7l278N//81N8/qzP4cQTT4yXeT0evPrKK/B46nDMgmNwzIJj+H6PiIhoBLM77FCUCKprauGsqMCW
-TRtRV12JTRvWIxwKobq6GjabDbIsI+IPW+orFAyhq70NJy46ET+/9meYM2cOvHU18A8OwuF0Zu5L
-CKivqaLfl8FLFZ7JT0RERERENEIse+ZpLHvmaTz91L/x4AN/wnHHHYtf/frXunV7e3tRW1MDAKip
-qUZPT0+8rK+vHzU11Ybr+c53v4f29nY0NTenLP/ZtT9Fb28vrrzySnz969/A+x+8X4CtIiIiorIl
-AJerCoceegh+e8ut+Om11+L3t9+Om2++GX/+y8PYf//94XZXWZ6ux+WqAgAsW7YM1/3il3jwob+g
-sqoKP/jBDxAMBq33VWZKPuQXBjciIiIiIqKRxuj9kZVbcntJltHY1ITzLrgAH3+8XrdOnceD3r5+
-CAC9ff2o83gSZXV16OrqNlzPT3/6P/jJT/4LN95wI7Zu2x4vG9XSgm9d9S385S9/wefOOgs3/O9N
-eW0Tb7zxxhtvvPFW3rdAMAB3VSUi4QimT5uCW279HZY/+xweevgRNDc1AJIEl9uNYDBguS/INtx1
-9z146OFHMHZMK2753e/grHDhqWeWW+4r+VYOSj7kJyIiIiIiosISQqC3pwePPPwIpk2fpltn7oEH
-4u9//zv8fj8ef/xxHHjggfGy+fPm4dG/Pob+gQG89NLLuPzyr6a0nTp1KubOnYurvn0Vrr32Z9i7
-V/0UwFXfugovvfQyFEVBa2srFKEM3UYSERFRyRNCoLurE80trahwubH/rJl49733Mbp1FNyVVWga
-1YLurk4IC6ffx/oaN34C/vPOuxjdOgq+wUH07u3GffffjyuvuspyX+WmDObkJyIiIiIiokI46aST
-AQCSJKGmthZzD5yLH//4x7p1L7nkYtzwvzfivCcvwIzp03H11d+Ll1269FLceMONOP+88zFmzBhc
-9e2rdPuYP38+gsEQfvbzn+H6667DFy+6CLfffjtuuukmjBrVgm9968rCbyQRERGVlWAggJ07tsFb
-34DaOg9kWUZD0ygM9Pfh0+1bEYlEcuqroWkURrWOQTgcxkB/H7o7O7Lqq5ww5CciIiIiIhoBnnnm
-6azqNDQ04MabbtCtV1tbi1/88heW1nPkkUfgyCOPAAB89rMH4e6777I6ZCIiIhohIuEwOtr2oKNt
-T0n1VS44XQ8RERERERERERERUZliyE9EREREREREREREVKYY8hMRERERERERERERlSnOyU+69sWr
-TBMRERER5UOSpGIPgYiIiIhIo/RDfgGAgfOwSQ73GfQTEREREakkSYq/Pi5q2G/2Gj1WxvdQRERE
-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
-YIMN85Uvf3m5n7tSFnyE/v3lUqlUykc/+tFcc/U1iz2+oO2C29u/c/vFti28P2/evOw2etfccfsd
-2XuvvbP77nvk9ttvz89/9vPstede2WOPPXPH7Xd07Tdp0ss54YQTssvOu+TYY4/NtOnTUy6XM3fu
-3Oy+2+657trrsvNOO7/hNV+dMiUnffaz2XmnnfPxgw/OuMceW6wei8Vi6a/LCy+8kBdeeGGZtvUn
-Qn4qqH/9YwIAAJbsrRzUL4unnnoqRx19TFZdddU0NjZmyJAh2e/DH85Z55zT1Wby5Mk57JBPZJMN
-N8hee+yeRx55pGvbfX/4Q/bYdXQ23mD9vGeXnfO73/2/bl/nzdrNnTs3W272jnzzsm9kkw036FHN
-i46+nzhxYj5+0EEZudGGOWD/j2TatGnd7vPM009nz912zdZbbJ6777pric//8qRJ2WTDDTJzxoJr
-IcycOTObjRqZmTNnLrg/Y0Y22XCDvDxpUl566aUcsP9HsukmG2f//T6U55/795cDV37nOznlc6dm
-9z32TFNTU0aMWCUnf+5zuea663r0PquhVC6lVPr30tnZma232TozZ87I/z36aNfjSbq9vej9YrGY
-WXPm5MmnnswtP7w5n/vcKbn0kkvz97//PT/80S055ZSTM2bMd7r2+/rXv5713r5ebr31F9l01KYZ
-c8UVKZVKaWhoyKxZs9LZ2Zlf3f6rN7zmZZddnvXX3yC33XZrDj/8iFxw4UWL1WOxWCz9dbng/Avy
-qU8dl+eff2Gxx5/8299y5BFH5tJLL33dPv0rlxTyU2HlpSwAAJWgDwK97Rc/+XGPliVZ5pB/Gf+9
-fmDffXP3XXfl5z/7aZ566sluvyQ495yzs8nIkRn7l0fymc+elC+ddlrXtjO+cnpO++KX8ui4x3Ps
-pz612LZFvVm7pqamzJy54AJ/f3n0r8tUe5KcdcZXs/Emm+Shh/+SLbfaKhdfeGG37S44//zsuffe
-+f0f7stf//roEp9z5REjsuVWW+W3v/1tkuQ399yd2bNn5zf33LPg/m9+k6223jorjxiRC847N1tu
-tVX+9NDYvHP7d+WC88/vep7HH388o3fbbZnfUzUtmJP/38vCx4455uhcf+21mTNn9mKPv/72oveT
-cjo7OnLQgQekpaUlO+64Q6ZNm5aPf+LgrvsTJkzs2u+hhx7KgR87MANaBuSjB3w0999/f9fzdHR0
-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
-Pf0p4KU7S/oMlJOUl5CLPzZuXH76i9vywosvZsCAAdls003z4Q9+IO3t7ctV0ze+9e185tPHvaV9
-j/n0CbnyW9/sdpuIH4D+TMgPAABQZwrFQgqlN5+T/OG/PJKbf3hLnv3Xs2luack7Ro3MoR//RIav
-PPxN9/nIAQfmRzfftEzbvvCl0/Of/7l99nnve9+w7Re33Zb7778/551zzhKfe3l95IADF7s/ePDg
-bDpqVD5x8McyfPibv99KO/vc83L6l77Ydb8S/w+WeF2GJaTiTz39TK654Xs5+MADssVm78j06dNz
-x9135yc/+3k+/rGDlqumCRMmLtf+b0rKD0Cl1MDfGCE/AABAnVnSSP7HH38il19xRY49+qhstdVW
-mTljRn51xx259vob8vlTT3nT5/yfW25e6mu+3t577Zlf3Hpr3v++971h2+//f3t3HmZXVeZ7/Peu
-fU6NqSmRy6BIUAKI3UTbAeik7fYKBKLGAdRIk5gAfe0LDSrK4AjSfVEG++Jw+5EHUJGhEQiI4ISE
-vsp9EBqugRbkCrTMgQixElJ16uy9117r/nGqKlWVqpOBqtSQ74dnP2fY+6y99knlqYfffvOuu+7S
-kvcukZltdexXamD8GKNe3rRJt932Y33zf/2LvnzOlyb0vPWsfX7tsO9sIr6DHf3XHLffcYeWLF6s
-t7z5TZKkrq4uLT322GHHbNiwQVdc+X099fQzeu3er9HK5cs1Z3aXvPc68/Nf1IeP+aBuvOlmRUkf
-OfYYvf2tb9FXL/6a/tTdrY//w2lavGiRFh91pM76whf1rr95p352++365v/82pjjAgCAsbHcPAAA
-AADMMAML74623XLrj3Tc0o/okEPeroaGsrpmd+m4jy7V2WefMXiML7xWnniSVt10k45btlzmTMd+
-ZOng/rXPP69Pn3mmVv7df9P/XbOmds5RzrVgwWHq3rBBzz2/dtj7z619Ths2vqwFCw7bYuwNGzfo
-H88/X3+7/GM657zzVOnr08ZNL+u4ZctVzaoyZ0rTVMtXnqA0TWXOVM2qOm7Zcm3c9PIWcxg6N5c4
-dXZ26JhjPqA//OEPY15r94ZunXPeeTp+xQp96dwv66X162XOFGLQ8StW6O577tGyFSt1ymmf0DPP
-Plt37qOd43Nf+IJeemm9jv3IUl33g+u36TsY2HfPvffqHz75SX30+OP1qc+cod/9v0fG/LOu365n
-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
-"
- height="575.2182"
- width="747.88147"
- style="opacity:0.84860559"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:#29b1ff;fill-opacity:0.74117641;stroke:none"
- id="rect3930"
- width="171.72594"
- height="58.588848"
- x="-218.44914"
- y="274.89389"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007"
- y="311.82629"
- x="-206.49699"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:20px"
- y="311.82629"
- x="-206.49699"
- id="tspan3009"
- sodipodi:role="line">BlockSliceView</tspan></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3956"
- width="346.48233"
- height="211.12189"
- x="53.787006"
- y="176.9091"
- rx="2.822016"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3956-9"
- width="274.25641"
- height="229.30463"
- x="61.868244"
- y="394.59698"
- rx="2.822016"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -47.228279,307.72385 100.0051,-25.25381"
- id="path3976"
- inkscape:path-effect="#path-effect3978"
- inkscape:original-d="m -47.228279,307.72385 c 2.02031,0 100.0051,-25.25381 100.0051,-25.25381"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -51.773959,327.42183 115.15739,117.1777"
- id="path3976-1"
- inkscape:path-effect="#path-effect3978-9"
- inkscape:original-d="m -51.773959,327.42183 c 10e-6,2.0203 115.15739,117.1777 115.15739,117.1777"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:none;stroke:#ff0000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect4001"
- width="141.42857"
- height="142.14285"
- x="100.00002"
- y="228.07646"
- rx="2.822016"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:none;stroke:#ff0000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect4003"
- width="29.285715"
- height="30"
- x="128.57143"
- y="443.79074"
- rx="2.822016"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:#29b1ff;fill-opacity:0.74117641;stroke:none"
- id="rect3930-5"
- width="107.44024"
- height="35.017437"
- x="-112.29154"
- y="427.35349"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007-1"
- y="453.57159"
- x="-102.48228"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:20px"
- y="453.57159"
- x="-102.48228"
- id="tspan3009-2"
- sodipodi:role="line">CellView</tspan></text>
- <path
- style="fill:none;stroke:#f30c0c;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -9.9999988,438.79075 109.2857098,-70"
- id="path4029"
- inkscape:path-effect="#path-effect4031"
- inkscape:original-d="m -9.9999988,438.79075 109.2857098,-70"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#f30c0c;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M -9.6428588,438.79075 128.21428,459.50503"
- id="path4029-3"
- inkscape:path-effect="#path-effect4031-2"
- inkscape:original-d="M -9.6428588,438.79075 128.21428,459.50503"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:#29b1ff;fill-opacity:0.74117641;stroke:none"
- id="rect3930-8"
- width="147.48227"
- height="43.436558"
- x="511.89114"
- y="44.074036"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007-4"
- y="73.935371"
- x="522.83313"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:20px"
- y="73.935371"
- x="522.83313"
- id="tspan3009-20"
- sodipodi:role="line">BlockView3D</tspan></text>
- <rect
- style="fill:none;stroke:#f30c0c;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect4078"
- width="274.76151"
- height="242.43661"
- x="430.06882"
- y="182.46495"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 551.28711,184.48524 571.49016,87.510604"
- id="path4080"
- inkscape:path-effect="#path-effect4082"
- inkscape:original-d="M 551.28711,184.48524 C 571.49016,87.510604 571.49016,87.510604 571.49016,87.510604"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:none;stroke:#f30c0c;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="rect4078-7"
- width="290.92395"
- height="226.2742"
- x="419.96729"
- y="432.98276"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- style="fill:#29b1ff;fill-opacity:0.74117641;stroke:none"
- id="rect3930-8-3"
- width="195.96959"
- height="44.446735"
- x="491.68811"
- y="693.35718"
- rx="17.974298"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007-4-3"
- y="723.21851"
- x="502.63013"
- style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:20px"
- y="723.21851"
- x="502.63013"
- id="tspan3009-20-5"
- sodipodi:role="line">QStackedWidget </tspan><tspan
- style="font-size:20px"
- y="748.21851"
- x="502.63013"
- sodipodi:role="line"
- id="tspan4132" /></text>
- <path
- style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 573.5105,659.01202 -6.06092,35.35534"
- id="path4080-4"
- inkscape:path-effect="#path-effect4082-9"
- inkscape:original-d="m 573.5105,659.01202 c 20.20305,-96.97464 -6.06092,35.35534 -6.06092,35.35534"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- x="460.37338"
- y="757.2417"
- id="text4136"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4138"
- x="460.37338"
- y="757.2417"
- style="font-size:14px">one element per BlockSliceView</tspan><tspan
- sodipodi:role="line"
- x="460.37338"
- y="774.7417"
- id="tspan4140"
- style="font-size:14px">added and removed by BlockSliceView's</tspan></text>
- <rect
- style="fill:#29b1ff;fill-opacity:0.74117641;stroke:none"
- id="rect3930-8-3-9"
- width="177.78685"
- height="33.38039"
- x="738.16534"
- y="442.07413"
- rx="12.912149"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007-4-3-8"
- y="463.52557"
- x="746.02576"
- style="font-size:28.73469353px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:14.36734676px"
- y="463.52557"
- x="746.02576"
- id="tspan3009-20-5-7"
- sodipodi:role="line">DisplayPropertiesItem</tspan><tspan
- style="font-size:14.36734676px"
- y="481.48477"
- x="746.02576"
- sodipodi:role="line"
- id="tspan4132-0" /></text>
- <rect
- style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3956-9-6"
- width="274.25641"
- height="16.162479"
- x="433.53494"
- y="460.74411"
- rx="2.822016"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 1538.9674,428.28683 31.8198,-13.13198"
- id="path4187"
- inkscape:path-effect="#path-effect4189"
- inkscape:original-d="m 1538.9674,428.28683 31.8198,-13.13198"
- inkscape:connector-curvature="0"
- transform="translate(-831.42859,44.074036)"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/componentsOverview.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
- x="68.214851"
- y="1474.8357"
- id="text4218"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4220"
- x="68.214851"
- y="1474.8357">Factory for Adaptors</tspan></text>
- <rect
- ry="30.714285"
- rx="27.383551"
- y="1006.3314"
- x="652.96991"
- height="109.09649"
- width="218.19295"
- id="rect4468-1-9"
- style="opacity:0.62151394;fill:#0163ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-1"
- y="1146.5841"
- x="410.86142"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"><tspan
- style="font-size:16px"
- y="1146.5841"
- x="410.86142"
- id="tspan4472-0-7"
- sodipodi:role="line" /></text>
- <text
- sodipodi:linespacing="125%"
- id="text4470-0"
- y="1042.5587"
- x="665.25055"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:16px"
- y="1042.5587"
- x="665.25055"
- id="tspan4472-02"
- sodipodi:role="line">BlockView3D</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
- x="664.73785"
- y="1061.333"
- id="text4218-5"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4220-3"
- x="664.73785"
- y="1061.333">Displays all Blocks</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
- x="968.57141"
- y="1290.8662"
- id="text4294"
- sodipodi:linespacing="125%"
- transform="translate(-831.42859,44.074036)"><tspan
- sodipodi:role="line"
- id="tspan4296"
- x="968.57141"
- y="1290.8662" /></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- x="389.35922"
- y="1292.1515"
- id="text5215-4"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- x="389.35922"
- y="1292.1515"
- id="tspan5221-1">- setBlock()</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
- x="382.87125"
- y="1270.6614"
- id="text4218-5-5"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4220-3-7"
- x="382.87125"
- y="1270.6614">Displays slice of a Block</tspan></text>
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="m 602.88476,1196.698 100,-81.4285"
- id="path4358"
- inkscape:path-effect="#path-effect4360"
- inkscape:original-d="m 602.88476,1196.698 100,-81.4285"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- x="646.45612"
- y="1169.5552"
- id="text4552"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4554"
- x="646.45612"
- y="1169.5552">manages slice </tspan><tspan
- sodipodi:role="line"
- x="646.45612"
- y="1184.5552"
- id="tspan4556">indicators</tspan></text>
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2, 2;stroke-dashoffset:0;marker-end:url(#Arrow1Mend-9)"
- d="m 650.74186,1080.9838 c -15.18673,-2.5627 -31.10809,-0.6006 -45.21823,5.5726 -14.11014,6.1732 -26.35682,16.5346 -34.78177,29.4274 -9.5518,14.6172 -14.0517,31.9868 -16.4285,49.2857 -1.39801,10.1751 -2.11444,20.4437 -2.1429,30.7143"
- id="path4558"
- inkscape:path-effect="#path-effect4560"
- inkscape:original-d="m 650.74186,1080.9838 c 0,0 -62.3156,17.9545 -80,35 -12.4683,12.0178 -13.396,32.236 -16.4285,49.2857 -2.7531,15.4786 -2.1429,30.7143 -2.1429,30.7143"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- x="507.18915"
- y="1096.5288"
- id="text4552-6"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- x="507.18915"
- y="1096.5288"
- id="tspan4556-9">drag&drop</tspan><tspan
- sodipodi:role="line"
- x="507.18915"
- y="1111.5288"
- id="tspan4778">of Blocks</tspan></text>
- <rect
- style="opacity:0.62000002;fill:#0163ff;fill-opacity:0.74117647;stroke:none"
- id="rect3930-8-3-3"
- width="299.51373"
- height="162.48128"
- x="-39.468971"
- y="941.57666"
- rx="11.746741"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text3007-4-3-0"
- y="968.16943"
- x="-26.632668"
- style="font-size:34.83901215px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:17.41950607px"
- y="968.16943"
- x="-26.632668"
- id="tspan3009-20-5-2"
- sodipodi:role="line">QStackedWidget </tspan><tspan
- style="font-size:17.41950607px"
- y="989.94379"
- x="-26.632668"
- sodipodi:role="line"
- id="tspan4132-8" /></text>
- <rect
- ry="20.885389"
- rx="18.620523"
- y="1001.1676"
- x="8.8557816"
- height="87.666382"
- width="225.28905"
- id="rect4468-1-2-0-8"
- style="opacity:0.96414346;fill:#ffe57c;fill-opacity:1;stroke:#000000;stroke-width:0.67995894;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- ry="20.885389"
- rx="18.620523"
- y="994.15991"
- x="0.77001172"
- height="87.666382"
- width="225.28905"
- id="rect4468-1-2-0-2"
- style="opacity:0.96414346;fill:#ffe57c;fill-opacity:1;stroke:#000000;stroke-width:0.67995894;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- ry="20.885389"
- rx="18.620523"
- y="983.60974"
- x="-12.818062"
- height="87.666382"
- width="225.28905"
- id="rect4468-1-2-0"
- style="opacity:0.96414346;fill:#ffe57c;fill-opacity:1;stroke:#000000;stroke-width:0.67995894;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-6"
- y="1014.585"
- x="0.074058332"
- style="font-size:14.98285675px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:13.58408451px"
- y="1014.585"
- x="0.074058332"
- id="tspan4472-0-1"
- sodipodi:role="line">BlockSliceViewProperties.ui</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:9.05605698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- x="7.2215042"
- y="1028.8292"
- id="text4882"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4884"
- x="7.2215042"
- y="1028.8292">TreeView and Slice input</tspan></text>
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="M 365.60218,1216.3382 221.15036,1074.9169"
- id="path4929"
- inkscape:path-effect="#path-effect4931"
- inkscape:original-d="M 365.60218,1216.3382 221.15036,1074.9169"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- x="748.52301"
- y="1186.4062"
- id="text5123"
- sodipodi:linespacing="125%"
- transform="translate(-831.42859,44.074036)"><tspan
- sodipodi:role="line"
- id="tspan5125"
- x="748.52301"
- y="1186.4062" /></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- x="58.638344"
- y="1131.6484"
- id="text4136-3"
- sodipodi:linespacing="125%"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/collaborationDiagram.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- sodipodi:role="line"
- id="tspan4138-4"
- x="58.638344"
- y="1131.6484"
- style="font-size:14px">one element in StackedWidget per BlockSliceView</tspan><tspan
- sodipodi:role="line"
- x="58.638344"
- y="1149.1484"
- id="tspan4140-9"
- style="font-size:14px">added and removed by BlockSliceView's</tspan></text>
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1778.4917"
- x="378.22305"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4"
- y="1811.8267"
- x="402.46671"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:16px"
- y="1811.8267"
- x="402.46671"
- id="tspan4472-0-8-7"
- sodipodi:role="line">DisplayAdaptor</tspan></text>
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1877.4203"
- x="378.5802"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3-6"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4-2"
- y="1911.4695"
- x="385.681"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:16px"
- y="1911.4695"
- x="385.681"
- id="tspan4472-0-8-7-2"
- sodipodi:role="line">FieldDisplayAdaptor</tspan></text>
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1987.1542"
- x="288.80066"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3-6-0"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4-2-2"
- y="2021.2034"
- x="295.90146"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:12px"
- y="2021.2034"
- x="295.90146"
- id="tspan4472-0-8-7-2-3"
- sodipodi:role="line">ScalarFieldDisplayAdaptor</tspan></text>
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1987.5936"
- x="481.966"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3-6-8"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1983.553"
- x="682.03778"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3-6-1"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4-2-2-8"
- y="2020.0087"
- x="496.36935"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:12px"
- y="2020.0087"
- x="496.36935"
- id="tspan4472-0-8-7-2-3-9"
- sodipodi:role="line">PdfFieldDisplayAdaptor</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4-2-2-3"
- y="2016.6823"
- x="690.72687"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:12px"
- y="2016.6823"
- x="690.72687"
- id="tspan4472-0-8-7-2-3-1"
- sodipodi:role="line">FlagFieldDisplayAdaptor</tspan></text>
- <rect
- ry="29.818752"
- rx="27.383551"
- y="1988.8229"
- x="87.791115"
- height="59.637505"
- width="176.31259"
- id="rect4468-1-2-3-6-1-5"
- style="opacity:0.62151394;fill:#0198ff;fill-opacity:0.74117641;stroke:none"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <text
- sodipodi:linespacing="125%"
- id="text4470-6-0-4-2-2-3-7"
- y="2021.9521"
- x="96.480202"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Adobe Helvetica"
- xml:space="preserve"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876"><tspan
- style="font-size:12px"
- y="2021.9521"
- x="96.480202"
- id="tspan4472-0-8-7-2-3-1-6"
- sodipodi:role="line">VectorFieldDisplayAdaptor</tspan></text>
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="m 451.412,1876.6451 -0.51018,-37.4869"
- id="path4358-6"
- inkscape:path-effect="#path-effect4360-1"
- inkscape:original-d="m 451.412,1876.6451 -0.51018,-37.4869"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="M 156.95253,1990.2873 384.73682,1930.072"
- id="path4358-68"
- inkscape:path-effect="#path-effect4360-3"
- inkscape:original-d="M 156.95253,1990.2873 384.73682,1930.072"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="m 369.58964,1987.2568 66.15989,-50.6188"
- id="path4358-5"
- inkscape:path-effect="#path-effect4360-6"
- inkscape:original-d="m 369.58964,1987.2568 66.15989,-50.6188"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="m 569.59984,1987.7619 -59.6041,-50.6188"
- id="path4358-3"
- inkscape:path-effect="#path-effect4360-8"
- inkscape:original-d="m 569.59984,1987.7619 -59.6041,-50.6188"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend-9)"
- d="M 743.85116,1984.7315 544.34093,1930.5771"
- id="path4358-7"
- inkscape:path-effect="#path-effect4360-0"
- inkscape:original-d="M 743.85116,1984.7315 544.34093,1930.5771"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/bauer/devel/walberla/src/gui/adaptors.png"
- inkscape:export-xdpi="79.377876"
- inkscape:export-ydpi="79.377876" />
- </g>
-</svg>
diff --git a/src/gui/screenshot.png b/src/gui/screenshot.png
deleted file mode 100644
index b0f68b8099a1c7e1a1fdbc5c34d7a95e7e869182..0000000000000000000000000000000000000000
Binary files a/src/gui/screenshot.png and /dev/null differ
diff --git a/src/lbm/CMakeLists.txt b/src/lbm/CMakeLists.txt
index 829e0505b5ff2d832c87aac94e39f93e1d3961b9..3e25741538b33d957116627c73edc84f21ecab68 100644
--- a/src/lbm/CMakeLists.txt
+++ b/src/lbm/CMakeLists.txt
@@ -14,7 +14,6 @@ target_link_libraries( lbm
domain_decomposition
field
geometry
- gui
stencil
timeloop
vtk
@@ -35,7 +34,6 @@ add_subdirectory( communication )
add_subdirectory( field )
add_subdirectory( free_surface )
add_subdirectory( refinement )
-add_subdirectory( gui )
add_subdirectory( boundary )
add_subdirectory( mrt )
add_subdirectory( evaluations )
diff --git a/src/lbm/all.h b/src/lbm/all.h
index dc581a251d6f31ce10032c74ccbf2147a7f90780..ed129cbbb5d7853e174170d1161ce39776cd139b 100644
--- a/src/lbm/all.h
+++ b/src/lbm/all.h
@@ -32,7 +32,6 @@
#include "evaluations/all.h"
#include "field/all.h"
#include "geometry/all.h"
-#include "gui/all.h"
#include "inplace_streaming/all.h"
#include "lattice_model/all.h"
#include "refinement/all.h"
diff --git a/src/lbm/gui/CMakeLists.txt b/src/lbm/gui/CMakeLists.txt
deleted file mode 100644
index 5ab3c5179f6a0d90d90f51e2bf3249c6058965ba..0000000000000000000000000000000000000000
--- a/src/lbm/gui/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-target_sources( lbm
- PRIVATE
- Connection.h
- PdfFieldDisplayAdaptor.impl.h
- PdfFieldDisplayAdaptor.h
- )
diff --git a/src/lbm/gui/Connection.h b/src/lbm/gui/Connection.h
deleted file mode 100644
index d89c6ae68cd573826ad7c0b81fbdc1505c46765e..0000000000000000000000000000000000000000
--- a/src/lbm/gui/Connection.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Connection.h
-//! \ingroup lbm
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "lbm/field/Adaptors.h"
-#include "lbm/field/PdfField.h"
-#include "gui/Gui.h"
-
-
-#ifdef WALBERLA_ENABLE_GUI
-#include "gui/BlockSliceView/ScalarFieldDisplayAdaptor.h"
-#include "gui/BlockSliceView/VectorFieldDisplayAdaptor.h"
-#include "PdfFieldDisplayAdaptor.h"
-#endif
-
-namespace walberla {
-namespace lbm {
-
-
-#ifdef WALBERLA_ENABLE_GUI
-
- namespace internal
- {
- template<typename LatticeModel_T>
- gui::DisplayAdaptor * addAdaptors( const IBlock & block, ConstBlockDataID blockDataID )
- {
- const uint_t stencilSize = LatticeModel_T::Stencil::Size;
- // Pdf fields
- if ( block.isDataOfType< GhostLayerField<real_t, stencilSize > >( blockDataID) )
- return new PdfFieldDisplayAdaptor<GhostLayerField<real_t, stencilSize>, typename LatticeModel_T::Stencil >( blockDataID );
-
- // Pdf fields
- if ( block.isDataOfType< PdfField<LatticeModel_T> >( blockDataID) )
- return new PdfFieldDisplayAdaptor< PdfField<LatticeModel_T>, typename LatticeModel_T::Stencil >( blockDataID );
-
-
- // Field adaptors
- typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor;
- typedef typename lbm::Adaptor<LatticeModel_T>::VelocityVector VelocityVectorAdaptor;
- typedef typename lbm::Adaptor<LatticeModel_T>::StreamMomentumDensityVector MomentumVectorAdaptorStream;
- typedef typename lbm::Adaptor<LatticeModel_T>::CollideMomentumDensityVector MomentumVectorAdaptorCollide;
-
-
- if ( block.isDataOfType< DensityAdaptor >( blockDataID) )
- return new gui::ScalarFieldDisplayAdaptor<DensityAdaptor>( blockDataID );
-
- if ( block.isDataOfType< VelocityVectorAdaptor >( blockDataID) )
- return new gui::VectorFieldDisplayAdaptor<VelocityVectorAdaptor>( blockDataID );
-
- if ( block.isDataOfType< MomentumVectorAdaptorStream >( blockDataID) )
- return new gui::VectorFieldDisplayAdaptor<MomentumVectorAdaptorStream>( blockDataID );
-
- if ( block.isDataOfType< MomentumVectorAdaptorCollide >( blockDataID) )
- return new gui::VectorFieldDisplayAdaptor<MomentumVectorAdaptorCollide>( blockDataID );
-
- return NULL;
- }
- }
-
- template<typename LatticeModel_T>
- void connectToGui( gui::GUI & guiObject )
- {
- guiObject.registerDisplayAdaptorCreator( internal::addAdaptors<LatticeModel_T> );
- }
-#else
-
- template<typename LatticeModel_T>
- void connectToGui( gui::GUI & )
- {
- }
-
-#endif
-
-
-
-} // namespace lbm
-} // namespace walberla
-
-
-
-
-
-
diff --git a/src/lbm/gui/PdfFieldDisplayAdaptor.h b/src/lbm/gui/PdfFieldDisplayAdaptor.h
deleted file mode 100644
index d5460c85f09516662dfddae2097d1b1e2c8404d6..0000000000000000000000000000000000000000
--- a/src/lbm/gui/PdfFieldDisplayAdaptor.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PdfFieldDisplayAdaptor.h
-//! \ingroup lbm
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "gui/BlockSliceView/DisplayPropertiesItem.h"
-#include "gui/BlockSliceView/FieldDisplayAdaptor.h"
-
-#include <type_traits>
-
-
-namespace walberla {
-namespace lbm {
-
-
- //*******************************************************************************************************************
- /*!
- * Class for drawing a slice of a D3Q19 PDF field.
- *
- *
- * \ingroup gui
- *
- */
- //*******************************************************************************************************************
- template<typename field_t, typename stencil_t >
- class PdfFieldDisplayAdaptor : public gui::FieldDisplayAdaptor< field_t >
- {
- public:
-
- PdfFieldDisplayAdaptor( ConstBlockDataID pdfFieldID );
- virtual ~PdfFieldDisplayAdaptor();
-
-
- virtual void addConfigurationItem( QTreeWidgetItem * parentItem );
-
- virtual void draw( QVector<QVector< gui::CellView*> > & grid, int nrOfGhostLayers );
-
- void configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers );
-
- private:
- typedef typename field_t::value_type T;
- static_assert( (std::is_same<T,double>::value || std::is_same<T,float>::value),
- "Only floating point fields are supported" );
-
- using gui::FieldDisplayAdaptor<field_t>::sliceDim_;
- using gui::FieldDisplayAdaptor<field_t>::field_;
- using gui::FieldDisplayAdaptor<field_t>::sliceInterval_;
- using gui::FieldDisplayAdaptor<field_t>::blockDataId_;
-
- gui::DisplayPropertiesItem * displayProperties_;
- };
-
-
-
-
-} // namespace lbm
-} // namespace walberla
-
-
-#include "PdfFieldDisplayAdaptor.impl.h"
diff --git a/src/lbm/gui/PdfFieldDisplayAdaptor.impl.h b/src/lbm/gui/PdfFieldDisplayAdaptor.impl.h
deleted file mode 100644
index 4f5b637cb77393e5d68349bffe4e93ca32a8844a..0000000000000000000000000000000000000000
--- a/src/lbm/gui/PdfFieldDisplayAdaptor.impl.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PdfFieldDisplayAdaptor.impl.h
-//! \ingroup lbm
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "PdfFieldDisplayAdaptor.h"
-
-#include "core/debug/Debug.h"
-
-#include "gui/BlockSliceView/CellView.h"
-
-#include "stencil/D2Q9.h"
-#include "stencil/Directions.h"
-
-
-namespace walberla {
-namespace lbm {
-
- template< typename field_t, typename St>
- PdfFieldDisplayAdaptor<field_t, St>::PdfFieldDisplayAdaptor( ConstBlockDataID scalarFieldID )
- : gui::FieldDisplayAdaptor<field_t>( scalarFieldID ),
- displayProperties_ ( NULL )
- {
- }
-
- template< typename field_t, typename St>
- PdfFieldDisplayAdaptor<field_t, St>::~PdfFieldDisplayAdaptor()
- {
- if ( displayProperties_)
- delete displayProperties_;
- }
-
- template< typename field_t, typename St>
- void PdfFieldDisplayAdaptor<field_t, St>::addConfigurationItem( QTreeWidgetItem * parentItem )
- {
- if ( ! displayProperties_ )
- {
- QStringList options;
- options << "Text";
-
- displayProperties_ = new gui::DisplayPropertiesItem( options, parentItem );
-
- QObject::connect( displayProperties_, SIGNAL( optionChanged() ),
- this, SIGNAL( requestRedraw() ) );
- }
- }
-
-
- template< typename field_t, typename St>
- void PdfFieldDisplayAdaptor<field_t, St>::configure( const IBlock * block, int sliceDim, cell_idx_t sliceValue,
- Vector3<uint_t> & innerSize, cell_idx_t & ghostLayers )
- {
- // Set name of tree item
- WALBERLA_ASSERT_NOT_NULLPTR( displayProperties_ );
- const std::string & name = block->getBlockStorage().getBlockDataIdentifier( blockDataId_ );
- displayProperties_->setText( 0, QString::fromStdString(name) );
-
- gui::FieldDisplayAdaptor<field_t>::configure( block, sliceDim, sliceValue, innerSize, ghostLayers );
- }
-
- template< typename field_t, typename Stencil>
- void PdfFieldDisplayAdaptor<field_t, Stencil>::draw( QVector<QVector< gui::CellView*> > & grid, int nrOfGhostLayers )
- {
- using namespace stencil;
- WALBERLA_ASSERT_GREATER_EQUAL( sliceDim_, 0 );
- WALBERLA_ASSERT_LESS_EQUAL( sliceDim_, 2 );
- WALBERLA_ASSERT_NOT_NULLPTR( displayProperties_ ); // call addConfigurationItem first!
-
- if ( ! displayProperties_->isEnabled() )
- return;
-
- for( auto it = field_->beginSliceXYZ( sliceInterval_ ) ; it != field_t::staticConstEnd; ++it )
- {
- Cell permutedCell = gui::FieldDisplayAdaptor<field_t>::permuteCoordAccordingToSlice( it.cell(), sliceDim_ );
- gui::CellView * cell = grid[ permutedCell.x() + nrOfGhostLayers ] [ permutedCell.y() + nrOfGhostLayers ];
-
- for( auto d = stencil::D2Q9::begin(); d != stencil::D2Q9::end(); ++d )
- {
- auto f = Stencil::idx[ map2Dto3D[sliceDim_][*d] ];
- if ( f == stencil::INVALID_DIR )
- cell->setPDF( *d, 0 );
- else
- cell->setPDF( *d, real_c( it.getF( f ) ) );
- }
- }
-
-
- }
-
-
-
-} // namespace lbm
-} // namespace walberla
-
-
-
diff --git a/src/lbm/gui/all.h b/src/lbm/gui/all.h
deleted file mode 100644
index a89156e85463ac85eab6521f4f4a2924f09f6b0d..0000000000000000000000000000000000000000
--- a/src/lbm/gui/all.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file all.h
-//! \ingroup lbm
-//! \author Christian Godenschwager <christian.godenschwager@fau.de>
-//! \brief Collective header file for module lbm
-//
-//======================================================================================================================
-
-#pragma once
-
-#include "waLBerlaDefinitions.h"
-
-#include "Connection.h"
diff --git a/src/lbm_generated/CMakeLists.txt b/src/lbm_generated/CMakeLists.txt
index 2513a58f2e646025fa86107409058a7576a3f62f..0da224ed7cd5f2921bac3c7fe5ae3b5858d16214 100644
--- a/src/lbm_generated/CMakeLists.txt
+++ b/src/lbm_generated/CMakeLists.txt
@@ -9,7 +9,6 @@ target_link_libraries( lbm_generated
domain_decomposition
field
geometry
- gui
stencil
timeloop
vtk
diff --git a/src/waLBerlaDefinitions.in.h b/src/waLBerlaDefinitions.in.h
index 3fddd25444efca07d819a2ce553331c7b96841b7..2eb38e021025c9767b9d6ea39e1961d5322f0731 100644
--- a/src/waLBerlaDefinitions.in.h
+++ b/src/waLBerlaDefinitions.in.h
@@ -17,7 +17,6 @@
#cmakedefine WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT
// Debugging options
-#cmakedefine WALBERLA_ENABLE_GUI
#cmakedefine WALBERLA_BUILD_WITH_FASTMATH
diff --git a/src/walberla.h b/src/walberla.h
index 7136333e455c37e7b23cb3ade33b55504708d8ed..74d9d0409141c669ebb348db2579474f2d279eba 100644
--- a/src/walberla.h
+++ b/src/walberla.h
@@ -29,7 +29,6 @@
#include "field/all.h"
#include "gather/all.h"
#include "geometry/all.h"
-#include "gui/all.h"
#include "lbm/all.h"
#include "pde/all.h"
#include "pe_coupling/all.h"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b16438de039b01b03a062b79d3589642491416b5..4f9a176befb9d0ad7bcb8ed8ad2344b82cb6b836 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,7 +12,6 @@ add_subdirectory( fft )
add_subdirectory( field )
add_subdirectory( gather )
add_subdirectory( geometry )
-add_subdirectory( gui )
add_subdirectory( lbm )
add_subdirectory( lbm_generated )
add_subdirectory( lbm_mesapd_coupling )
diff --git a/tests/field/CMakeLists.txt b/tests/field/CMakeLists.txt
index b48f4ac79d1a778ccd1cadad910b6fab00a99b36..c45c668aa56b97253ed33e5fa1f42ac9ebf455c5 100644
--- a/tests/field/CMakeLists.txt
+++ b/tests/field/CMakeLists.txt
@@ -37,10 +37,10 @@ waLBerla_execute_test( NAME InterpolationTest )
waLBerla_compile_test( FILES interpolators/FieldInterpolationTest.cpp)
waLBerla_execute_test( NAME FieldInterpolationTest )
-waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS blockforest gui lbm )
+waLBerla_compile_test( FILES adaptors/AdaptorTest.cpp DEPENDS blockforest lbm )
waLBerla_execute_test( NAME AdaptorTest )
-waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS blockforest gui )
+waLBerla_compile_test( FILES FieldGatherTest.cpp DEPENDS blockforest )
waLBerla_execute_test( NAME FieldGatherTest3 COMMAND $<TARGET_FILE:FieldGatherTest> PROCESSES 3 DEPENDS_ON_TARGETS FieldGatherTest )
waLBerla_execute_test( NAME FieldGatherTest1 COMMAND $<TARGET_FILE:FieldGatherTest> PROCESSES 1 DEPENDS_ON_TARGETS FieldGatherTest )
@@ -68,7 +68,7 @@ endif( WALBERLA_BUILD_WITH_MPI )
if( WALBERLA_BUILD_WITH_CODEGEN )
waLBerla_generate_target_from_python(NAME CodegenJacobiCPUGeneratedJacobiKernel FILE codegen/JacobiKernel.py
OUT_FILES JacobiKernel2D.cpp JacobiKernel2D.h JacobiKernel3D.cpp JacobiKernel3D.h )
-waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS gui timeloop CodegenJacobiCPUGeneratedJacobiKernel)
+waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS timeloop CodegenJacobiCPUGeneratedJacobiKernel)
waLBerla_execute_test( NAME CodegenJacobiCPU )
waLBerla_generate_target_from_python(NAME SweepCollectionKernel FILE codegen/SweepCollection.py
@@ -78,12 +78,12 @@ waLBerla_execute_test( NAME SweepCollection )
waLBerla_generate_target_from_python(NAME CodegenPoissonCPUGeneratedKernel FILE codegen/Poisson.py
OUT_FILES Poisson.cpp Poisson.h )
-waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS gui timeloop CodegenPoissonCPUGeneratedKernel)
+waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS timeloop CodegenPoissonCPUGeneratedKernel)
waLBerla_execute_test( NAME CodegenPoissonCPU )
waLBerla_generate_target_from_python(NAME CodeGenMultipleFieldSwaps FILE codegen/MultipleFieldSwaps.py
OUT_FILES MultipleFieldSwaps.cpp MultipleFieldSwaps.h )
-waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS gui timeloop CodeGenMultipleFieldSwaps)
+waLBerla_compile_test( FILES codegen/MultipleFieldSwaps.cpp DEPENDS timeloop CodeGenMultipleFieldSwaps)
waLBerla_execute_test( NAME MultipleFieldSwaps )
waLBerla_generate_target_from_python(NAME CodegenGeneratedCPUFieldPackInfo FILE codegen/GeneratedFieldPackInfoTest.py
diff --git a/tests/field/adaptors/AdaptorTest.cpp b/tests/field/adaptors/AdaptorTest.cpp
index 109c348e344803d4816b1c58e4d3602ebdab4ddd..f18e70498829822ba7163a354129f0d524c1e5e8 100644
--- a/tests/field/adaptors/AdaptorTest.cpp
+++ b/tests/field/adaptors/AdaptorTest.cpp
@@ -30,8 +30,6 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Vector3.h"
-#include "gui/Gui.h"
-
#include "lbm/field/Adaptors.h"
#include "lbm/field/AddToStorage.h"
#include "lbm/field/MacroscopicValueCalculation.h"
@@ -161,10 +159,6 @@ int main( int argc, char ** argv )
writeDensity();
writeVelocity();
- //GUI gui ( timeloop, blocks, argc, argv );
- //gui.run();
-
-
return 0;
}
}
diff --git a/tests/field/codegen/CodegenJacobiCPU.cpp b/tests/field/codegen/CodegenJacobiCPU.cpp
index 6755c687a9ff0496e02c0b776dcc90595b151090..ffac6db84c0c1a477185bbe0593d8d682b03b214 100644
--- a/tests/field/codegen/CodegenJacobiCPU.cpp
+++ b/tests/field/codegen/CodegenJacobiCPU.cpp
@@ -121,7 +121,7 @@ void testJacobi3D()
commScheme.addDataToCommunicate( make_shared<Packing>(fieldID) );
// Create Timeloop
- const uint_t numberOfTimesteps = uint_t(800); // number of timesteps for non-gui runs
+ const uint_t numberOfTimesteps = uint_t(800); // number of timesteps
SweepTimeloop timeloop ( blocks, numberOfTimesteps );
// Registering the sweep
diff --git a/tests/gather/CMakeLists.txt b/tests/gather/CMakeLists.txt
index 5e6ea92033cc7d3d509add8415fb20e738fb7212..1939770dd957a5a3f92fd33f1a1d35008fe7df16 100644
--- a/tests/gather/CMakeLists.txt
+++ b/tests/gather/CMakeLists.txt
@@ -8,11 +8,11 @@
-waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp DEPENDS gui )
+waLBerla_compile_test( FILES MPIGatherSchemeTest.cpp )
waLBerla_execute_test( NAME MPIGatherSchemeTest PROCESSES 7 )
-waLBerla_compile_test( FILES CurveGatherTest.cpp DEPENDS gui )
+waLBerla_compile_test( FILES CurveGatherTest.cpp )
waLBerla_execute_test( NAME CurveGatherTest PROCESSES 4 )
-waLBerla_compile_test( FILES GatherSchemeTest.cpp DEPENDS gui )
+waLBerla_compile_test( FILES GatherSchemeTest.cpp )
waLBerla_execute_test( NAME GatherSchemeTest PROCESSES 4 )
diff --git a/tests/gather/CurveGatherTest.cpp b/tests/gather/CurveGatherTest.cpp
index 362ea0fba6f4f097cec3de0908c6165d64f42018..82c5b8086a5c796cf53308c38a07cb79faf91fcf 100644
--- a/tests/gather/CurveGatherTest.cpp
+++ b/tests/gather/CurveGatherTest.cpp
@@ -32,8 +32,6 @@
#include "field/interpolators/TrilinearInterpolator.h"
-#include "gui/Gui.h"
-
#include "timeloop/SweepTimeloop.h"
@@ -97,10 +95,6 @@ int main( int argc, char ** argv )
gatherScheme.addPackInfo( curvePackInfo );
gatherScheme();
- //SweepTimeloop timeloop( blocks, 10 );
- //GUI gui ( timeloop, blocks, argc, argv );
- //gui.run();
-
return 0;
}
} // namespace walberla
diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt
index fa297777fb0c149ca2f3ebdc7f8eea781c69f302..01ac0cba6f4b9ede6ed85c08ae9a412616f2a39d 100644
--- a/tests/geometry/CMakeLists.txt
+++ b/tests/geometry/CMakeLists.txt
@@ -17,12 +17,12 @@ waLBerla_execute_test( NAME VoxelFileTestLong COMMAND $<TARGET_FILE:VoxelFileTes
set_property( TEST VoxelFileTestLong PROPERTY DEPENDS VoxelFileTest ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
-waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp DEPENDS gui )
+waLBerla_compile_test( FILES ScalarFieldFromBodyTest.cpp )
waLBerla_execute_test( NAME ScalarFieldFromBodyTest )
file( COPY "test.png" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
-waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp DEPENDS gui )
+waLBerla_compile_test( FILES ScalarFieldFromGrayScaleImageTest.cpp )
waLBerla_execute_test( NAME ScalarFieldFromGrayScaleImageTest )
diff --git a/tests/geometry/ScalarFieldFromBodyTest.cpp b/tests/geometry/ScalarFieldFromBodyTest.cpp
index 47d8d8274d32db43343c7984646643e7aef0fe44..11908c1836faa679ed7cac974600cf8d242b530d 100644
--- a/tests/geometry/ScalarFieldFromBodyTest.cpp
+++ b/tests/geometry/ScalarFieldFromBodyTest.cpp
@@ -33,9 +33,6 @@
#include "core/math/Vector3.h"
#include "field/AddToStorage.h"
-
-#include "gui/Gui.h"
-
#include "timeloop/SweepTimeloop.h"
#include <fstream>
@@ -48,9 +45,6 @@ using namespace geometry;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
-const bool useGui = false;
-
-
typedef GhostLayerField<real_t,1> ScalarField;
//======================================================================================================================
@@ -279,14 +273,6 @@ int main( int argc, char ** argv )
ellipsoidTest( *blocks, scalarFieldID, *geometryInitializationManager, *freeSurfaceInitializer );
boxTest ( *blocks, scalarFieldID, *geometryInitializationManager, *freeSurfaceInitializer );
-
- if ( useGui )
- {
- SweepTimeloop timeloop ( blocks, 100 );
- GUI gui ( timeloop, blocks, argc, argv );
- gui.run();
- }
-
return EXIT_SUCCESS;
}
} // namespace walberla
diff --git a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
index ea753bab2ac73d477ed6fbcf29d87ed65de42501..0cb86e1ed0aac2132a2097c0c87faa4e46e72a2a 100644
--- a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
+++ b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
@@ -30,8 +30,6 @@
#include "field/AddToStorage.h"
-#include "gui/Gui.h"
-
#include "timeloop/SweepTimeloop.h"
#include <fstream>
@@ -44,9 +42,6 @@ using namespace geometry;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
-const bool useGui = false;
-
-
int main( int argc, char ** argv )
{
debug::enterTestMode();
@@ -89,14 +84,6 @@ int main( int argc, char ** argv )
cfg.readParameterFile( "sampleImage.dat" );
geometryInitializationManager->init( cfg.getBlock("Geometry") );
-
- if ( useGui )
- {
- SweepTimeloop timeloop ( blocks, 100 );
- GUI gui ( timeloop, blocks, argc, argv );
- gui.run();
- }
-
return EXIT_SUCCESS;
}
}
diff --git a/tests/gpu/CMakeLists.txt b/tests/gpu/CMakeLists.txt
index 18dab47d95569fd7445f0811b100c94cb5315829..7a134adde546521e7dfa3af0c0cd91664253936a 100644
--- a/tests/gpu/CMakeLists.txt
+++ b/tests/gpu/CMakeLists.txt
@@ -18,7 +18,7 @@ waLBerla_execute_test( NAME GPUBlockSelectorCommunicationTest )
waLBerla_compile_test( FILES FieldTransferTest.cpp )
waLBerla_execute_test( NAME FieldTransferTest )
-waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS blockforest timeloop gui )
+waLBerla_compile_test( FILES SimpleKernelTest.cpp Kernels.cu DEPENDS blockforest timeloop )
waLBerla_execute_test( NAME SimpleKernelTest )
waLBerla_compile_test( FILES FieldIndexing3DTest.cpp FieldIndexing3DTest.cu )
@@ -29,19 +29,19 @@ waLBerla_generate_target_from_python(NAME CodegenJacobiGPUGeneratedCudaJacobiKer
OUT_FILES CudaJacobiKernel2D.cu CudaJacobiKernel2D.h
CudaJacobiKernel3D.cu CudaJacobiKernel3D.h)
waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp
- DEPENDS blockforest timeloop gui CodegenJacobiGPUGeneratedCudaJacobiKernel )
+ DEPENDS blockforest timeloop CodegenJacobiGPUGeneratedCudaJacobiKernel )
waLBerla_execute_test( NAME CodegenJacobiGPU )
waLBerla_generate_target_from_python(NAME CodegenPoissonGPUGeneratedKernel FILE codegen/CudaPoisson.py
OUT_FILES PoissonGPU.cu PoissonGPU.h )
-waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS gui gpu timeloop CodegenPoissonGPUGeneratedKernel)
+waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS gpu timeloop CodegenPoissonGPUGeneratedKernel)
waLBerla_execute_test( NAME CodegenPoissonGPU )
# The following tests work only for CUDA enabled MPI
waLBerla_compile_test( FILES communication/CommTest.cpp )
#waLBerla_execute_test( NAME CommTest PROCESSES 2)
-waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS blockforest timeloop gui )
+waLBerla_compile_test( FILES CudaMPI.cpp DEPENDS blockforest timeloop )
#waLBerla_execute_test( NAME CudaMPI )
waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS blockforest timeloop )
diff --git a/tests/gpu/CudaMPI.cpp b/tests/gpu/CudaMPI.cpp
index 20cee24788dd92888563c16a25b8fdf7bed07e90..2772d30eba4c817dd77b7479916649f44f3fa99f 100644
--- a/tests/gpu/CudaMPI.cpp
+++ b/tests/gpu/CudaMPI.cpp
@@ -33,8 +33,6 @@
#include "field/AddToStorage.h"
#include "timeloop/SweepTimeloop.h"
-#include "gui/Gui.h"
-
using namespace walberla;
@@ -81,7 +79,7 @@ void fullFieldTransfer()
}
-void blockStorageAndGui( int argc, char ** argv )
+void withBlockStorage()
{
shared_ptr< StructuredBlockForest > blocks = blockforest::createUniformBlockGrid(
uint_c(1) , uint_c(1), uint_c(1), // number of blocks in x,y,z direction
@@ -125,9 +123,7 @@ void blockStorageAndGui( int argc, char ** argv )
}
SweepTimeloop timeloop( blocks, 4 );
- GUI gui( timeloop, blocks, argc, argv );
- gui.run();
-
+ timeloop.run();
}
@@ -137,8 +133,7 @@ int main( int argc, char ** argv )
walberla::Environment walberlaEnv( argc, argv );
fullFieldTransfer();
- //blockStorageAndGui(argc, argv);
-
+ withBlockStorage();
return 0;
}
diff --git a/tests/gui/CMakeLists.txt b/tests/gui/CMakeLists.txt
deleted file mode 100644
index 950954a17b2e2fdc78043beea7b27974a3910bf1..0000000000000000000000000000000000000000
--- a/tests/gui/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-###################################################################################################
-#
-# Tests for gui module
-#
-###################################################################################################
-
-waLBerla_compile_test( FILES SimpleGuiRun.cpp )
-waLBerla_compile_test( FILES GuiPdfView.cpp )
-
-#waLBerla_execute_test(NAME SimpleGuiRun )
diff --git a/tests/gui/GuiPdfView.cpp b/tests/gui/GuiPdfView.cpp
deleted file mode 100644
index 279db04f82961d69ba4c9dc8ccc1663dfdd4446f..0000000000000000000000000000000000000000
--- a/tests/gui/GuiPdfView.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file GuiPdfView.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "gui/Gui.h"
-
-#include "blockforest/Initialization.h"
-
-#include "core/Environment.h"
-#include "core/debug/TestSubsystem.h"
-#include "core/math/Vector3.h"
-
-#include "field/AddToStorage.h"
-
-#include "stencil/D3Q19.h"
-
-#include "timeloop/SweepTimeloop.h"
-
-
-namespace walberla {
-
-
-typedef GhostLayerField<real_t,19> PdfField;
-typedef GhostLayerField<real_t,1> ScalarField;
-typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
-using FField = FlagField<walberla::uint32_t>;
-
-
-int main(int argc, char **argv)
-{
- walberla::Environment env( argc, argv );
-
- const uint_t cells [] = { 1,1,1 };
- const uint_t blockCount [] = { 1, 1,1 };
- const uint_t nrOfTimeSteps = 20;
-
- // Create BlockForest
- auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
- cells[0],cells[1],cells[2], //cells
- 1, //dx
- false, //one block per process
- true,true,true); //periodicity
-
-
- // In addition to the normal GhostLayerField's we allocated additionally a field containing the whole global simulation domain for each block
- // we can then check if the GhostLayer communication is correct, by comparing the small field to the corresponding part of the big field
- BlockDataID pdfField = field::addToStorage<PdfField>( blocks, "Src" );
-
- // Init src field with some values
- for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) // block loop
- {
- // Init PDF field
- PdfField * src = blockIt->getData<PdfField>(pdfField);
- for( auto cellIt = src->beginWithGhostLayerXYZ(); cellIt != src->end(); ++cellIt ) // over all x,y,z,f
- {
- for( auto d = stencil::D3Q19::begin(); d != stencil::D3Q19::end(); ++d )
- cellIt.getF( d.toIdx() ) = real_c( d.toIdx() );
- }
-
- }
-
- // Create TimeLoop
- SweepTimeloop timeloop (blocks, nrOfTimeSteps );
-
- GUI gui (timeloop, blocks, argc, argv);
- gui.run();
- //timeloop.singleStep();
- return EXIT_SUCCESS;
-}
-} // namespace walberla
-
-int main( int argc, char* argv[] )
-{
- return walberla::main( argc, argv );
-}
\ No newline at end of file
diff --git a/tests/gui/SimpleGuiRun.cpp b/tests/gui/SimpleGuiRun.cpp
deleted file mode 100644
index 36ca045c43a9cecee878925fb5f5be0aec0cc73d..0000000000000000000000000000000000000000
--- a/tests/gui/SimpleGuiRun.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla is free software: you can
-// redistribute it and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// waLBerla is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file SimpleGuiRun.cpp
-//! \ingroup gui
-//! \author Martin Bauer <martin.bauer@fau.de>
-//
-//======================================================================================================================
-
-#include "gui/Gui.h"
-
-#include "blockforest/Initialization.h"
-#include "blockforest/communication/UniformBufferedScheme.h"
-
-#include "core/Environment.h"
-#include "core/debug/TestSubsystem.h"
-#include "core/math/Vector3.h"
-
-#include "field/AddToStorage.h"
-#include "field/communication/PackInfo.h"
-
-#include "lbm/field/AddToStorage.h"
-#include "lbm/gui/Connection.h"
-#include "lbm/lattice_model/CollisionModel.h"
-#include "lbm/lattice_model/D3Q19.h"
-
-#include "stencil/D3Q19.h"
-
-#include "timeloop/SweepTimeloop.h"
-
-
-namespace walberla {
-
-typedef GhostLayerField<real_t,19> PdfField;
-typedef GhostLayerField<real_t,1> ScalarField;
-typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
-using FField = FlagField<walberla::uint32_t>;
-
-using LatticeModel = lbm::D3Q19<lbm::collision_model::SRT>;
-
-
-int main(int argc, char **argv )
-{
- walberla::Environment env( argc, argv );
-
- const uint_t cells [] = { 6,5,3 };
- const uint_t blockCount [] = { 4, 3,2 };
- const uint_t nrOfTimeSteps = 20;
-
- // Create BlockForest
- auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
- cells[0],cells[1],cells[2], //cells
- 1, //dx
- false, //one block per process
- true,true,true); //periodicity
-
- LatticeModel latticeModel( lbm::collision_model::SRT(1.5 ) );
-
- // In addition to the normal GhostLayerField's we allocated additionally a field containing the whole global simulation domain for each block
- // we can then check if the GhostLayer communication is correct, by comparing the small field to the corresponding part of the big field
-
- BlockDataID pdfField = lbm::addPdfFieldToStorage( blocks, "PdfField", latticeModel );
-
- BlockDataID scalarField1 = field::addToStorage<ScalarField>( blocks, "ScalarFieldOneGl", real_t(0), field::fzyx, 1 );
- BlockDataID scalarField2 = field::addToStorage<ScalarField>( blocks, "ScalarFieldTwoGl", real_t(0), field::fzyx, 2 );
- BlockDataID vectorField = field::addToStorage<VectorField>( blocks, "VectorField", Vector3<real_t>(0,0,0) );
- BlockDataID flagField = field::addFlagFieldToStorage<FField>( blocks, "FlagField" );
-
-
- // Init src field with some values
- for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) // block loop
- {
- // Init PDF field
- PdfField * src = blockIt->getData<PdfField>(pdfField);
- for( auto cellIt = src->begin(); cellIt != src->end(); ++cellIt ) // over all x,y,z,f
- {
- Cell cell ( cellIt.x(), cellIt.y(), cellIt.z() );
- blocks->transformBlockLocalToGlobalCell(cell, *blockIt);
- *cellIt = real_c( ( cell[0] + cell[1] + cell[2] + cellIt.f() ) % cell_idx_t(42) );
- }
-
- // Init scalarField1
- ScalarField * sf = blockIt->getData<ScalarField> ( scalarField1 );
- for( auto cellIt = sf->beginWithGhostLayer(); cellIt != sf->end(); ++cellIt ) // over all x,y,z
- {
- Cell cell ( cellIt.x(), cellIt.y(), cellIt.z() );
- blocks->transformBlockLocalToGlobalCell(cell, *blockIt);
- *cellIt = real_c( ( cell[0] + cell[1] + cell[2] ) % cell_idx_t(42) );
- }
-
- // Init scalarField2
- sf = blockIt->getData<ScalarField> ( scalarField2 );
- for( auto cellIt = sf->beginWithGhostLayer(); cellIt != sf->end(); ++cellIt ) // over all x,y,z
- {
- Cell cell ( cellIt.x(), cellIt.y(), cellIt.z() );
- blocks->transformBlockLocalToGlobalCell(cell, *blockIt);
- *cellIt = real_c( ( cell[0] + cell[1] + cell[2] ) % cell_idx_t(42) );
- }
-
- // Init vector field
- VectorField * vf = blockIt->getData<VectorField> ( vectorField );
- for ( auto cellIt = vf->beginWithGhostLayer(); cellIt != vf->end(); ++cellIt )
- {
- Cell cell ( cellIt.x(), cellIt.y(), cellIt.z() );
- blocks->transformBlockLocalToGlobalCell(cell, *blockIt);
- *cellIt = Vector3<real_t>( real_c(cell[0]), real_c(cell[1]), real_c(cell[2]) );
- }
-
- // Init Flag field
- FField * ff = blockIt->getData<FField> ( flagField );
- auto flag1 = ff->registerFlag( "AFlag 1" );
- auto flag2 = ff->registerFlag( "BFlag 2" );
- for ( auto cellIt = ff->beginWithGhostLayer(); cellIt != ff->end(); ++cellIt )
- {
- Cell cell ( cellIt.x(), cellIt.y(), cellIt.z() );
- blocks->transformBlockLocalToGlobalCell( cell, *blockIt );
- if ( ( cell[0] + cell[1] + cell[2] ) % 2 )
- addFlag( cellIt, flag1);
- else
- addFlag( cellIt, flag2);
- }
-
- }
-
- // Create TimeLoop
- SweepTimeloop timeloop (blocks, nrOfTimeSteps );
-
- GUI gui (timeloop, blocks, argc, argv);
- lbm::connectToGui<LatticeModel>( gui );
- gui.run();
- //timeloop.singleStep();
- return EXIT_SUCCESS;
-}
-}// namespace walberla
-
-
-int main(int argc, char **argv){
- return walberla::main( argc, argv );
-}
-
-
-
-
diff --git a/tests/lbm/CMakeLists.txt b/tests/lbm/CMakeLists.txt
index bb8d6dd57faf11a0e0bf97523190bd2da8b39e46..76a38b81119c2673d8d4ca251737b4e087ede2c9 100644
--- a/tests/lbm/CMakeLists.txt
+++ b/tests/lbm/CMakeLists.txt
@@ -36,7 +36,7 @@ waLBerla_execute_test( NAME DiffusionDirichletTest1 COMMAND $<TARGET_FILE:Diffus
waLBerla_execute_test( NAME DiffusionDirichletTest2 COMMAND $<TARGET_FILE:DiffusionDirichlet> -l 16 -w 1 -o 1.79 -v 0.05 -e 0.295170 -t 100 )
-waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS field blockforest timeloop vtk gui postprocessing)
+waLBerla_compile_test( FILES DiffusionTest.cpp DEPENDS field blockforest timeloop vtk postprocessing)
waLBerla_execute_test( NAME DiffusionTestCorr COMMAND $<TARGET_FILE:DiffusionTest> -c 1 -dx 0.01 -dt 0.002 -d 0.005 -v 5 -err 0.0025 DEPENDS_ON_TARGETS DiffusionTest )
waLBerla_execute_test( NAME DiffusionTestNone COMMAND $<TARGET_FILE:DiffusionTest> -c 0 -dx 0.01 -dt 0.002 -d 0.005 -v 5 -err 0.0040 DEPENDS_ON_TARGETS DiffusionTest )
diff --git a/tests/lbm/DiffusionTest.cpp b/tests/lbm/DiffusionTest.cpp
index e834fb0626fdbdf74d40eebe5cb455313ce4bf7a..3360dc5a609538f8673fc56e75e380b875e8d9a7 100644
--- a/tests/lbm/DiffusionTest.cpp
+++ b/tests/lbm/DiffusionTest.cpp
@@ -42,7 +42,6 @@
#include "lbm/field/AddToStorage.h"
#include "lbm/field/MacroscopicValueCalculation.h"
#include "lbm/field/PdfField.h"
-#include "lbm/gui/Connection.h"
#include "lbm/lattice_model/D3Q19.h"
#include "lbm/sweeps/CellwiseSweep.h"
#include "lbm/vtk/Density.h"
@@ -73,8 +72,6 @@
#include "field/communication/PackInfo.h"
#include "field/iterators/FieldPointer.h"
-#include "gui/Gui.h"
-
#include "timeloop/SweepTimeloop.h"
#include "vtk/VTKOutput.h"
@@ -191,7 +188,6 @@ int run( int argc, char **argv )
real_t u_in = real_t( 1 );
uint_t dim = uint_t( 2u );
- bool useGui = false;
bool useVTK = false;
bool quiet = false;
@@ -207,7 +203,6 @@ int run( int argc, char **argv )
else if( std::string(argv[i]) == "-v" ) u_in = stringToNum<real_t>( args[++i] );
else if( std::string(argv[i]) == "-t" ) time = stringToNum<real_t>( args[++i] );
else if( std::string(argv[i]) == "-err" ) err = stringToNum<real_t>( args[++i] );
- else if( std::string(argv[i]) == "--gui" ) useGui = true;
else if( std::string(argv[i]) == "--quiet" ) quiet = true;
else if( std::string(argv[i]) == "--vtk" ) useVTK = true;
else if( std::string(argv[i]) == "-c" ) ++i;
@@ -296,17 +291,7 @@ int run( int argc, char **argv )
// --- run timeloop --- //
- if ( useGui )
- {
- field::addFieldAdaptor< typename lbm::Adaptor<AdvDiffLatticeModel>::Density> ( blockStorage, srcFieldID, "E" );
- field::addFieldAdaptor< typename lbm::Adaptor<AdvDiffLatticeModel>::StreamMomentumDensityVector>( blockStorage, srcFieldID, "j" );
-
- GUI gui ( timeloop, blockStorage, argc, argv );
- lbm::connectToGui<AdvDiffLatticeModel>( gui );
-
- gui.run();
- }
- else if( !quiet )
+ if( !quiet )
{
WcTimingPool timeloopTiming;
timeloop.run( timeloopTiming );
diff --git a/tests/lbm/boundary/DiffusionDirichlet.cpp b/tests/lbm/boundary/DiffusionDirichlet.cpp
index a8c3348f8827fc9d8c38416f3f9040b4b9e09608..5a7b86c6e3a957449ddfae2ed544d8eca893b6b6 100644
--- a/tests/lbm/boundary/DiffusionDirichlet.cpp
+++ b/tests/lbm/boundary/DiffusionDirichlet.cpp
@@ -40,7 +40,6 @@
#include "lbm/field/Adaptors.h"
#include "lbm/field/AddToStorage.h"
#include "lbm/field/PdfField.h"
-#include "lbm/gui/Connection.h"
#include "lbm/lattice_model/D3Q19.h"
#include "lbm/sweeps/CellwiseSweep.h"
#include "lbm/vtk/Density.h"
@@ -71,8 +70,6 @@
#include "field/iterators/FieldPointer.h"
#include "field/vtk/VTKWriter.h"
-#include "gui/Gui.h"
-
#include "geometry/initializer/BoundaryFromDomainBorder.h"
#include "stencil/D3Q19.h"
@@ -216,7 +213,6 @@ int main( int argc, char **argv )
uint_t time = uint_t( 50u );
real_t error = real_t( 0.1 );
- bool useGui = false;
bool useVTK = false;
// --- read arguments --- //
@@ -229,7 +225,6 @@ int main( int argc, char **argv )
else if( std::string(argv[i]) == "-v" ) velx = stringToNum<real_t>( args[++i] );
else if( std::string(argv[i]) == "-t" ) time = stringToNum<uint_t>( args[++i] );
else if( std::string(argv[i]) == "-e" ) error = stringToNum<real_t>( args[++i] );
- else if( std::string(argv[i]) == "--gui" ) useGui = true;
else if( std::string(argv[i]) == "--vtk" ) useVTK = true;
else if( argv[i][0] != '-' ){
WALBERLA_ABORT( "Usage: --option or -option value" );
@@ -270,24 +265,12 @@ int main( int argc, char **argv )
timeloop.add() << Sweep( makeSharedSweep( lbm::makeCellwiseAdvectionDiffusionSweep< LM, VectorField, MyFlagField >(
srcFieldID, velFieldID, flagFieldID, getFluidFlag() ) ), "LBM_SRT" );
- if( useGui )
- {
- field::addFieldAdaptor< lbm::Adaptor< LM >::Density >( blockStorage, srcFieldID, "E" );
- field::addFieldAdaptor< lbm::Adaptor< LM >::StreamMomentumDensityVector >( blockStorage, srcFieldID, "j" );
+ timeloop.run();
- GUI gui( timeloop, blockStorage, argc, argv );
- lbm::connectToGui<LM>( gui );
- gui.run();
- }
- else
- {
- timeloop.run();
+ TestSweep ts(srcFieldID, omega, velx, error);
+ for (auto block = blockStorage->begin(); block != blockStorage->end(); ++block)
+ ts(block.get());
- TestSweep ts( srcFieldID, omega, velx, error );
- for( auto block = blockStorage->begin(); block != blockStorage->end(); ++block )
- ts( block.get() );
- }
-
if( useVTK )
{
auto vtkOut = vtk::createVTKOutput_BlockData( *blockStorage, "fields", uint_t(1u), uint_t(0u), false, "vtk_out/DiffusionDirichlet" );
diff --git a/tests/lbm/codegen/FluctuatingMRT.prm b/tests/lbm/codegen/FluctuatingMRT.prm
index fbacd24099274a9edc5adc2d486e55298158ece4..dc64b474d80495bb2e46fe761027504282d52243 100644
--- a/tests/lbm/codegen/FluctuatingMRT.prm
+++ b/tests/lbm/codegen/FluctuatingMRT.prm
@@ -4,7 +4,6 @@ Parameters
omega 0.5;
timesteps 2;
- useGui 0;
remainingTimeLoggerFrequency 3; // in seconds
}
diff --git a/tests/lbm/codegen/LbCodeGenerationExample.cpp b/tests/lbm/codegen/LbCodeGenerationExample.cpp
index 99087e897c3b9db25ac7524cf95cd6e12a666ec1..ea355e46dc1132041a9c69052278d3c9d77155c2 100644
--- a/tests/lbm/codegen/LbCodeGenerationExample.cpp
+++ b/tests/lbm/codegen/LbCodeGenerationExample.cpp
@@ -28,12 +28,9 @@
#include "geometry/all.h"
-#include "gui/all.h"
-
#include "lbm/communication/PdfFieldPackInfo.h"
#include "lbm/field/AddToStorage.h"
#include "lbm/field/PdfField.h"
-#include "lbm/gui/Connection.h"
#include "lbm/vtk/VTKOutput.h"
#include "timeloop/all.h"
@@ -120,20 +117,7 @@ int main(int argc, char** argv)
lbm::VTKOutput< LatticeModel_T, FlagField_T >::addToTimeloop(timeloop, blocks, walberlaEnv.config(), pdfFieldId,
flagFieldId, fluidFlagUID);
- // create adaptors, so that the GUI also displays density and velocity
- // adaptors are like fields with the difference that they do not store values
- // but calculate the values based on other fields ( here the PdfField )
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::Density >(blocks, pdfFieldId, "DensityAdaptor");
- field::addFieldAdaptor< lbm::Adaptor< LatticeModel_T >::VelocityVector >(blocks, pdfFieldId, "VelocityAdaptor");
-
- if (parameters.getParameter< bool >("useGui", false))
- {
- GUI gui(timeloop, blocks, argc, argv);
- lbm::connectToGui< LatticeModel_T >(gui);
- gui.run();
- }
- else
- timeloop.run();
+ timeloop.run();
return EXIT_SUCCESS;
}
diff --git a/tests/lbm/codegen/LbCodeGenerationExample.prm b/tests/lbm/codegen/LbCodeGenerationExample.prm
index f233188ac5195c7db2fa835c66e1d15ebcfb5011..df3e4ce4fce1d9e0acb7284af41b4019ad9d4a2a 100644
--- a/tests/lbm/codegen/LbCodeGenerationExample.prm
+++ b/tests/lbm/codegen/LbCodeGenerationExample.prm
@@ -4,7 +4,6 @@ Parameters
omega 1.8;
timesteps 500;
- useGui 0;
remainingTimeLoggerFrequency 3; // in seconds
}
diff --git a/utilities/bashhelper/source_me.sh b/utilities/bashhelper/source_me.sh
index 1b49bc38a217ef405b854c0c9ef9dd7b92fdb78d..f714ba4500fb88b3e5b9da397a22a8bcb3bb43bd 100644
--- a/utilities/bashhelper/source_me.sh
+++ b/utilities/bashhelper/source_me.sh
@@ -13,7 +13,7 @@
# Insert the following into your .bashrc file and adapt your paths
# export WALBERLA_SOURCE_DIR=/path/to/walberla/sources
# export WALBERLA_BUILD_DIR=/path/to/build/directory
-# export WALBERLA_CMAKE_DEFS="-DCMAKE_BUILD_TYPE=Debug -DWALBERLA_ENABLE_GUI=ON"
+# export WALBERLA_CMAKE_DEFS="-DCMAKE_BUILD_TYPE=Debug"
# source $WALBERLA_SOURCE_DIR/utilities/bashhelper/source_me.sh
#
# Shortcuts: ( all cd* commands take as argument a relative path )