Merge branch 'main' into release-0.32

LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

doc/en/vca.md

@@ -86,6 +86,16 @@ For the `texture` directive, it is simpler. Example:
 > Here, `entities/tireman` is the name of the texture atlas containing `face_*` textures.
 > The texture does not necessarily have to be in an atlas.
 
+If you do not wish to limit the animation duration via `configure` but want to loop the keyframe animation for a specific line, you can use the `period` parameter to specify the animation's repetition period in frames. Example:
+
+```vcd
+@move by y curve linear period 24 {
+    @key frame 0 value 0
+    @key frame 12 value 1
+    @key frame 24 value 0
+}
+```
+
 ## Expression curves
 
 The attribute describes a function `f(t) = x`, where t is time in seconds.

doc/en/vcm.md

@@ -42,6 +42,7 @@ This primitive describes a triangle.
 - `region-scale` - multiplier vector for the UV region. Example: `region-scale (0.5,1)`
 - `shading` - determines whether shading is enabled on the primitive. Example: `shading off`
 - `normal` - overrides normal vector. Example: `normal (0,1,0)`
+- `cull-face` - determines which side will be culled. Example: `cull-face front` or `cull-face off` (disables face culling)
 
 By default, texture coordinates are not affected by shape or size, unlike other primitives.
 
@@ -58,6 +59,7 @@ This primitive describes a parallelogram using the right and up vectors.
 - `shading` - determines whether shading is enabled on the primitive. Example: `shading off`
 - `flip` - flips the UV region horizontally or vertically. Example: `flip v`
 - `normal` - overrides normal vector. Example: `normal (0,1,0)`
+- `cull-face` - determines which side will be culled. Example: `cull-face front` or `cull-face off` (disables face culling)
 
 ### `box` Properties
 

doc/ru/vca.md

@@ -86,6 +86,16 @@ VCA файл состоит из набора директив, порядок
 > entities/tireman здесь - имя текстурного атласа, в котором находятся face_\* текстуры.
 > Текстура не обязательно должна находиться в атласе.
 
+Если вы не хотите ограничивать длительность анимации через `configure`, но хотите зациклить анимацию по ключевым кадрам для конкретной линии, то можно использовать параметр `period` для указания периода повторения анимации в кадрах. Пример:
+
+```vcd
+@move by y curve linear period 24 {
+    @key frame 0 value 0
+    @key frame 12 value 1
+    @key frame 24 value 0
+}
+```
+
 ## Кривые через выражения
 
 Через атрибут описывается функция `f(t) = x` где t - время в секундах.

doc/ru/vcm.md

@@ -42,6 +42,7 @@
 - `region-scale` вектор-множитель для UV региона. Пример: `region-scale (0.5,1)`
 - `shading` определяет возможность затенения на примитиве. Пример: `shading off`
 - `normal` переопределяет вектор нормали. Пример: `normal (0,1,0)`
+- `cull-face` - определяет, какая сторона будет отсечена. Пример: `cull-face front` или `cull-face off` (отлючает отсечение сторон)
 
 Текстурные координаты по-умолчанию не зависят от формы из размера, в отличие от других примитивов.
 
@@ -58,6 +59,7 @@
 - `shading` - определяет возможность затенения на примитиве. Пример: `shading off`
 - `flip` - отражает UV регион по горизонтали или вертикали. Пример: `flip v`
 - `normal` -  переопределяет вектор нормали. Пример: `normal (0,1,0)`
+- `cull-face` - определяет, какая сторона будет отсечена. Пример: `cull-face front` или `cull-face off` (отлючает отсечение сторон)
 
 ### Свойства `box`
 

res/layouts/pages/settings_graphics.xml

@@ -1,2 +1,2 @@
-<panel size='400' color='0' interval='1' context='menu'>
+<panel size='400' max-length='420' padding='0,0,16,0' color='0' interval='1' context='menu'>
 </panel>

res/layouts/pages/settings_graphics.xml.lua

@@ -40,6 +40,7 @@ function on_open()
     create_trackbar_setting("chunks.load-speed", "Load Speed", 1)
     create_trackbar_setting("graphics.fog-curve", "Fog Curve", 0.1)
 
+    create_checkbox("graphics.enable-fog", "Fog", "graphics.enable-fog.tooltip")
     create_checkbox("graphics.backlight", "Backlight", "graphics.backlight.tooltip")
     create_checkbox("graphics.soft-lighting", "Soft lighting", "graphics.soft-lighting.tooltip")
     create_checkbox("graphics.dense-render", "Dense blocks render", "graphics.dense-render.tooltip")

