FPCharacter object[1]

Author: NicusorN5

3DRadSpace/3DRadSpace_AngelscriptPlugin/AngelscriptWrapper.cpp

@@ -8,7 +8,7 @@
 #include <format>
 
 #include <Engine3DRadSpace\3DRadSpace.hpp>
-#include <Engine3DRadSpace\Scripting\Legacy.hpp>
+#include "Legacy.hpp"
 
 using namespace Engine3DRadSpace::Angelscript;
 using namespace Engine3DRadSpace::Logging;

3DRadSpace/3DRadSpace_AngelscriptPlugin/CMakeLists.txt

@@ -36,6 +36,7 @@ target_link_libraries(3DRadSpace.AngelScript PRIVATE 3DRadSpace.Reflection)
 target_link_libraries(3DRadSpace.AngelScript PRIVATE 3DRadSpace.Games)
 target_link_libraries(3DRadSpace.AngelScript PRIVATE 3DRadSpace.Objects)
 target_link_libraries(3DRadSpace.AngelScript PRIVATE 3DRadSpace.Scripting)
+target_link_libraries(3DRadSpace.AngelScript PRIVATE 3DRadSpace.Projects)
 target_include_directories(3DRadSpace.AngelScript PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 #Add Angelscript

3DRadSpace/3DRadSpace_AngelscriptPlugin/Legacy.cpp

@@ -1,5 +1,10 @@
 #include "Legacy.hpp"
-#include "../Objects/Impl/Objects.hpp"
+#include <Engine3DRadSpace/Objects/Impl/Objects.hpp>
+#include <Engine3DRadSpace/Objects/Impl/TextPrint.hpp>
+#include <Engine3DRadSpace/Objects/ObjectList.hpp>
+#include <Engine3DRadSpace/Physics/Objects/RigidDynamic.hpp>
+#include <Engine3DRadSpace/Physics/Objects/RigidStatic.hpp>
+#include <Engine3DRadSpace/Projects/Serialization.hpp>
 
 using namespace Engine3DRadSpace;
 using namespace Engine3DRadSpace::Math;
@@ -281,7 +286,6 @@ void iObjectParamSet(unsigned obj_x, int index, float t)
 
 	auto refl = Internal::GetReflDataFromUUID(uuid);
 	if (refl->NumFields() > index) return;
-	//if (refl == nullptr) throw std::exception("??? This exception indicates a severe bug with object reflection metadata not being registered.");
 	if (refl == nullptr) return;
 
 	auto field = refl->operator[](index);

3DRadSpace/3DRadSpace_AngelscriptPlugin/Legacy.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include "../Engine3DRadSpace/Math/Vector3.hpp"
 #include "../Engine3DRadSpace/Math/Quaternion.hpp"
+#include "../Engine3DRadSpace/Objects/ObjectList.hpp"
 
 /*
 	Set of legacy functions from the old engine. Source: https://3drad.boards.net/page/script-reference

3DRadSpace/Engine3DRadSpace/Core/IGame.hpp

@@ -33,7 +33,7 @@ namespace Engine3DRadSpace
 		template<typename T>
 		T* RequireService(Tag<T> dummy)
 		{
-			return RequireService(typeid(T));
+			return static_cast<T*>(RequireService(typeid(T)));
 		}
 
 		virtual void Exit() = 0;

3DRadSpace/Engine3DRadSpace/Math/Vector2.cpp

@@ -210,4 +210,9 @@ Vector2 Vector2::Transform(const Vector2& v, const Matrix3x3& m)
         v.X * m.M11 + v.Y * m.M12 + m.M13,
         v.X * m.M21 + v.Y * m.M22 + m.M23
     };
+}
+
+Vector2 Vector2::YX() const noexcept
+{
+    return Vector2(Y, X);
 }

3DRadSpace/Engine3DRadSpace/Math/Vector2.hpp

@@ -55,6 +55,8 @@ namespace Engine3DRadSpace::Math
 
 		Vector2& Transform(const Matrix3x3& m);
 		static Vector2 Transform(const Vector2& v, const Matrix3x3& m);
+
+		Vector2 YX() const noexcept;
 	};
 
 	Vector2 E3DRSP_MATH_EXPORT operator*(float s, const Vector2& v);

3DRadSpace/Engine3DRadSpace/Math/Vector3.cpp

@@ -1,6 +1,7 @@
 #include "Vector3.hpp"
 #include "Quaternion.hpp"
 #include "Matrix4x4.hpp"
+#include "Vector2.hpp"
 
 using namespace Engine3DRadSpace::Math;
 
@@ -259,3 +260,48 @@ Vector3 Engine3DRadSpace::Math::operator/(float s, const Vector3 &v)
 {
 	return Vector3{ s / v.X, s / v.Y, s / v.Z };
 }
+
+Vector2 Vector3::XX() const noexcept
+{
+	return Vector2(X, X);
+}
+
+Vector2 Vector3::XY() const noexcept
+{
+	return Vector2(X, Y);
+}
+
+Vector2 Vector3::XZ() const noexcept
+{
+	return Vector2(X, Z);
+}
+
+Vector2 Vector3::YX() const noexcept
+{
+	return Vector2(Y, X);
+}
+
+Vector2 Vector3::YY() const noexcept
+{
+	return Vector2(Y, Y);
+}
+
+Vector2 Vector3::YZ() const noexcept
+{
+	return Vector2(Y, Z);
+}
+
+Vector2 Vector3::ZX() const noexcept
+{
+	return Vector2(Z, X);
+}
+
+Vector2 Vector3::ZY() const noexcept
+{
+	return Vector2(Z, Y);
+}
+
+Vector2 Vector3::ZZ() const noexcept
+{
+	return Vector2(Z, Z);
+}

3DRadSpace/Engine3DRadSpace/Math/Vector3.hpp

@@ -5,6 +5,7 @@ namespace Engine3DRadSpace::Math
 {
 	struct Quaternion;
 	struct Matrix4x4;
+	struct Vector2;
 
 	struct E3DRSP_MATH_EXPORT Vector3
 	{
@@ -64,6 +65,16 @@ namespace Engine3DRadSpace::Math
 		//Element wise product
 		static Vector3 Hadamard(const Vector3& a, const Vector3& b);
 
+		Vector2 XX() const noexcept;
+		Vector2 XY() const noexcept;
+		Vector2 XZ() const noexcept;
+		Vector2 YX() const noexcept;
+		Vector2 YY() const noexcept;
+		Vector2 YZ() const noexcept;
+		Vector2 ZX() const noexcept;
+		Vector2 ZY() const noexcept;
+		Vector2 ZZ() const noexcept;
+
 		auto operator <=>(const Vector3& v) const = default;
 	};
 

3DRadSpace/Engine3DRadSpace/Objects/Impl/FreeCam.cpp

@@ -8,13 +8,29 @@ using namespace Engine3DRadSpace;
 using namespace Engine3DRadSpace::Math;
 using namespace Engine3DRadSpace::Objects;
 
-FreeCam::FreeCam() : Camera("FreeCam")
+FreeCam::FreeCam(
+	const std::string& name,
+	bool enabled,
+	const Vector3& pos,
+	const Quaternion& rotation,
+	const Vector3& up,
+	float aspectRatio,
+	float fov,
+	float npd,
+	float fpd
+) : Camera(name, enabled, pos, rotation, up, aspectRatio, fov, npd, fpd),
+	_camCoords(rotation.ToYawPitchRoll().XY())
 {
 }
 
 void FreeCam::Update()
 {
 	if(Enabled) return;
+	if (Frozen)
+	{
+		Camera::Update();
+		return;
+	}
 
 	auto game = static_cast<Game*>(_game);
 	float dt = game->Update_dt;
@@ -39,19 +55,20 @@ void FreeCam::Update()
 
 	auto &kb = game->Keyboard;
 
-	Vector3 mv;
+	if(kb.IsKeyDown(Forward)) _dir += _fwd;
+	if(kb.IsKeyDown(Backward)) _dir -= _fwd;
+	if(kb.IsKeyDown(Left)) _dir -= right;
+	if(kb.IsKeyDown(Right)) _dir += right;
 
-	if(kb.IsKeyDown(Forward)) mv += _fwd;
-	if(kb.IsKeyDown(Backward)) mv -= _fwd;
-	if(kb.IsKeyDown(Left)) mv -= right;
-	if(kb.IsKeyDown(Right)) mv += right;
+	if (EnableElevation)
+	{
+		if (kb.IsKeyDown(Elevate)) _dir += Normal;
+		if (kb.IsKeyDown(Descend)) _dir -= Normal;
+	}
 
-	if(kb.IsKeyDown(Elevate)) mv += Normal;
-	if(kb.IsKeyDown(Descend)) mv -= Normal;
+	if(_dir.LengthSquared() > 0) _dir.Normalize();
 
-	if(mv.LengthSquared() > 0) mv.Normalize();
-
-	Position += mv * MovementSpeed * dt;
+	Position += _dir * MovementSpeed * dt;
 
 	Camera::Update();
 }