Merge branch 'master' into actor-sight-blocker

Author: inkoalawetrust

auto-setup-linux.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+#**
+#** auto-setup-linux.sh
+#** Automatic (easy) setup and build script for Linux
+#**
+#** Note that this script assumes you have both 'git' and 'cmake' installed properly and in your PATH!
+#** This script also assumes you have installed a build system that cmake can automatically detect.
+#** Such as GCC or Clang. Requires appropriate supporting libraries installed too!
+#** Without these items, this script will FAIL! So make sure you have your build environment properly
+#** set up in order for this script to succeed.
+#**
+#** The purpose of this script is to get someone easily going with a full working compile of GZDoom.
+#** This allows anyone to make simple changes or tweaks to the engine as they see fit and easily
+#** compile their own copy without having to follow complex instructions to get it working.
+#** Every build environment is different, and every computer system is different - this should work
+#** in most typical systems under Windows but it may fail under certain types of systems or conditions.
+#** Not guaranteed to work and your mileage will vary.
+#**
+#** Prerequisite Packages used in testing (from Linux Mint-XFCE):
+#**    nasm autoconf libtool libsystemd-dev clang-15 libx11-dev libsdl2-dev libgtk-3-dev
+#**
+#**---------------------------------------------------------------------------
+#** Copyright 2024 Rachael Alexanderson and the GZDoom team
+#** All rights reserved.
+#**
+#** Redistribution and use in source and binary forms, with or without
+#** modification, are permitted provided that the following conditions
+#** are met:
+#**
+#** 1. Redistributions of source code must retain the above copyright
+#**    notice, this list of conditions and the following disclaimer.
+#** 2. Redistributions in binary form must reproduce the above copyright
+#**    notice, this list of conditions and the following disclaimer in the
+#**    documentation and/or other materials provided with the distribution.
+#** 3. The name of the author may not be used to endorse or promote products
+#**    derived from this software without specific prior written permission.
+#**
+#** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#**---------------------------------------------------------------------------
+#**
+
+# -- Always operate within the build folder
+BUILDFOLDER=$(dirname "$0")/build
+
+if [ ! -d "$BUILDFOLDER" ]; then
+	mkdir "$BUILDFOLDER"
+fi
+cd "$BUILDFOLDER"
+
+if [ -d "vcpkg" ]; then
+	git -C ./vcpkg pull
+fi
+if [ ! -d "vcpkg" ]; then
+	git clone https://github.com/microsoft/vcpkg
+fi
+if [ -d "zmusic" ]; then
+	git -C ./zmusic fetch
+fi
+if [ ! -d "zmusic" ]; then
+	git clone https://github.com/zdoom/zmusic
+fi
+if [ -d "zmusic" ]; then
+	git -C ./zmusic checkout 1.1.12
+fi
+
+if [ ! -d "zmusic/build" ]; then
+	mkdir zmusic/build
+fi
+if [ ! -d "vcpkg_installed" ]; then
+	mkdir vcpkg_installed
+fi
+
+cmake -S ./zmusic -B ./zmusic/build \
+	-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \
+	-DVCPKG_LIBSNDFILE=1 \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DVCPKG_INSTALLLED_DIR=../vcpkg_installed/
+pushd ./zmusic/build
+make -j $(nproc)
+popd
+
+cmake -S .. -B . \
+	-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DVCPKG_INSTALLLED_DIR=./vcpkg_installed/
+make -j $(nproc); rc=$?
+
+# -- If successful, show the build
+if [ $rc -eq 0 ]; then
+	if [ -f gzdoom ]; then
+		xdg-open .
+	fi
+fi
+
+exit $rc

auto-setup-windows.cmd

@@ -19,7 +19,7 @@ goto aftercopyright
 ** Not guaranteed to work and your mileage will vary.
 **
 **---------------------------------------------------------------------------
-** Copyright 2023 Rachael Alexanderson and the GZDoom team
+** Copyright 2023-2024 Rachael Alexanderson and the GZDoom team
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without

cmake/FindZMusic.cmake

@@ -10,9 +10,15 @@ if(ZMUSIC_INCLUDE_DIR AND ZMUSIC_LIBRARIES)
     set(ZMUSIC_FIND_QUIETLY TRUE)
 endif()
 
-find_path(ZMUSIC_INCLUDE_DIR zmusic.h)
+find_path(ZMUSIC_INCLUDE_DIR zmusic.h
+    HINTS
+    ${CMAKE_SOURCE_DIR}/build/zmusic/include
+)
 
-find_library(ZMUSIC_LIBRARIES NAMES zmusic)
+find_library(ZMUSIC_LIBRARIES NAMES zmusic
+    HINTS
+    ${CMAKE_SOURCE_DIR}/build/zmusic/build/source
+)
 mark_as_advanced(ZMUSIC_LIBRARIES ZMUSIC_INCLUDE_DIR)
 
 # handle the QUIETLY and REQUIRED arguments and set ZMUSIC_FOUND to TRUE if 

