.clang-format

new cmake
icons
2025-09-21 21:08:33 +03:00 · 2025-04-29 21:51:10 +03:00 · 2024-11-02 14:15:29 +03:00 · 2024-10-23 19:10:31 +03:00 · 2023-12-08 19:01:50 +03:00 · 2023-12-08 16:14:39 +03:00
37 changed files with 24 additions and 24 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
 if (POLICY CMP0057)
 	cmake_policy(SET CMP0057 NEW)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 project(qglengine_core)
 if (POLICY CMP0017)
 	cmake_policy(SET CMP0017 NEW)
--- a/src/core/render/renderer.cpp
+++ b/src/core/render/renderer.cpp
@@ -31,7 +31,7 @@
 #include <piqt.h>
 #include <qad_types.h>

-#define SHADERS_DIR ":"
+#define SHADERS_DIR ":/qglengine"


 using namespace QGLEngineShaders;
@@ -106,7 +106,7 @@ Renderer::Renderer(QGLView * view_)
 	shader_defines[srLightSpotPass] << "SPOT";
 	shader_defines[srShadowOmniPass] << "OMNI";

-	PICodeInfo::EnumInfo * obre = PICodeInfo::enumsInfo->value("Renderer::DeferredBufferRole");
+	PICodeInfo::EnumInfo * obre = PICODEINFO::enums().value("Renderer::DeferredBufferRole");
 	if (obre) {
 		for (auto e: obre->members) {
 			obr_defines += "#define " + PI2QString(e.name) + " " + QString::number(e.value) + "\n";
--- a/src/core/shaders.qrc
+++ b/src/core/shaders.qrc
@@ -1,21 +1,21 @@
 <RCC>
-    <qresource prefix="/">
-		<file>../../shaders/ds_final.glsl</file>
-		<file>../../shaders/ds_geom.glsl</file>
-		<file>../../shaders/ds_light.glsl</file>
-		<file>../../shaders/ds_tonemap.glsl</file>
-		<file>../../shaders/fxaa.frag</file>
-		<file>../../shaders/fxaa.vert</file>
-		<file>../../shaders/fxaa_v3.h</file>
-		<file>../../shaders/selection.glsl</file>
-		<file>../../shaders/selection_apply.glsl</file>
-		<file>../../shaders/selection_frame.glsl</file>
-		<file>../../shaders/selection_halo.glsl</file>
-		<file>../../shaders/service_fill.glsl</file>
-		<file>../../shaders/service_frame.glsl</file>
-		<file>../../shaders/service_line.glsl</file>
-		<file>../../shaders/sum.glsl</file>
-		<file>../../shaders/shadow.glsl</file>
-		<file>../../shaders/rescale.glsl</file>
+    <qresource prefix="/qglengine">
+        <file>../../shaders/ds_final.glsl</file>
+        <file>../../shaders/ds_geom.glsl</file>
+        <file>../../shaders/ds_light.glsl</file>
+        <file>../../shaders/ds_tonemap.glsl</file>
+        <file>../../shaders/fxaa.frag</file>
+        <file>../../shaders/fxaa.vert</file>
+        <file>../../shaders/fxaa_v3.h</file>
+        <file>../../shaders/selection.glsl</file>
+        <file>../../shaders/selection_apply.glsl</file>
+        <file>../../shaders/selection_frame.glsl</file>
+        <file>../../shaders/selection_halo.glsl</file>
+        <file>../../shaders/service_fill.glsl</file>
+        <file>../../shaders/service_frame.glsl</file>
+        <file>../../shaders/service_line.glsl</file>
+        <file>../../shaders/sum.glsl</file>
+        <file>../../shaders/shadow.glsl</file>
+        <file>../../shaders/rescale.glsl</file>
    </qresource>
 </RCC>
--- a/src/icons/application-exit.png
+++ b/src/icons/application-exit.png
--- a/src/icons/configure.png
+++ b/src/icons/configure.png
--- a/src/icons/dialog-cancel.png
+++ b/src/icons/dialog-cancel.png
--- a/src/icons/dialog-close.png
+++ b/src/icons/dialog-close.png
--- a/src/icons/dialog-information.png
+++ b/src/icons/dialog-information.png
--- a/src/icons/document-edit.png
+++ b/src/icons/document-edit.png
--- a/src/icons/document-new.png
+++ b/src/icons/document-new.png
--- a/src/icons/document-open.png
+++ b/src/icons/document-open.png
--- a/src/icons/document-save-all.png
+++ b/src/icons/document-save-all.png
--- a/src/icons/document-save.png
+++ b/src/icons/document-save.png
--- a/src/icons/edit-clear-locationbar-rtl.png
+++ b/src/icons/edit-clear-locationbar-rtl.png
--- a/src/icons/edit-clear.png
+++ b/src/icons/edit-clear.png
--- a/src/icons/edit-copy.png
+++ b/src/icons/edit-copy.png
--- a/src/icons/edit-delete.png
+++ b/src/icons/edit-delete.png
--- a/src/icons/edit-find.png
+++ b/src/icons/edit-find.png
--- a/src/icons/edit-paste.png
+++ b/src/icons/edit-paste.png
--- a/src/icons/edit-rename.png
+++ b/src/icons/edit-rename.png
--- a/src/icons/format-fill-color.png
+++ b/src/icons/format-fill-color.png
--- a/src/icons/go-down.png
+++ b/src/icons/go-down.png
--- a/src/icons/go-jump.png
+++ b/src/icons/go-jump.png
--- a/src/icons/go-top.png
+++ b/src/icons/go-top.png
--- a/src/icons/go-up.png
+++ b/src/icons/go-up.png
--- a/src/icons/layer-visible-off.png
+++ b/src/icons/layer-visible-off.png
--- a/src/icons/layer-visible-on.png
+++ b/src/icons/layer-visible-on.png
--- a/src/icons/list-add.png
+++ b/src/icons/list-add.png
--- a/src/icons/object-flip-horizontal.png
+++ b/src/icons/object-flip-horizontal.png
--- a/src/icons/object-flip-vertical.png
+++ b/src/icons/object-flip-vertical.png
--- a/src/icons/transform-move.png
+++ b/src/icons/transform-move.png
--- a/src/icons/transform-rotate.png
+++ b/src/icons/transform-rotate.png
--- a/src/icons/transform-scale.png
+++ b/src/icons/transform-scale.png
--- a/src/icons/view-refresh.png
+++ b/src/icons/view-refresh.png
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 project(qglengine_widgets)
 if (POLICY CMP0017)
 	cmake_policy(SET CMP0017 NEW)
Author	SHA1	Message	Date
peri4	3d53c8a69f	.clang-format	2025-09-21 21:08:33 +03:00
peri4	d269f30107	new cmake	2025-04-29 21:51:10 +03:00
peri4	5a7158531f	icons	2024-11-02 14:15:29 +03:00
peri4	7dfaf924e5	shaders in qrc now with prefix	2024-10-23 19:10:31 +03:00
peri4	c642ec603f	PICODEINFO:: changed	2023-12-08 19:01:50 +03:00
peri4	553e24b896	pip 3.15	2023-12-08 16:14:39 +03:00