pip v2

qad/cmake/FindQAD.cmake

@@ -96,6 +96,20 @@ foreach(_Q ${_QAD_LIBS})
 	#message(STATUS "Library qad_${_Q}5 (${_QU}) -> ${QAD5_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
 	list(APPEND QT_MULTILIB_LIST qad_${_Q})
 endforeach()
+
+set(_PIQT_LIBS piqt piqt_utils)
+foreach(_Q ${_PIQT_LIBS})
+	foreach(_v ${_QT_VERSIONS_})
+		set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v})
+		if(hasParent)
+			set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+		endif()
+		#message(STATUS "MULTILIB_${_Q}_SUFFIX_Qt${_v} = ${_v}")
+	endforeach()
+	#message(STATUS "Library ${_Q}5 (${_QU}) -> ${QAD5_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
+	list(APPEND QT_MULTILIB_LIST ${_Q})
+endforeach()
+
 foreach(_Q ${_QAD_LIBS})
 	string(TOUPPER ${_Q} _QU)
 	set(_target QAD::${_ITN_${_Q}})

qad/utils/qad_locations.cpp

@@ -3,6 +3,7 @@
 #include <QDirIterator>
 #include <QTranslator>
 #include <QApplication>
+#include <QDebug>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #  include <QStandardPaths>
 #else

qad/utils/qad_locations.h

@@ -21,12 +21,12 @@
 #define QAD_LOCATIONS_H
 
 #include "qad_export.h"