res/modules/animation.lua

@@ -48,6 +48,8 @@ local this = {
     INT_LINEAR = 2,
     INT_BEZIER = 3,
     INT_CUSTOM = 4,
+    MAX_DURATION = 1e9,
+    MAX_FRAMES = 1e9,
 
     TRACE_CODEGEN = false,
 

res/modules/internal/animation_codegen.lua

@@ -121,7 +121,7 @@ local env = {
 
 local math_funcs = {
     "sqrt", "min", "max", "deg", "rad", "log", "log10", "floor", "ceil", "sin",
-    "tan", "noise", "noise2", "sign", "round", "exp", "pi", "e"
+    "cos", "tan", "abs", "noise", "noise2", "sign", "round", "exp", "pi", "e"
 }
 for _, name in ipairs(math_funcs) do
     env[name] = math[name]
@@ -150,16 +150,16 @@ local function codegen_track(raw_track, lineset, memoised, keysets, use_tsf)
                 local valueat = string.format("curves[%s]", string.escape(line.curve_func))
 
                 code = code .. string.format(
-                "\n   local l%d = value_at_custom(keysets['%s'][%d], t * %s, %s)",
+                "\n   local l%d = value_at_custom(keysets['%s'][%d], t * %s %% %s, %s)",
-                i, lineset.target_name, i, raw_track.fps, valueat)
+                i, lineset.target_name, i, raw_track.fps, line.period, valueat)
             elseif line.channel == animation.CH_TEXTURE then
                 code = code .. string.format(
-                    "\n   local l%d = string_at(keysets['%s'][%d], t * %s)",
+                    "\n   local l%d = string_at(keysets['%s'][%d], t * %s %% %s)",
-                    i, lineset.target_name, i, raw_track.fps)
+                    i, lineset.target_name, i, raw_track.fps, line.period)
             else
                 code = code .. string.format(
-                    "\n   local l%d = value_at(keysets['%s'][%d], t * %s, %s)",
+                    "\n   local l%d = value_at(keysets['%s'][%d], t * %s %% %s, %s)",
-                    i, lineset.target_name, i, raw_track.fps, line.interp)
+                    i, lineset.target_name, i, raw_track.fps, line.period, line.interp)
             end
         end
 

res/modules/internal/formats/vca.lua

@@ -106,7 +106,8 @@ local function parse_track(root)
         end
         local line = {
             axis = node.by and ("xyz"):find(node.by) or "",
-            channel = channel
+            channel = channel,
+            period = node.period or animation.MAX_FRAMES
         }
         if node.func then
             line.expression = node.func

res/scripts/components/animator.lua

@@ -1,4 +1,4 @@
-local ALMOST_HUGE = 1e9
+local MAX_DURATION = animation.MAX_DURATION
 
 local rig = entity.skeleton
 
@@ -54,7 +54,7 @@ local function update(delta)
         if state.track and intensity > 0.0 then
             state.track.func(
                 rig,
-                state.timer % math.min(ALMOST_HUGE, state.track.duration),
+                state.timer % math.min(MAX_DURATION, state.track.duration),
                 intensity * state.max_intencity
             )
         end

res/shaders/lib/fog.glsl

