.clang-format

.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

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)
@@ -26,7 +26,7 @@ else()
 	include(SHSTKQtMacros)
 	
 	set(QGLEngine_MAJOR    1)
-	set(QGLEngine_MINOR    3)
+	set(QGLEngine_MINOR    4)
 	set(QGLEngine_REVISION 0)
 	set(QGLEngine_SUFFIX   "rc")
 	set(QGLEngine_COMPANY  SHS)

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)

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";

src/core/scene/globject.cpp

@@ -211,6 +211,12 @@ void ObjectBase::setVisible(bool v) {
 }
 
 
+void ObjectBase::setVisibleForAllPresets(bool v) {
+	for (auto & p: presets)
+		p.visible = v;
+}
+
+
 void ObjectBase::setReceiveShadows(bool on) {
 	currentPreset().receive_shadow = on;
 	setObjectsChanged();

src/core/scene/globject.h

@@ -82,6 +82,10 @@ public:
 	void setHidden(bool v) { setVisible(!v); }
 	void show() { setVisible(true); }
 	void hide() { setVisible(false); }
+	void setVisibleForAllPresets(bool v);
+	void setHiddenForAllPresets(bool v) { setVisibleForAllPresets(!v); }
+	void showForAllPresets() { setVisibleForAllPresets(true); }
+	void hideForAllPresets() { setVisibleForAllPresets(false); }
 
 	bool isReceiveShadows() const { return currentPreset().receive_shadow; }
 	bool isCastShadows() const { return currentPreset().cast_shadow; }

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>

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)