-#include <QDebug>
+#include <QString>
 
 
 namespace QAD {
 
-	enum QAD_EXPORT LocationType {
+	enum LocationType {
 		ltConfig,
 		ltCache,
 	};

qcd_utils/pult/main.cpp

@@ -199,7 +199,7 @@ public:
 	PIHash<Key, T> & clear() {pih_content.clear(); return *this;}
 
 	void swap(PIHash<Key, T> & other) {
-		piSwapBinary<PIVector<PIVector<HashEntry> > >(pih_content, other.pih_content);
+		pih_content.swap(other.pih_content);
 	}
 
 	PIHash<Key, T> & insert(const Key & key, const T & value) {

qglengine/core/glbuffer.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Buffer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glbuffer.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL Buffer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glcubemap.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL CubeTexture
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glcubemap.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL CubeTexture
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glframebuffer.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Framebuffer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glframebuffer.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Framebuffer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glframebuffer_mipmap.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL FramebufferMipmap
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glframebuffer_mipmap.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL FramebufferMipmap
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glmaterial.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Material
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -22,66 +22,6 @@
 
 using namespace QGLEngineShaders;
 
-/*
-bool CubeTexture::create() {
-	//qDebug("create");
-	destroy();
-	glGenTextures(1, &id_);
-	glBindTexture(GL_TEXTURE_CUBE_MAP, id_);
-	glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	//glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
-	//glClearError();
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, format_, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-	//qDebug() << glGetError();
-	changed_ = false;
-	return id_ > 0;
-}
-
-
-void CubeTexture::load() {
-	if (isEmpty()) return;
-	create();
-	if (!path(0).isEmpty()) loadFront(path(0));
-	if (!path(1).isEmpty()) loadBack(path(1));
-	if (!path(2).isEmpty()) loadLeft(path(2));
-	if (!path(3).isEmpty()) loadRight(path(3));
-	if (!path(4).isEmpty()) loadTop(path(4));
-	if (!path(5).isEmpty()) loadBottom(path(5));
-}
-
-
-void CubeTexture::loadFromDirectory(const QString & dir) {
-	QDir d(dir); QFileInfoList sl;
-	sl = d.entryInfoList(QStringList("front.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadFront(sl[0].absoluteFilePath());
-	sl = d.entryInfoList(QStringList("back.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadBack(sl[0].absoluteFilePath());
-	sl = d.entryInfoList(QStringList("left.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadLeft(sl[0].absoluteFilePath());
-	sl = d.entryInfoList(QStringList("right.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadRight(sl[0].absoluteFilePath());
-	sl = d.entryInfoList(QStringList("top.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadTop(sl[0].absoluteFilePath());
-	sl = d.entryInfoList(QStringList("bottom.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) loadBottom(sl[0].absoluteFilePath());
-}
-
-
-void CubeTexture::loadPathesFromDirectory(const QString & dir) {
-	QDir d(dir); QFileInfoList sl;
-	sl = d.entryInfoList(QStringList("front.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[0] = sl[0].absoluteFilePath();
-	sl = d.entryInfoList(QStringList("back.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[1] = sl[0].absoluteFilePath();
-	sl = d.entryInfoList(QStringList("left.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[2] = sl[0].absoluteFilePath();
-	sl = d.entryInfoList(QStringList("right.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[3] = sl[0].absoluteFilePath();
-	sl = d.entryInfoList(QStringList("top.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[4] = sl[0].absoluteFilePath();
-	sl = d.entryInfoList(QStringList("bottom.*"), QDir::Files | QDir::NoDotAndDotDot); if (!sl.isEmpty()) pathes[5] = sl[0].absoluteFilePath();
-}
-*/
-
-
 
 Map::Map() {
 	bitmap_id = 0;

qglengine/core/glmaterial.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Material
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -22,57 +22,6 @@
 #include "glshaders_types.h"
 #include "chunkstream.h"
 
-/*
-class Texture {
-public:
-	Texture(int _width, int _height, const GLenum & _format = GL_RGBA8, const GLenum & _target = GL_TEXTURE_2D) {wid = _width; hei = _height; format_ = _format; target_ = _target; id_ = 0;}
-	bool create() {destroy(); createGLTexture(id_, wid, hei, format_, target_); return id_ > 0;}
-	void destroy() {if (id_ > 0) glDeleteTextures(1, &id_); id_ = 0;}
-	void bind() {if (id_ > 0) glBindTexture(target_, id_);}
-	void release() {glBindTexture(target_, 0);}
-	int width() const {return wid;}
-	int height() const {return hei;}
-	GLenum format() const {return format_;}
-	GLenum target() const {return target_;}
-	GLuint id() const {return id_;}
-private:
-	int wid, hei;
-	GLenum format_, target_;
-	GLuint id_;
-};
-
-
-class CubeTexture {
-public:
-	CubeTexture(int _size, const GLenum & _format = GL_RGBA8) {size = _size; format_ = _format; id_ = 0; changed_ = false; pathes.resize(6);}
-	bool create();
-	void destroy() {if (id_ > 0) glDeleteTextures(1, &id_); id_ = 0;}
-	void bind() {if (changed_) {changed_ = false; create();} if (id_ > 0) glBindTexture(GL_TEXTURE_CUBE_MAP, id_);}
-	void release() {glBindTexture(GL_TEXTURE_CUBE_MAP, 0);}
-	void resize(int _size) {size = _size; changed_ = true;}
-	void loadFromDirectory(const QString & dir);
-	void loadFront(const QString & path) {bind(); pathes[0] = path; createGLTexture(id_, rotateQImageLeft(QImage(path)).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_POSITIVE_X);}
-	void loadBack(const QString & path) {bind(); pathes[1] = path; createGLTexture(id_, rotateQImageRight(QImage(path)).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_NEGATIVE_X);}
-	void loadLeft(const QString & path) {bind(); pathes[2] = path; createGLTexture(id_, QImage(path).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y);}
-	void loadRight(const QString & path) {bind(); pathes[3] = path; createGLTexture(id_, rotateQImage180(QImage(path)).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_POSITIVE_Y);}
-	void loadTop(const QString & path) {bind(); pathes[4] = path; createGLTexture(id_, rotateQImageLeft(QImage(path)).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);}
-	void loadBottom(const QString & path) {bind(); pathes[5] = path; createGLTexture(id_, rotateQImageLeft(QImage(path)).scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), format_, GL_TEXTURE_CUBE_MAP_POSITIVE_Z);}
-	void load();
-	bool isEmpty() const {foreach (const QString & i, pathes) if (!i.isEmpty()) return false; return true;}
-	GLenum format() const {return format_;}
-	void setFormat(GLenum f) {format_ = f; changed_ = true;}
-	GLuint id() const {return id_;}
-	const QString & path(int side) const {return pathes[side];}
-	void setPath(int side, const QString & p) {pathes[side] = p;}
-	void loadPathesFromDirectory(const QString & dir);
-private:
-	bool changed_;
-	int size;
-	GLenum format_;
-	GLuint id_;
-	QVector<QString> pathes;
-};
-*/
 
 class Map {
 public:

qglengine/core/glmesh.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Mesh
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 
 using namespace QGLEngineShaders;
 
-static int _count = 0;
+//static int _count = 0;
 
 Mesh::Mesh(GLenum geom_type_): geom_type(geom_type_),
 		buffer_geom(GL_ARRAY_BUFFER, GL_STATIC_DRAW),

qglengine/core/glmesh.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL Mesh
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glprimitives.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Primitives
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
 #include "glmesh.h"
 
 
-
-
 Mesh * Primitive::plane(float width, float length) {
 	Mesh * ret = new Mesh();
 	QVector<QVector3D> & v(ret->vertices ());

qglengine/core/glprimitives.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Primitives
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glshaders.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLEngineShaders
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glshaders.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLEngineShaders
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glshaders_headers.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLEngineShaders
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glshaders_types.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLEngineShaders
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,6 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "glshaders_types.h"
 
 

qglengine/core/glshaders_types.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLEngineShaders
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/gltexturearray.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Texture2DArray
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/gltexturearray.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL Texture2DArray
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/gltransform.cpp

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL Transform
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -16,9 +16,8 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "gltransform.h"
-//#include <Qt3DCore/private/sqt_p.h>
 
+#include "gltransform.h"
 #include "gltypes.h"
 #include <cmath>
 

qglengine/core/gltransform.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL Transform
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/gltypes.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGLView Types
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/gltypes.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGLView Types
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -128,7 +128,7 @@ inline float randomu() {return float(random()) / RAND_MAX;}
 
 inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());}
 #ifndef PIP_VERSION
-template<typename Type> inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;}
+template<typename T> inline void piSwap(T & f, T & s) {T t(f); f = s; s = t;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);}
 template<typename Type> inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;}

qglengine/core/glvertexobject.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL VertexObject
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/glvertexobject.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL VertexObject
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/hdr.cpp

@@ -1,5 +1,5 @@
 /*
-		QGLView
+	QGL HDR
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/core/hdr_p.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL HDR
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/formats/loader_assimp.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Loader Assimp
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/formats/loader_assimp.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Loader Assimp
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/formats/loader_qgl.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Loader QGL
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/formats/loader_qgl.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Loader QGL
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glcamera.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Camera
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glcamera.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Camera
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/globject.cpp

@@ -1,5 +1,5 @@
 /*
-    GLObjectBase & Light
+	QGL ObjectBase & Light
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 #include "glscene.h"
 #include "glmesh.h"
 #include <chunkstream.h>
-static int _count = 0;
+//static int _count = 0;
 
 ObjectBase::ObjectBase(Mesh * geom, Material * mat) {
 	type_ = glMesh;

qglengine/globject.h

@@ -1,5 +1,5 @@
 /*
-    GLObjectBase & Light
+	QGL ObjectBase & Light
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glrendererbase.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL GLRendererBase
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glrendererbase.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL GLRendererBase
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glscene.cpp

@@ -1,5 +1,5 @@
 /*
-    GLObjectBase & Light
+	QGL Scene
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glscene.h

@@ -1,5 +1,5 @@
 /*
-    GLObjectBase & Light
+	QGL Scene
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/gltexture_manager.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL TextureManager
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/gltexture_manager.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL TextureManager
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/glwidget.cpp

@@ -1,3 +1,21 @@
+/*
+	QGL GLWidget
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "glwidget.h"
 #include "qglview.h"
 #include <QVBoxLayout>

qglengine/glwidget.h

@@ -1,3 +1,21 @@
+/*
+	QGL GLWidget
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 

qglengine/mouse_controller.cpp

@@ -1,5 +1,5 @@
 /*
-	MouseController
+	QGL MouseController
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/mouse_controller.h

@@ -1,5 +1,5 @@
 /*
-	QGLView
+	QGL MouseController
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/openglwindow.cpp

@@ -1,3 +1,21 @@
+/*
+	QGL OpenGLWindow
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "openglwindow.h"
 #include <QCoreApplication>
 #include <QOpenGLContext>

qglengine/openglwindow.h

@@ -1,3 +1,21 @@
+/*
+	QGL OpenGLWindow
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <QWindow>
 #include <QOpenGLExtraFunctions>
 

qglengine/qglview.h

@@ -150,7 +150,6 @@ public:
 	bool isServiceMode() const {return renderer_.edit_mode;}
 	void setServiceMode(bool yes) {renderer_.edit_mode = yes;}
 
-//	void addObject(GLObjectBase & o) {addObject(&o);}
 
 	Scene::SelectionMode selectionMode() const {return scene_->selectionMode();}
 	Qt::MouseButton selectionButton() const {return mouse.selectionButton();}
@@ -219,7 +218,6 @@ private:
 	Camera * camera_, * default_camera;
 	MouseController mouse;
 	QMenu context_menu;
-//	uint cid;
 	QSet<int> keys_;
 	QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_;
 	QTime time, ktm_;

qglengine/qglview_test/main.cpp

@@ -1,5 +1,5 @@
 /*
-    Stanley Designer
+	QGLViewWindow
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/qglview_test/qglview_window.cpp

@@ -1,5 +1,5 @@
 /*
-    Stanley Designer
+	QGLViewWindow
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/qglview_test/qglview_window.h

@@ -1,5 +1,5 @@
 /*
-    Stanley Designer
+	QGLViewWindow
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Renderer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL Renderer
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_base.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererBase
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_base.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererBase
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_material.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererMaterial
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_material.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererMaterial
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_selection.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererSelection
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_selection.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererSelection
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_service.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererService
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/renderer_service.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL RendererService
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/tonemapping_proc.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL TonemappingProc
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/tonemapping_proc.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL TonemappingProc
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -52,7 +52,7 @@ private:
 
 	float frame_max, cur_max;
 	bool need_render_sum, enabled;
-	volatile bool exit_;
+	std::atomic_bool exit_;
 	int timer_tone, timer_delim;
 	Framebuffer fbo_1x1;
 	FramebufferMipmap fbomm;

qglengine/widgets/material_editor.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/material_editor.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/material_map_editor.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialMapEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
 	GNU Lesser General Public License for more details.
 
 	You should have received a copy of the GNU Lesser General Public License
-	along with this programap->  If not, see <http://www.gnu.org/licenses/>.
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "material_map_editor.h"

qglengine/widgets/material_map_editor.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialMapEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/materials_editor.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialsEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/materials_editor.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL MaterialsEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/object_editor.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL ObjectEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/object_editor.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL ObjectEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/primitiveeditor.cpp

@@ -1,3 +1,21 @@
+/*
+	QGL PrimitiveEditor
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "primitiveeditor.h"
 #include "ui_primitiveeditor.h"
 #include <QMetaEnum>

qglengine/widgets/primitiveeditor.h

@@ -1,3 +1,21 @@
+/*
+	QGL PrimitiveEditor
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef PRIMITIVEEDITOR_H
 #define PRIMITIVEEDITOR_H
 

qglengine/widgets/propertyeditor.cpp

@@ -1,3 +1,21 @@
+/*
+	QGL PropertyEditor
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "propertyeditor.h"
 
 

qglengine/widgets/propertyeditor.h

@@ -1,3 +1,21 @@
+/*
+	QGL PropertyEditor
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef PROPERTYEDITOR_H
 #define PROPERTYEDITOR_H
 

qglengine/widgets/scene_tree.cpp

@@ -1,5 +1,5 @@
 /*
-    Stanley Designer
+	QGL SceneTree
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/scene_tree.h

@@ -1,5 +1,5 @@
 /*
-    Stanley Designer
+	QGL SceneTree
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/treewidget_p.h

@@ -1,3 +1,21 @@
+/*
+	QGL SceneTree
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef TREEWIDGET_H
 #define TREEWIDGET_H
 

qglengine/widgets/view_editor.cpp

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL ViewEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglengine/widgets/view_editor.h

@@ -1,5 +1,5 @@
 /*
-    QGLView
+	QGL ViewEditor
 	Ivan Pelipenko peri4ko@yandex.ru
 
 	This program is free software: you can redistribute it and/or modify

qglview/gltypes.h

@@ -127,7 +127,7 @@ inline float randomu() {return float(random()) / RAND_MAX;}
 
 inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());}
 #ifndef PIP_VERSION
-template<typename Type> inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;}
+template<typename T> inline void piSwap(T & f, T & s) {T t(f); f = s; s = t;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;}
 template<typename Type> inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);}
 template<typename Type> inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;}