@@ -8,12 +8,16 @@ uniform float u_weatherFogDencity;
 uniform float u_weatherFogCurve;
 
 float calc_fog(float depth, float fogFactor, float fogCurve) {
+#ifdef ENABLE_FOG
     return min(
         1.0,
         max(pow(depth * u_fogFactor * fogFactor, u_fogCurve * fogCurve),
             min(pow(depth * u_weatherFogDencity, u_weatherFogCurve),
                 u_weatherFogOpacity))
     );
+#else
+    return 0.0;
+#endif
 }
 
 float calc_fog(float depth) {

res/texts/en_US.txt

@@ -19,6 +19,7 @@ devtools.output=Output
 # Tooltips
 audio.acoustic-effects.tooltip=Acoustic effects may not be supported by your system
 audio.recording-enabled.tooltip=Enables audio recording features
+graphics.enable-fog.tooltip=Enables fog
 graphics.gamma.tooltip=Lighting brightness curve
 graphics.backlight.tooltip=Backlight to prevent total darkness
 graphics.dense-render.tooltip=Enables transparency in blocks like leaves

res/texts/ru_RU.txt

@@ -40,6 +40,7 @@ pack.remove-confirm=Удалить весь поставляемый паком/
 # Подсказки
 audio.acoustic-effects.tooltip=Акустические эффекты могут не поддерживаться системой
 audio.recording-enabled.tooltip=Включает функции записи звука
+graphics.enable-fog.tooltip=Отображать туман / дымку
 graphics.gamma.tooltip=Кривая яркости освещения
 graphics.backlight.tooltip=Подсветка, предотвращающая полную темноту
 graphics.dense-render.tooltip=Включает прозрачность блоков, таких как листья
@@ -89,6 +90,7 @@ settings.Soft lighting=Мягкое освещение
 settings.Camera Shaking=Тряска Камеры
 settings.Camera Inertia=Инерция Камеры
 settings.Camera FOV Effects=Эффекты поля зрения
+settings.Fog=Туман
 settings.Fog Curve=Кривая Тумана
 settings.FOV=Поле Зрения
 settings.Fullscreen=Полный экран

src/coders/vcm.cpp

@@ -198,6 +198,31 @@ static void perform_rect(const xmlelement& root, ModelBuilder& builder) {
     } else {
         normal = glm::cross(glm::normalize(right), glm::normalize(up));
     }
+
+    auto cullFace = root.attr("cull-face", "back").getText();
+    if (cullFace == "front") {
+        normal *= -1.0f;
+    } else if (cullFace == "off") {
+        builder.addRect(
+            texture,
+            shading,
+            from + right * 0.5f + up * 0.5f,
+            right * 0.5f,
+            up * 0.5f,
+            normal,
+            region
+        );
+        builder.addRect(
+            texture,
+            shading,
+            from + right * 0.5f + up * 0.5f,
+            right * -0.5f,
+            up * -0.5f,
+            -normal,
+            region
+        );
+        return;
+    }
     builder.addRect(
         texture,
         shading,
@@ -246,6 +271,17 @@ static void perform_triangle(const xmlelement& root, ModelBuilder& builder) {
     }
     
     std::string texture = root.attr("texture", "$0").getText();
+
+    auto cullFace = root.attr("cull-face", "back").getText();
+    if (cullFace == "front") {
+        std::swap(pointB, pointC);
+        std::swap(uvs[1], uvs[2]);
+        normal *= -1.0f;
+    } else if (cullFace == "off") {
+        builder.addTriangle(texture, shading, pointA, pointB, pointC, normal, uvs[0], uvs[1], uvs[2]);
+        builder.addTriangle(texture, shading, pointA, pointC, pointB, -normal, uvs[0], uvs[2], uvs[1]);
+        return;
+    }
     builder.addTriangle(texture, shading, pointA, pointB, pointC, normal, uvs[0], uvs[1], uvs[2]);
 }
 

src/graphics/render/WorldRenderer.cpp

@@ -135,6 +135,7 @@ WorldRenderer::WorldRenderer(
     debugLines = std::make_unique<DebugLinesRenderer>(level);
     cloudsRenderer = std::make_unique<CloudsRenderer>();
 
+    keepAlive(observe_setting(settings.graphics.enableFog, dirtySettings));
     keepAlive(observe_setting(settings.graphics.advancedRender, dirtySettings));
     keepAlive(observe_setting(settings.graphics.shadowsQuality, dirtySettings));
     keepAlive(observe_setting(settings.graphics.ssao, dirtySettings));
@@ -156,10 +157,12 @@ void WorldRenderer::refreshSettings() {
     gbufferPipeline = graphics.advancedRender.get();
 
     int shadowsQuality = graphics.shadowsQuality.get() * gbufferPipeline;
+    bool enableFog = graphics.enableFog.get(); 
     shadowMapping->setQuality(shadowsQuality);
 
     std::vector<std::string> defines;
     if (shadowsQuality != 0) defines.emplace_back("ENABLE_SHADOWS");
+    if (enableFog) defines.emplace_back("ENABLE_FOG");
     if (graphics.ssao.get()) defines.emplace_back("ENABLE_SSAO");
     if (gbufferPipeline) defines.emplace_back("ADVANCED_RENDER");
 

src/graphics/ui/elements/InlineFrame.cpp

@@ -25,8 +25,12 @@ void InlineFrame::setDocument(const std::shared_ptr<UiDocument>& document) {
     if (document == nullptr) {
         return;
     }
+    auto newRoot = document->getRoot();
+    if (newRoot->hasParent()) {
+        return;
+    }
     this->document = document;
-    this->root = document->getRoot();
+    this->root = std::move(newRoot);
     add(root);
 
     root->setSize(size);

src/graphics/ui/elements/UINode.cpp

@@ -60,6 +60,10 @@ bool UINode::isHover() const {
     return hover;
 }
 
+bool UINode::hasParent() const {
+    return parent != nullptr;
+}
+
 void UINode::setParent(UINode* node) {
     parent = node;
 }
@@ -376,14 +380,14 @@ void UINode::setGravity(Gravity gravity) {
     }
 }
 
-bool UINode::isSubnodeOf(const UINode* node) {
+bool UINode::isDescendantOf(const UINode* node) {
     if (parent == nullptr) {
         return false;
     }
     if (parent == node) {
         return true;
     }
-    return parent->isSubnodeOf(node);
+    return parent->isDescendantOf(node);
 }
 
 void UINode::getIndices(

src/graphics/ui/elements/UINode.hpp

@@ -176,6 +176,7 @@ namespace gui {
         void setMouseOver(bool flag);
 
         virtual void setParent(UINode* node);
+        bool hasParent() const;
         UINode* getParent() const;
         std::shared_ptr<UINode> getParentShared() const;
 
@@ -290,7 +291,7 @@ namespace gui {
 
         virtual void setGravity(Gravity gravity);
 
-        bool isSubnodeOf(const UINode* node);
+        bool isDescendantOf(const UINode* node);
 
         /// @brief collect all nodes having id
         static void getIndices(

src/io/settings_io.cpp

@@ -69,6 +69,7 @@ SettingsHandler::SettingsHandler(EngineSettings& settings) {
     builder.add("padding", &settings.chunks.padding);
 
     builder.addSection("graphics");
+    builder.add("enable-fog", &settings.graphics.enableFog);
     builder.add("fog-curve", &settings.graphics.fogCurve);
     builder.add("backlight", &settings.graphics.backlight);
     builder.add("dense-render", &settings.graphics.denseRender);

src/logic/scripting/lua/libs/libgui.cpp

@@ -165,6 +165,13 @@ static int l_container_set_interval(lua::State* L) {
 static int l_move_into(lua::State* L) {
     auto node = get_document_node(L, 1);
     auto dest = get_document_node(L, 2);
+    if (dest.node == nullptr) {
+        return 0;
+    }
+    if (dest.node->isDescendantOf(node.node.get())) {
+        luaL_error(L, "unable to move element to its descendant");
+        return 0;
+    }
     UINode::moveInto(
         node.node, std::dynamic_pointer_cast<Container>(dest.node)
     );

src/settings.hpp

@@ -63,6 +63,8 @@ struct CameraSettings {
 };
 
 struct GraphicsSettings {
+    /// @brief Enable fog
+    FlagSetting enableFog {true};
     /// @brief Fog opacity is calculated as `pow(depth*k, fogCurve)` where k depends on chunksLoadDistance.
     /// 1.0 is linear, 2.0 is quadratic
     NumberSetting fogCurve {1.0f, 1.0f, 6.0f};

src/util/stack_vector.hpp

@@ -48,21 +48,25 @@ namespace util {
         }
 
         void push_back(const T& value) {
-            if (size_ < capacity) {
+            if (size_ >= capacity) {
-                auto data = reinterpret_cast<char*>(data_.ptr() + (size_++));
-                new (data) T(value);
-            } else {
                 throw std::overflow_error("stack vector capacity exceeded");
             }
+
+            void* p = data_.data + size_ * sizeof(T);
+            ::new (p) T(value);
+
+            ++size_;
         }
 
         void push_back(T&& value) {
-            if (size_ < capacity) {
+            if (size_ >= capacity) {
-                auto data = reinterpret_cast<char*>(data_.ptr() + (size_++));
-                new (data) T(std::move(value));
-            } else {
                 throw std::overflow_error("stack vector capacity exceeded");
             }
+
+            void* p = data_.data + size_ * sizeof(T);
+            ::new (p) T(std::move(value));
+
+            ++size_;
         }
 
         void pop_back() {
@@ -76,7 +80,7 @@ namespace util {
 
         void clear() {
             for (int i = 0; i < size_; ++i) {
-                data_.ptr()[i].~T();
+                data_.ptr()[i].~T(); 
             }
             size_ = 0;
         }