From c76608abf0419a0767a36c875259f45bb4065216 Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 22 Jul 2020 11:24:42 +0300 Subject: [PATCH 01/13] QGLEngine license --- qglengine/core/glbuffer.cpp | 24 +++---- qglengine/core/glbuffer.h | 2 +- qglengine/core/glcubemap.cpp | 24 +++---- qglengine/core/glcubemap.h | 24 +++---- qglengine/core/glframebuffer.cpp | 24 +++---- qglengine/core/glframebuffer.h | 24 +++---- qglengine/core/glframebuffer_mipmap.cpp | 24 +++---- qglengine/core/glframebuffer_mipmap.h | 24 +++---- qglengine/core/glmaterial.cpp | 84 ++++------------------- qglengine/core/glmaterial.h | 75 ++++---------------- qglengine/core/glmesh.cpp | 26 +++---- qglengine/core/glmesh.h | 2 +- qglengine/core/glprimitives.cpp | 26 ++++--- qglengine/core/glprimitives.h | 24 +++---- qglengine/core/glshaders.cpp | 24 +++---- qglengine/core/glshaders.h | 24 +++---- qglengine/core/glshaders_headers.h | 24 +++---- qglengine/core/glshaders_types.cpp | 25 ++++--- qglengine/core/glshaders_types.h | 24 +++---- qglengine/core/gltexturearray.cpp | 24 +++---- qglengine/core/gltexturearray.h | 2 +- qglengine/core/gltransform.cpp | 5 +- qglengine/core/gltransform.h | 2 +- qglengine/core/gltypes.cpp | 24 +++---- qglengine/core/gltypes.h | 2 +- qglengine/core/glvertexobject.cpp | 24 +++---- qglengine/core/glvertexobject.h | 2 +- qglengine/core/hdr.cpp | 24 +++---- qglengine/core/hdr_p.h | 24 +++---- qglengine/formats/loader_assimp.cpp | 24 +++---- qglengine/formats/loader_assimp.h | 24 +++---- qglengine/formats/loader_qgl.cpp | 24 +++---- qglengine/formats/loader_qgl.h | 24 +++---- qglengine/glcamera.cpp | 22 +++--- qglengine/glcamera.h | 22 +++--- qglengine/globject.cpp | 26 +++---- qglengine/globject.h | 24 +++---- qglengine/glrendererbase.cpp | 24 +++---- qglengine/glrendererbase.h | 2 +- qglengine/glscene.cpp | 24 +++---- qglengine/glscene.h | 24 +++---- qglengine/gltexture_manager.cpp | 24 +++---- qglengine/gltexture_manager.h | 24 +++---- qglengine/glwidget.cpp | 18 +++++ qglengine/glwidget.h | 18 +++++ qglengine/mouse_controller.cpp | 2 +- qglengine/mouse_controller.h | 2 +- qglengine/openglwindow.cpp | 18 +++++ qglengine/openglwindow.h | 18 +++++ qglengine/qglview_test/main.cpp | 24 +++---- qglengine/qglview_test/qglview_window.cpp | 24 +++---- qglengine/qglview_test/qglview_window.h | 24 +++---- qglengine/renderer.cpp | 24 +++---- qglengine/renderer.h | 24 +++---- qglengine/renderer_base.cpp | 24 +++---- qglengine/renderer_base.h | 24 +++---- qglengine/renderer_material.cpp | 24 +++---- qglengine/renderer_material.h | 24 +++---- qglengine/renderer_selection.cpp | 24 +++---- qglengine/renderer_selection.h | 24 +++---- qglengine/renderer_service.cpp | 24 +++---- qglengine/renderer_service.h | 24 +++---- qglengine/tonemapping_proc.cpp | 24 +++---- qglengine/tonemapping_proc.h | 26 +++---- qglengine/widgets/material_editor.cpp | 22 +++--- qglengine/widgets/material_editor.h | 24 +++---- qglengine/widgets/material_map_editor.cpp | 24 +++---- qglengine/widgets/material_map_editor.h | 24 +++---- qglengine/widgets/materials_editor.cpp | 22 +++--- qglengine/widgets/materials_editor.h | 24 +++---- qglengine/widgets/object_editor.cpp | 24 +++---- qglengine/widgets/object_editor.h | 24 +++---- qglengine/widgets/primitiveeditor.cpp | 18 +++++ qglengine/widgets/primitiveeditor.h | 18 +++++ qglengine/widgets/propertyeditor.cpp | 18 +++++ qglengine/widgets/propertyeditor.h | 18 +++++ qglengine/widgets/scene_tree.cpp | 24 +++---- qglengine/widgets/scene_tree.h | 24 +++---- qglengine/widgets/treewidget_p.h | 18 +++++ qglengine/widgets/view_editor.cpp | 24 +++---- qglengine/widgets/view_editor.h | 24 +++---- 81 files changed, 916 insertions(+), 869 deletions(-) diff --git a/qglengine/core/glbuffer.cpp b/qglengine/core/glbuffer.cpp index 2d953a0..cd2b503 100644 --- a/qglengine/core/glbuffer.cpp +++ b/qglengine/core/glbuffer.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Buffer + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/core/glbuffer.h b/qglengine/core/glbuffer.h index 594c028..2cf4c5f 100644 --- a/qglengine/core/glbuffer.h +++ b/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 diff --git a/qglengine/core/glcubemap.cpp b/qglengine/core/glcubemap.cpp index 35e07be..19b8750 100644 --- a/qglengine/core/glcubemap.cpp +++ b/qglengine/core/glcubemap.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL CubeTexture + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "gltypes.h" diff --git a/qglengine/core/glcubemap.h b/qglengine/core/glcubemap.h index 3e59b47..6f5ed5d 100644 --- a/qglengine/core/glcubemap.h +++ b/qglengine/core/glcubemap.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL CubeTexture + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLCUBEMAP_H diff --git a/qglengine/core/glframebuffer.cpp b/qglengine/core/glframebuffer.cpp index 661f3f6..88e5c92 100644 --- a/qglengine/core/glframebuffer.cpp +++ b/qglengine/core/glframebuffer.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Framebuffer + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include diff --git a/qglengine/core/glframebuffer.h b/qglengine/core/glframebuffer.h index 88373a8..cc6549e 100644 --- a/qglengine/core/glframebuffer.h +++ b/qglengine/core/glframebuffer.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Framebuffer + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLFRAMEBUFFER_H diff --git a/qglengine/core/glframebuffer_mipmap.cpp b/qglengine/core/glframebuffer_mipmap.cpp index 592dce6..6a38962 100644 --- a/qglengine/core/glframebuffer_mipmap.cpp +++ b/qglengine/core/glframebuffer_mipmap.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL FramebufferMipmap + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include diff --git a/qglengine/core/glframebuffer_mipmap.h b/qglengine/core/glframebuffer_mipmap.h index ea75b49..1bd9781 100644 --- a/qglengine/core/glframebuffer_mipmap.h +++ b/qglengine/core/glframebuffer_mipmap.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL FramebufferMipmap + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLFRAMEBUFFER_MIPMAP_H diff --git a/qglengine/core/glmaterial.cpp b/qglengine/core/glmaterial.cpp index aebbc05..7afb341 100644 --- a/qglengine/core/glmaterial.cpp +++ b/qglengine/core/glmaterial.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Material + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "gltypes.h" @@ -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; diff --git a/qglengine/core/glmaterial.h b/qglengine/core/glmaterial.h index 00c60ac..661d3dc 100644 --- a/qglengine/core/glmaterial.h +++ b/qglengine/core/glmaterial.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Material + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLMATERIAL_H @@ -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 pathes; -}; -*/ class Map { public: diff --git a/qglengine/core/glmesh.cpp b/qglengine/core/glmesh.cpp index 853cf40..1b2079d 100644 --- a/qglengine/core/glmesh.cpp +++ b/qglengine/core/glmesh.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Mesh + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES @@ -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), diff --git a/qglengine/core/glmesh.h b/qglengine/core/glmesh.h index 2aca7b1..e87f336 100644 --- a/qglengine/core/glmesh.h +++ b/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 diff --git a/qglengine/core/glprimitives.cpp b/qglengine/core/glprimitives.cpp index 076e06d..6f6579b 100644 --- a/qglengine/core/glprimitives.cpp +++ b/qglengine/core/glprimitives.cpp @@ -1,27 +1,25 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Primitives + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "glprimitives.h" #include "glmesh.h" - - Mesh * Primitive::plane(float width, float length) { Mesh * ret = new Mesh(); QVector & v(ret->vertices ()); diff --git a/qglengine/core/glprimitives.h b/qglengine/core/glprimitives.h index c872d3d..7129bb1 100644 --- a/qglengine/core/glprimitives.h +++ b/qglengine/core/glprimitives.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Primitives + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLPRIMITIVE_CUBE_H diff --git a/qglengine/core/glshaders.cpp b/qglengine/core/glshaders.cpp index 948a487..4fff0d2 100644 --- a/qglengine/core/glshaders.cpp +++ b/qglengine/core/glshaders.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLEngineShaders + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "gltypes.h" diff --git a/qglengine/core/glshaders.h b/qglengine/core/glshaders.h index 172aac8..57fc6a9 100644 --- a/qglengine/core/glshaders.h +++ b/qglengine/core/glshaders.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLEngineShaders + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLSHADERS_H diff --git a/qglengine/core/glshaders_headers.h b/qglengine/core/glshaders_headers.h index 17e7eac..dac5c6e 100644 --- a/qglengine/core/glshaders_headers.h +++ b/qglengine/core/glshaders_headers.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLEngineShaders + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLSHADERS_HEADERS_H diff --git a/qglengine/core/glshaders_types.cpp b/qglengine/core/glshaders_types.cpp index 1e383b7..fe57b1b 100644 --- a/qglengine/core/glshaders_types.cpp +++ b/qglengine/core/glshaders_types.cpp @@ -1,22 +1,21 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLEngineShaders + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ - #include "glshaders_types.h" diff --git a/qglengine/core/glshaders_types.h b/qglengine/core/glshaders_types.h index ed742a9..55f44bc 100644 --- a/qglengine/core/glshaders_types.h +++ b/qglengine/core/glshaders_types.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLEngineShaders + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLSHADERS_TYPES_H diff --git a/qglengine/core/gltexturearray.cpp b/qglengine/core/gltexturearray.cpp index 8e27a2b..1149ad6 100644 --- a/qglengine/core/gltexturearray.cpp +++ b/qglengine/core/gltexturearray.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Texture2DArray + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/core/gltexturearray.h b/qglengine/core/gltexturearray.h index a61d0a1..f8b32b7 100644 --- a/qglengine/core/gltexturearray.h +++ b/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 diff --git a/qglengine/core/gltransform.cpp b/qglengine/core/gltransform.cpp index 0294d00..d92ebb7 100644 --- a/qglengine/core/gltransform.cpp +++ b/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 . */ -#include "gltransform.h" -//#include +#include "gltransform.h" #include "gltypes.h" #include diff --git a/qglengine/core/gltransform.h b/qglengine/core/gltransform.h index ea6f1bb..f1e42de 100644 --- a/qglengine/core/gltransform.h +++ b/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 diff --git a/qglengine/core/gltypes.cpp b/qglengine/core/gltypes.cpp index e650acf..22493de 100644 --- a/qglengine/core/gltypes.cpp +++ b/qglengine/core/gltypes.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGLView Types + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "glcamera.h" diff --git a/qglengine/core/gltypes.h b/qglengine/core/gltypes.h index df9e232..5550643 100644 --- a/qglengine/core/gltypes.h +++ b/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 diff --git a/qglengine/core/glvertexobject.cpp b/qglengine/core/glvertexobject.cpp index ce876b9..e4a5437 100644 --- a/qglengine/core/glvertexobject.cpp +++ b/qglengine/core/glvertexobject.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL VertexObject + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/core/glvertexobject.h b/qglengine/core/glvertexobject.h index 0eeb94b..58b0894 100644 --- a/qglengine/core/glvertexobject.h +++ b/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 diff --git a/qglengine/core/hdr.cpp b/qglengine/core/hdr.cpp index c8df1c0..d1e2248 100644 --- a/qglengine/core/hdr.cpp +++ b/qglengine/core/hdr.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL HDR + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "hdr_p.h" diff --git a/qglengine/core/hdr_p.h b/qglengine/core/hdr_p.h index 94de233..f141b84 100644 --- a/qglengine/core/hdr_p.h +++ b/qglengine/core/hdr_p.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL HDR + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef HDR_P_H diff --git a/qglengine/formats/loader_assimp.cpp b/qglengine/formats/loader_assimp.cpp index 06150e1..fe53b77 100644 --- a/qglengine/formats/loader_assimp.cpp +++ b/qglengine/formats/loader_assimp.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Loader Assimp + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "loader_assimp.h" diff --git a/qglengine/formats/loader_assimp.h b/qglengine/formats/loader_assimp.h index 937720f..348c32f 100644 --- a/qglengine/formats/loader_assimp.h +++ b/qglengine/formats/loader_assimp.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Loader Assimp + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef LOADER_ASSIMP_H diff --git a/qglengine/formats/loader_qgl.cpp b/qglengine/formats/loader_qgl.cpp index 7dab8f3..9e04190 100644 --- a/qglengine/formats/loader_qgl.cpp +++ b/qglengine/formats/loader_qgl.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Loader QGL + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "loader_qgl.h" diff --git a/qglengine/formats/loader_qgl.h b/qglengine/formats/loader_qgl.h index 9968798..72aed12 100644 --- a/qglengine/formats/loader_qgl.h +++ b/qglengine/formats/loader_qgl.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Loader QGL + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef LOADER_QGL_H diff --git a/qglengine/glcamera.cpp b/qglengine/glcamera.cpp index 64ebb83..d7dda9a 100644 --- a/qglengine/glcamera.cpp +++ b/qglengine/glcamera.cpp @@ -1,19 +1,19 @@ /* - QGLView + QGL Camera 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "gltypes.h" diff --git a/qglengine/glcamera.h b/qglengine/glcamera.h index 9de1f85..c8743f8 100644 --- a/qglengine/glcamera.h +++ b/qglengine/glcamera.h @@ -1,19 +1,19 @@ /* - QGLView + QGL Camera 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLCAMERA_H diff --git a/qglengine/globject.cpp b/qglengine/globject.cpp index 1a65d18..bad61ee 100644 --- a/qglengine/globject.cpp +++ b/qglengine/globject.cpp @@ -1,19 +1,19 @@ /* - GLObjectBase & Light - Ivan Pelipenko peri4ko@yandex.ru + QGL ObjectBase & Light + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "globject.h" @@ -21,7 +21,7 @@ #include "glscene.h" #include "glmesh.h" #include -static int _count = 0; +//static int _count = 0; ObjectBase::ObjectBase(Mesh * geom, Material * mat) { type_ = glMesh; diff --git a/qglengine/globject.h b/qglengine/globject.h index 52d9bff..bfd9958 100644 --- a/qglengine/globject.h +++ b/qglengine/globject.h @@ -1,19 +1,19 @@ /* - GLObjectBase & Light - Ivan Pelipenko peri4ko@yandex.ru + QGL ObjectBase & Light + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLOBJECT_H diff --git a/qglengine/glrendererbase.cpp b/qglengine/glrendererbase.cpp index 387aebe..edb92b6 100644 --- a/qglengine/glrendererbase.cpp +++ b/qglengine/glrendererbase.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL GLRendererBase + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "glrendererbase.h" diff --git a/qglengine/glrendererbase.h b/qglengine/glrendererbase.h index 74520b2..7076d7a 100644 --- a/qglengine/glrendererbase.h +++ b/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 diff --git a/qglengine/glscene.cpp b/qglengine/glscene.cpp index e83e405..1f51bc7 100644 --- a/qglengine/glscene.cpp +++ b/qglengine/glscene.cpp @@ -1,19 +1,19 @@ /* - GLObjectBase & Light - Ivan Pelipenko peri4ko@yandex.ru + QGL Scene + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "glscene.h" diff --git a/qglengine/glscene.h b/qglengine/glscene.h index d55d331..e9e39c8 100644 --- a/qglengine/glscene.h +++ b/qglengine/glscene.h @@ -1,19 +1,19 @@ /* - GLObjectBase & Light - Ivan Pelipenko peri4ko@yandex.ru + QGL Scene + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLSCENE_H diff --git a/qglengine/gltexture_manager.cpp b/qglengine/gltexture_manager.cpp index 2000ece..fb226b1 100644 --- a/qglengine/gltexture_manager.cpp +++ b/qglengine/gltexture_manager.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL TextureManager + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "gltexture_manager.h" diff --git a/qglengine/gltexture_manager.h b/qglengine/gltexture_manager.h index deea97f..95af8b9 100644 --- a/qglengine/gltexture_manager.h +++ b/qglengine/gltexture_manager.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL TextureManager + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef GLTEXTUREMANAGER_H diff --git a/qglengine/glwidget.cpp b/qglengine/glwidget.cpp index 6cb8d82..921652b 100644 --- a/qglengine/glwidget.cpp +++ b/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 . +*/ + #include "glwidget.h" #include "qglview.h" #include diff --git a/qglengine/glwidget.h b/qglengine/glwidget.h index b101fce..b72265d 100644 --- a/qglengine/glwidget.h +++ b/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 . +*/ + #ifndef GLWIDGET_H #define GLWIDGET_H diff --git a/qglengine/mouse_controller.cpp b/qglengine/mouse_controller.cpp index d59eb44..ddecef9 100644 --- a/qglengine/mouse_controller.cpp +++ b/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 diff --git a/qglengine/mouse_controller.h b/qglengine/mouse_controller.h index 335b810..2c93986 100644 --- a/qglengine/mouse_controller.h +++ b/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 diff --git a/qglengine/openglwindow.cpp b/qglengine/openglwindow.cpp index 3768a84..8b29356 100644 --- a/qglengine/openglwindow.cpp +++ b/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 . +*/ + #include "openglwindow.h" #include #include diff --git a/qglengine/openglwindow.h b/qglengine/openglwindow.h index 82735b7..2110b7c 100644 --- a/qglengine/openglwindow.h +++ b/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 . +*/ + #include #include diff --git a/qglengine/qglview_test/main.cpp b/qglengine/qglview_test/main.cpp index 2bc5a1e..eb43d61 100644 --- a/qglengine/qglview_test/main.cpp +++ b/qglengine/qglview_test/main.cpp @@ -1,19 +1,19 @@ /* - Stanley Designer - Ivan Pelipenko peri4ko@yandex.ru + QGLViewWindow + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include diff --git a/qglengine/qglview_test/qglview_window.cpp b/qglengine/qglview_test/qglview_window.cpp index 2ff876a..a6ac505 100644 --- a/qglengine/qglview_test/qglview_window.cpp +++ b/qglengine/qglview_test/qglview_window.cpp @@ -1,19 +1,19 @@ /* - Stanley Designer - Ivan Pelipenko peri4ko@yandex.ru + QGLViewWindow + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "qglview_window.h" diff --git a/qglengine/qglview_test/qglview_window.h b/qglengine/qglview_test/qglview_window.h index a9c553f..304353f 100644 --- a/qglengine/qglview_test/qglview_window.h +++ b/qglengine/qglview_test/qglview_window.h @@ -1,19 +1,19 @@ /* - Stanley Designer - Ivan Pelipenko peri4ko@yandex.ru + QGLViewWindow + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef QGLVIEWWINDOW_H diff --git a/qglengine/renderer.cpp b/qglengine/renderer.cpp index e4338c0..7aaec3c 100644 --- a/qglengine/renderer.cpp +++ b/qglengine/renderer.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Renderer + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/renderer.h b/qglengine/renderer.h index 8494a7b..d865bbb 100644 --- a/qglengine/renderer.h +++ b/qglengine/renderer.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL Renderer + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef RENDERER_H diff --git a/qglengine/renderer_base.cpp b/qglengine/renderer_base.cpp index 2e5c170..f22c287 100644 --- a/qglengine/renderer_base.cpp +++ b/qglengine/renderer_base.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererBase + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/renderer_base.h b/qglengine/renderer_base.h index d8f78c0..e0f5574 100644 --- a/qglengine/renderer_base.h +++ b/qglengine/renderer_base.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererBase + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef RENDERER_BASE_H diff --git a/qglengine/renderer_material.cpp b/qglengine/renderer_material.cpp index 4622812..0e6c594 100644 --- a/qglengine/renderer_material.cpp +++ b/qglengine/renderer_material.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererMaterial + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/renderer_material.h b/qglengine/renderer_material.h index 0d55d6f..3c08a7b 100644 --- a/qglengine/renderer_material.h +++ b/qglengine/renderer_material.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererMaterial + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef RENDERER_MATERIAL_H diff --git a/qglengine/renderer_selection.cpp b/qglengine/renderer_selection.cpp index 7aca945..00897a7 100644 --- a/qglengine/renderer_selection.cpp +++ b/qglengine/renderer_selection.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererSelection + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/renderer_selection.h b/qglengine/renderer_selection.h index 1d97b0a..9062a18 100644 --- a/qglengine/renderer_selection.h +++ b/qglengine/renderer_selection.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererSelection + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef RENDERER_SELECTION_H diff --git a/qglengine/renderer_service.cpp b/qglengine/renderer_service.cpp index ec75771..e71a183 100644 --- a/qglengine/renderer_service.cpp +++ b/qglengine/renderer_service.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererService + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/renderer_service.h b/qglengine/renderer_service.h index 9171610..c0de71f 100644 --- a/qglengine/renderer_service.h +++ b/qglengine/renderer_service.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL RendererService + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef RENDERER_SERVICE_H diff --git a/qglengine/tonemapping_proc.cpp b/qglengine/tonemapping_proc.cpp index 44956e0..b12b67c 100644 --- a/qglengine/tonemapping_proc.cpp +++ b/qglengine/tonemapping_proc.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL TonemappingProc + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #define GL_GLEXT_PROTOTYPES diff --git a/qglengine/tonemapping_proc.h b/qglengine/tonemapping_proc.h index 55cfb2d..b6f99d5 100644 --- a/qglengine/tonemapping_proc.h +++ b/qglengine/tonemapping_proc.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL TonemappingProc + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef TONEMAPPING_PROC_H @@ -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; diff --git a/qglengine/widgets/material_editor.cpp b/qglengine/widgets/material_editor.cpp index ea6aba1..e6636fe 100644 --- a/qglengine/widgets/material_editor.cpp +++ b/qglengine/widgets/material_editor.cpp @@ -1,18 +1,18 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialEditor + 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 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. + 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 + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ diff --git a/qglengine/widgets/material_editor.h b/qglengine/widgets/material_editor.h index 42067bf..16bc29d 100644 --- a/qglengine/widgets/material_editor.h +++ b/qglengine/widgets/material_editor.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef MATERIAL_EDITOR_H diff --git a/qglengine/widgets/material_map_editor.cpp b/qglengine/widgets/material_map_editor.cpp index 24e9947..3768d82 100644 --- a/qglengine/widgets/material_map_editor.cpp +++ b/qglengine/widgets/material_map_editor.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialMapEditor + 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 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. + 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 programap-> If not, see . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "material_map_editor.h" diff --git a/qglengine/widgets/material_map_editor.h b/qglengine/widgets/material_map_editor.h index eed5d1d..8175247 100644 --- a/qglengine/widgets/material_map_editor.h +++ b/qglengine/widgets/material_map_editor.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialMapEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef MATERIAL_MAP_EDITOR_H diff --git a/qglengine/widgets/materials_editor.cpp b/qglengine/widgets/materials_editor.cpp index f457206..467e613 100644 --- a/qglengine/widgets/materials_editor.cpp +++ b/qglengine/widgets/materials_editor.cpp @@ -1,18 +1,18 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialsEditor + 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 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. + 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 + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ diff --git a/qglengine/widgets/materials_editor.h b/qglengine/widgets/materials_editor.h index 7e17d48..5cd704d 100644 --- a/qglengine/widgets/materials_editor.h +++ b/qglengine/widgets/materials_editor.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL MaterialsEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef MATERIALS_EDITOR_H diff --git a/qglengine/widgets/object_editor.cpp b/qglengine/widgets/object_editor.cpp index b11daec..6507ead 100644 --- a/qglengine/widgets/object_editor.cpp +++ b/qglengine/widgets/object_editor.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL ObjectEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "object_editor.h" diff --git a/qglengine/widgets/object_editor.h b/qglengine/widgets/object_editor.h index a81c358..89311f1 100644 --- a/qglengine/widgets/object_editor.h +++ b/qglengine/widgets/object_editor.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL ObjectEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef OBJECT_EDITOR_H diff --git a/qglengine/widgets/primitiveeditor.cpp b/qglengine/widgets/primitiveeditor.cpp index 4ed22c0..4613004 100644 --- a/qglengine/widgets/primitiveeditor.cpp +++ b/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 . +*/ + #include "primitiveeditor.h" #include "ui_primitiveeditor.h" #include diff --git a/qglengine/widgets/primitiveeditor.h b/qglengine/widgets/primitiveeditor.h index d0e71cb..d91c77f 100644 --- a/qglengine/widgets/primitiveeditor.h +++ b/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 . +*/ + #ifndef PRIMITIVEEDITOR_H #define PRIMITIVEEDITOR_H diff --git a/qglengine/widgets/propertyeditor.cpp b/qglengine/widgets/propertyeditor.cpp index cce7e95..b4c568e 100644 --- a/qglengine/widgets/propertyeditor.cpp +++ b/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 . +*/ + #include "propertyeditor.h" diff --git a/qglengine/widgets/propertyeditor.h b/qglengine/widgets/propertyeditor.h index 6b26b2c..143e32c 100644 --- a/qglengine/widgets/propertyeditor.h +++ b/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 . +*/ + #ifndef PROPERTYEDITOR_H #define PROPERTYEDITOR_H diff --git a/qglengine/widgets/scene_tree.cpp b/qglengine/widgets/scene_tree.cpp index c7078ce..b137d53 100644 --- a/qglengine/widgets/scene_tree.cpp +++ b/qglengine/widgets/scene_tree.cpp @@ -1,19 +1,19 @@ /* - Stanley Designer - Ivan Pelipenko peri4ko@yandex.ru + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "scene_tree.h" diff --git a/qglengine/widgets/scene_tree.h b/qglengine/widgets/scene_tree.h index 5bbf011..bf16a55 100644 --- a/qglengine/widgets/scene_tree.h +++ b/qglengine/widgets/scene_tree.h @@ -1,19 +1,19 @@ /* - Stanley Designer - Ivan Pelipenko peri4ko@yandex.ru + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef SCENE_TREE_H diff --git a/qglengine/widgets/treewidget_p.h b/qglengine/widgets/treewidget_p.h index 7c80f95..18cce4b 100644 --- a/qglengine/widgets/treewidget_p.h +++ b/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 . +*/ + #ifndef TREEWIDGET_H #define TREEWIDGET_H diff --git a/qglengine/widgets/view_editor.cpp b/qglengine/widgets/view_editor.cpp index dabea7f..ab48597 100644 --- a/qglengine/widgets/view_editor.cpp +++ b/qglengine/widgets/view_editor.cpp @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL ViewEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include "view_editor.h" diff --git a/qglengine/widgets/view_editor.h b/qglengine/widgets/view_editor.h index 20573b5..405fa4b 100644 --- a/qglengine/widgets/view_editor.h +++ b/qglengine/widgets/view_editor.h @@ -1,19 +1,19 @@ /* - QGLView - Ivan Pelipenko peri4ko@yandex.ru + QGL ViewEditor + 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 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. + 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 . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #ifndef VIEW_EDITOR_H From 2251caf12c60e9e9edc670c0f9aed4e80091ba62 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 23 Jul 2020 17:14:22 +0300 Subject: [PATCH 02/13] clean qglengine/qglview.h --- qglengine/qglview.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/qglengine/qglview.h b/qglengine/qglview.h index d3d72f6..8f4d40e 100644 --- a/qglengine/qglview.h +++ b/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 keys_; QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_; QTime time, ktm_; From c3f921ea6aa1773b9fcdc9c96bb4cd875b5ebab4 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 24 Jul 2020 21:54:38 +0300 Subject: [PATCH 03/13] FindQAD.cmake patch for piqt and piqt_utils --- qad/cmake/FindQAD.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qad/cmake/FindQAD.cmake b/qad/cmake/FindQAD.cmake index 776aecf..23ca993 100644 --- a/qad/cmake/FindQAD.cmake +++ b/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}}) From 7baa7916f727d415b290c2716a9d003d2f051cb6 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 29 Jul 2020 01:32:19 +0300 Subject: [PATCH 04/13] pip v2 --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ea624a5..4de3a05 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ea624a51116029cb4a929dc8a28684306c19a1d0 +Subproject commit 4de3a052f1abe94a23c52df62e64efb62c181838 From 0d9ecc9ceb82c3e99f8d1fe2c3de2dfbcc0f44cd Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 29 Jul 2020 14:36:21 +0300 Subject: [PATCH 05/13] Dockerfile, clone only one branch --- docker/android-libs/Dockerfile | 2 +- docker/debian-libs/Dockerfile | 2 +- docker/osx-libs/Dockerfile | 2 +- docker/pi-libs/Dockerfile | 2 +- docker/windows-libs/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/android-libs/Dockerfile b/docker/android-libs/Dockerfile index 6c68e66..aa9cda8 100644 --- a/docker/android-libs/Dockerfile +++ b/docker/android-libs/Dockerfile @@ -5,7 +5,7 @@ ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 WORKDIR /soft -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git WORKDIR /soft/libs_build_host RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ diff --git a/docker/debian-libs/Dockerfile b/docker/debian-libs/Dockerfile index af6ae8a..ab9f0e0 100644 --- a/docker/debian-libs/Dockerfile +++ b/docker/debian-libs/Dockerfile @@ -5,7 +5,7 @@ ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 WORKDIR /soft -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git WORKDIR /soft/libs_build_debian RUN cmake -DICU=0 -DLIB=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ diff --git a/docker/osx-libs/Dockerfile b/docker/osx-libs/Dockerfile index 551341e..8520227 100644 --- a/docker/osx-libs/Dockerfile +++ b/docker/osx-libs/Dockerfile @@ -5,7 +5,7 @@ ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 WORKDIR /soft -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git WORKDIR /soft/libs_build_host RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ diff --git a/docker/pi-libs/Dockerfile b/docker/pi-libs/Dockerfile index 77a0b84..b1592cc 100644 --- a/docker/pi-libs/Dockerfile +++ b/docker/pi-libs/Dockerfile @@ -5,7 +5,7 @@ ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 WORKDIR /soft -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git WORKDIR /soft/libs_build_host RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ diff --git a/docker/windows-libs/Dockerfile b/docker/windows-libs/Dockerfile index c2bcabb..29da92d 100644 --- a/docker/windows-libs/Dockerfile +++ b/docker/windows-libs/Dockerfile @@ -5,7 +5,7 @@ ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 WORKDIR /soft -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git WORKDIR /soft/libs_build_host RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ From 5ec9c22d462171f4a90c8ef807e87ea1243092a2 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 30 Jul 2020 00:25:24 +0300 Subject: [PATCH 06/13] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 4de3a05..48692a4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4de3a052f1abe94a23c52df62e64efb62c181838 +Subproject commit 48692a47246e96f39f6475f47438cfa56e84f368 From 0f1825bf3313b6322d88f509b2e66e778faf4511 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sat, 1 Aug 2020 21:30:25 +0300 Subject: [PATCH 07/13] merged to PIP 1.99.3 --- CMakeLists.txt | 7 +++---- pip | 2 +- piqt_utils/piqt_connection_view.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdeff05..376f6af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,6 @@ endif() set(CMAKE_CXX_STANDARD 11) set(PIP_LIBRARY pip) -set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt" "introspection" "concurrent" "cloud") set(PIP_INCLUDES) if(LIB) @@ -101,9 +100,6 @@ else() message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"") endif() -foreach(F ${PIP_FOLDERS}) - list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/lib/main/${F}") -endforeach(F) #message(${PIP_INCLUDES}) if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM)) set(PIP_CMG "pip_cmg") @@ -150,6 +146,9 @@ else() endif() add_subdirectory(pip) + foreach(F ${PIP_MAIN_FOLDERS}) + list(APPEND PIP_INCLUDES "${F}") + endforeach(F) set(_DIRS) if (SomeQtFound) message(STATUS "Building Qt-derived targets for ${QtVersions}") diff --git a/pip b/pip index 48692a4..c7ac4fa 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 48692a47246e96f39f6475f47438cfa56e84f368 +Subproject commit c7ac4fa55176859fc518e01d7a7ced887aac2df9 diff --git a/piqt_utils/piqt_connection_view.cpp b/piqt_utils/piqt_connection_view.cpp index 3f5437c..6d968f6 100644 --- a/piqt_utils/piqt_connection_view.cpp +++ b/piqt_utils/piqt_connection_view.cpp @@ -74,7 +74,7 @@ void FilterItem::rename() { piForeachC (PICodeInfo::EnumeratorInfo & i, ei->members) if (i.value == mode()) { ms = PI2QString(i.name); - piBreak; + break; } } text_mode->setText(ms); From fa4634b0c730175854baaeb1d6cdbe5cf59933a5 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 2 Aug 2020 12:16:14 +0300 Subject: [PATCH 08/13] last pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c7ac4fa..1fb5356 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c7ac4fa55176859fc518e01d7a7ced887aac2df9 +Subproject commit 1fb5356825f8f123bc1c5679f325816f71c41e37 From 0c7619d00be86c86d65119fbb6cb88a7a2785a3f Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 3 Aug 2020 01:43:47 +0300 Subject: [PATCH 09/13] new pip --- cd_utils/cdutils_types.cpp | 29 ++++++++++++++--------------- pip | 2 +- qcd_utils/qcd_model.cpp | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cd_utils/cdutils_types.cpp b/cd_utils/cdutils_types.cpp index cccfb3d..2000e1e 100644 --- a/cd_utils/cdutils_types.cpp +++ b/cd_utils/cdutils_types.cpp @@ -356,9 +356,9 @@ int CDSection::sectionsCount() const { PIStringList CDSection::index_names() const { PIStringList ret; - PIMap::const_iterator i; - for (i = cd.begin(); i != cd.end(); ++i) - ret << i->second.name(); + auto i = cd.makeIterator(); + while (i.next()) + ret << i.value().name(); return ret; } @@ -387,15 +387,14 @@ CDType & CDSection::getByName(const PIString & name_) { int dv = 0; if (isd) dv = np[i].toInt(); ns = 0; - PIMap::iterator it; - //piCout << np[i] << isd << dv; - for (it = cs->s.begin(); it != cs->s.end(); ++it) { + auto it = cs->s.makeIterator(); + while (it.next()) { bool f = false; if (isd) f = (dv == it.key()); else f = (np[i] == it.value().alias); //piCout << "s..." << it.key() << it.value().alias << f; if (f) { - ns = &(it.value()); + ns = &(it.valueRef()); break; } } @@ -403,13 +402,13 @@ CDType & CDSection::getByName(const PIString & name_) { if (!ns) return null; cs = ns; } - PIMap::iterator it; if (np.back().isEmpty()) return null; bool isd = np.back()[0].isDigit() || (np.back()[0] == '-'); int dv = 0; if (isd) dv = np.back().toInt(); //piCout << np.back() << isd << dv; - for (it = cs->cd.begin(); it != cs->cd.end(); ++it) { + auto it = cs->cd.makeIterator(); + while (it.next()) { bool f = false; if (isd) f = (dv == it.key()); else f = (np.back() == it.value().name()); @@ -446,9 +445,9 @@ void CDSection::write(PIIODevice * d, const PIString & prefix) { d->write(l.toUTF8()); l = "alias = " + alias + " \n"; d->write(l.toUTF8()); - PIMap::iterator i; - for (i = cd.begin(); i != cd.end(); ++i) { - CDType & ck(i.value()); + auto i = cd.makeIterator(); + while (i.next()) { + const CDType & ck(i.value()); if (ck.cd_type() != cd_type_) continue; switch (cd_type_) { case CDType::cdNull: break; @@ -487,9 +486,9 @@ void CDSection::write(PIIODevice * d, const PIString & prefix) { if (!s.isEmpty()) { if (prefix.isEmpty()) l = "s"; else l = prefix + ".s"; - PIMap::iterator j; - for (j = s.begin(); j != s.end(); ++j) { - j.value().write(d, l + "." + PIString::fromNumber(j.key())); + auto j = s.makeIterator(); + while (j.next()) { + j.valueRef().write(d, l + "." + PIString::fromNumber(j.key())); } } if (prefix.isEmpty()) { diff --git a/pip b/pip index 1fb5356..427e741 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1fb5356825f8f123bc1c5679f325816f71c41e37 +Subproject commit 427e7411c18fa9521c4e70273d5400508e90c464 diff --git a/qcd_utils/qcd_model.cpp b/qcd_utils/qcd_model.cpp index 48607f0..1f7fa32 100644 --- a/qcd_utils/qcd_model.cpp +++ b/qcd_utils/qcd_model.cpp @@ -394,15 +394,15 @@ void CDItemModel::rebuildModel() { void CDItemModel::buildItem(CDItem * it, CDSection & r) { //piCout << "build item" << r.name << r.alias; - PIMap::iterator i; - for (i = r.cd.begin(); i != r.cd.end(); ++i) { + auto i = r.cd.makeIterator(); + while (i.next()) { it->childs << new CDItem(interface, i.key(), CDItem::ItemCDType, it); } it->item_count = it->childs.size(); - PIMap::iterator j; - for (j = r.s.begin(); j != r.s.end(); ++j) { + auto j = r.s.makeIterator(); + while (j.next()) { it->childs << new CDItem(interface, j.key(), CDItem::ItemCDSection, it); - buildItem(it->childs.back(), j.value()); + buildItem(it->childs.back(), j.valueRef()); } } From 4a567dbba4835504e2acee503506e845abc42ef7 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 3 Aug 2020 09:05:06 +0300 Subject: [PATCH 10/13] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 427e741..e8a066a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 427e7411c18fa9521c4e70273d5400508e90c464 +Subproject commit e8a066abcd218b1cdfb37edb75d7b4ffc4542b14 From 2974967790e687081c0bdd48a8c0f1f470639ec2 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Tue, 4 Aug 2020 17:57:11 +0300 Subject: [PATCH 11/13] TouchButtFrame fix --- qad/touch_widgets/touchbuttframe.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qad/touch_widgets/touchbuttframe.cpp b/qad/touch_widgets/touchbuttframe.cpp index b03f401..843525a 100644 --- a/qad/touch_widgets/touchbuttframe.cpp +++ b/qad/touch_widgets/touchbuttframe.cpp @@ -51,6 +51,7 @@ void TouchButtFrame::setButtons(const QStringList & captions) { addButton(QString(captions.at(i)).replace("\\n", "\n")); if (button(cur) != 0) button(cur)->setChecked(true); else if (!captions.isEmpty()) button(0)->setChecked(true); + resetColors(); } From 905eb77091dd88b6975c72dec03df5a2d1f0fc8d Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 5 Aug 2020 12:06:56 +0300 Subject: [PATCH 12/13] windows PIP -> QtBin install fix --- CMakeLists.txt | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 376f6af..5e0ff5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,7 +179,7 @@ else() endif() if(WIN32) - foreach(PIP_LT ${PIP_LIBS_TARGETS}) + foreach(PIP_LT ${PIP_MODULES}) if (SomeQtFound) qt_install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION QtBin) endif() diff --git a/pip b/pip index e8a066a..70a7363 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e8a066abcd218b1cdfb37edb75d7b4ffc4542b14 +Subproject commit 70a7363f7621d78b1a970d0c53493cc32a6f3cfa From da9237e74bfcf64389acbe60a1687b72bd4a6be5 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 10 Aug 2020 17:48:35 +0300 Subject: [PATCH 13/13] Dockerfile ENV patch --- docker/android-libs/Dockerfile | 1 + docker/debian-libs/Dockerfile | 1 + docker/osx-libs/Dockerfile | 1 + docker/pi-libs/Dockerfile | 1 + docker/windows-libs/Dockerfile | 1 + 5 files changed, 5 insertions(+) diff --git a/docker/android-libs/Dockerfile b/docker/android-libs/Dockerfile index aa9cda8..d2f846e 100644 --- a/docker/android-libs/Dockerfile +++ b/docker/android-libs/Dockerfile @@ -3,6 +3,7 @@ FROM ${DOCKER_PREFIX}android ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git diff --git a/docker/debian-libs/Dockerfile b/docker/debian-libs/Dockerfile index ab9f0e0..0a85c7f 100644 --- a/docker/debian-libs/Dockerfile +++ b/docker/debian-libs/Dockerfile @@ -3,6 +3,7 @@ FROM ${DOCKER_PREFIX}debian ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git diff --git a/docker/osx-libs/Dockerfile b/docker/osx-libs/Dockerfile index 8520227..5a496e4 100644 --- a/docker/osx-libs/Dockerfile +++ b/docker/osx-libs/Dockerfile @@ -3,6 +3,7 @@ FROM ${DOCKER_PREFIX}osx ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git diff --git a/docker/pi-libs/Dockerfile b/docker/pi-libs/Dockerfile index b1592cc..666e20c 100644 --- a/docker/pi-libs/Dockerfile +++ b/docker/pi-libs/Dockerfile @@ -3,6 +3,7 @@ FROM ${DOCKER_PREFIX}pi ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git diff --git a/docker/windows-libs/Dockerfile b/docker/windows-libs/Dockerfile index 29da92d..82be301 100644 --- a/docker/windows-libs/Dockerfile +++ b/docker/windows-libs/Dockerfile @@ -3,6 +3,7 @@ FROM ${DOCKER_PREFIX}windows ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git