libraries/ZWidget/src/core/widget.cpp

@@ -563,8 +563,10 @@ void Widget::OnWindowMouseMove(const Point& pos)
 		do
 		{
 			widget->OnMouseMove(widget->MapFrom(this, pos));
+			if (widget == this)
+				break;
 			widget = widget->Parent();
-		} while (widget != this);
+		} while (widget);
 	}
 }
 

src/CMakeLists.txt

@@ -1386,7 +1386,7 @@ if( NOT WIN32 AND NOT APPLE )
 	IF ("${INSTALL_RPATH}" STREQUAL "")
 		set_target_properties(zdoom PROPERTIES
 			#allow libzmusic.so.1 library in same folder as executable at runtime
-			INSTALL_RPATH "\$ORIGIN"
+			INSTALL_RPATH "\$ORIGIN:\$ORIGIN/zmusic/build/source"
 			BUILD_WITH_INSTALL_RPATH ON
 		)
 	endif()

src/am_map.cpp

@@ -2952,7 +2952,8 @@ void DAutomap::drawThings ()
 			if (am_cheat > 0 || !(t->flags6 & MF6_NOTONAUTOMAP)
 				|| (am_thingrenderstyles && !(t->renderflags & RF_INVISIBLE) && !(t->flags6 & MF6_NOTONAUTOMAP)))
 			{
-				DVector3 pos = t->InterpolatedPosition(r_viewpoint.TicFrac) + t->Level->Displacements.getOffset(sec.PortalGroup, MapPortalGroup);
+				DVector3 fracPos = t->InterpolatedPosition(r_viewpoint.TicFrac);
+				FVector2 pos = FVector2(float(fracPos.X),float(fracPos.Y)) + FVector2(t->Level->Displacements.getOffset(sec.PortalGroup, MapPortalGroup)) + FVector2(t->AutomapOffsets);
 				p.x = pos.X;
 				p.y = pos.Y;
 
@@ -2962,14 +2963,14 @@ void DAutomap::drawThings ()
 					spriteframe_t *frame;
 					int rotation = 0;
 
-					// try all modes backwards until a valid texture has been found.	
+					// try all modes backwards until a valid texture has been found.
 					for(int show = am_showthingsprites; show > 0 && texture == nullptr; show--)
 					{
 						const spritedef_t& sprite = sprites[t->sprite];
 						const size_t spriteIndex = sprite.spriteframes + (show > 1 ? t->frame : 0);
 
 						frame = &SpriteFrames[spriteIndex];
-						DAngle angle = DAngle::fromDeg(270. + 22.5) - t->InterpolatedAngles(r_viewpoint.TicFrac).Yaw;
+						DAngle angle = DAngle::fromDeg(270.) - t->InterpolatedAngles(r_viewpoint.TicFrac).Yaw - t->SpriteRotation; 
 						if (frame->Texture[0] != frame->Texture[1]) angle += DAngle::fromDeg(180. / 16);
 						if (am_rotate == 1 || (am_rotate == 2 && viewactive))
 						{

src/common/engine/namedef.h

@@ -80,7 +80,6 @@ xx(__decorate_internal_float__)
 // Per-actor sound channels (for deprecated PlaySoundEx function) Do not separate this block!!!
 xx(Auto)
 xx(Weapon)
-xx(BobPivot3D)
 xx(Voice)
 xx(Item)
 xx(Body)

src/common/engine/palettecontainer.cpp

@@ -32,6 +32,7 @@
 **
 */
 
+#include <cmath>
 #include "palutil.h"
 #include "sc_man.h"
 #include "m_crc32.h"

src/common/filesystem/source/files_decompress.cpp

@@ -980,11 +980,12 @@ bool OpenDecompressor(FileReader& self, FileReader &parent, FileReader::Size len
 			}
 			dec->Length = length;
 		}
-		if ((flags & DCF_CACHED))
+		if ((flags & (DCF_CACHED| DCF_SEEKABLE))) // the buffering reader does not seem to be stable, so cache it instead until we find out what's wrong.
 		{
 			// read everything into a MemoryArrayReader.
 			FileData data(nullptr, length);
 			fr->Read(data.writable(), length);
+			delete fr;
 			fr = new MemoryArrayReader(data);
 		}
 		else if ((flags & DCF_SEEKABLE))

src/common/filesystem/source/filesystem.cpp

@@ -395,7 +395,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
 				std::string path = filename;
 				path += ':';
 				path += resfile->getName(i);
-				auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE);
+				auto embedded = resfile->GetEntryReader(i, READER_CACHED);
 				AddFile(path.c_str(), &embedded, filter, Printf, hashfile);
 			}
 		}