lairworks · DanRStevens · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025
diff --git a/SampleProjects/BlendingModes/Test3State.cpp b/SampleProjects/BlendingModes/Test3State.cpp
@@ -1,5 +1,7 @@
 #include "Test3State.h"
 
+#include <NAS2D/EnumKeyCode.h>
+
 #include <GL/glew.h>
 
 #include <sstream>
@@ -76,45 +78,45 @@ NAS2D::State* Test3State::update()
 }
 
 
-void Test3State::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier /*mod*/, bool repeat)
+void Test3State::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, bool repeat)
 {
 	if (repeat)
 		return;
 
-	if (key == NAS2D::EventHandler::KeyCode::KEY_ESCAPE)
+	if (key == NAS2D::KeyCode::Escape)
 		NAS2D::postQuitEvent();
 
-	if (key == NAS2D::EventHandler::KeyCode::KEY_1)
+	if (key == NAS2D::KeyCode::Num1)
 	{
 		mCurrentCaustics = &mCaustics1;
 		mBlendingModeText = "Alpha";
 		mMultiply = false;
 	}
-	if (key == NAS2D::EventHandler::KeyCode::KEY_2)
+	if (key == NAS2D::KeyCode::Num2)
 	{
 		mCurrentCaustics = &mCaustics2;
 		mBlendingModeText = "Multiply";
 		mMultiply = true;
 	}
-	if (key == NAS2D::EventHandler::KeyCode::KEY_3)
+	if (key == NAS2D::KeyCode::Num3)
 	{
 		mCurrentCaustics = &mCaustics2;
 		mBlendingModeText = "Caustics Only";
 		mMultiply = false;
 	}
-	if (key == NAS2D::EventHandler::KeyCode::KEY_4)
+	if (key == NAS2D::KeyCode::Num4)
 	{
 		mCurrentCaustics = &mCaustics3;
 		mBlendingModeText = "Alpha";
 		mMultiply = false;
 	}
-	if (key == NAS2D::EventHandler::KeyCode::KEY_5)
+	if (key == NAS2D::KeyCode::Num5)
 	{
 		mCurrentCaustics = &mCaustics4;
 		mBlendingModeText = "Multiply";
 		mMultiply = true;
 	}
-	if (key == NAS2D::EventHandler::KeyCode::KEY_6)
+	if (key == NAS2D::KeyCode::Num6)
 	{
 		mCurrentCaustics = &mCaustics4;
 		mBlendingModeText = "Caustics Only";

diff --git a/SampleProjects/BlendingModes/Test3State.h b/SampleProjects/BlendingModes/Test3State.h
@@ -14,7 +14,7 @@ class Test3State: public NAS2D::State
 	void initialize() override;
 	State* update() override;
 
-	void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
+	void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
 
 private:
 

diff --git a/SampleProjects/RendererFunctions/Test2State.cpp b/SampleProjects/RendererFunctions/Test2State.cpp
@@ -2,6 +2,8 @@
 
 #include "Test2State.h"
 
+#include <NAS2D/EnumKeyCode.h>
+
 #include <functional>
 #include <random>
 
@@ -60,12 +62,12 @@ NAS2D::State* Test2State::update()
 	renderer.drawCircle(NAS2D::Point{150, 170}, 20, NAS2D::Color{0, 200, 0, 255}, 16, NAS2D::Vector<float>{1.0, 0.5});
 
 	renderer.drawImage(mImage1, NAS2D::Point{200, 20}, 0);
-	renderer.drawImageRotated(mImage1, NAS2D::Point{500, 20}, (mTimer.tick() / 20.0f));
+	renderer.drawImageRotated(mImage1, NAS2D::Point{500, 20}, NAS2D::Angle::degrees(mTimer.tick() / 20.0f));
 
 	renderer.drawSubImage(mImage1, NAS2D::Point{10, 250}, NAS2D::Rectangle{0, 0, 64, 64});
-	renderer.drawSubImageRotated(mImage1, NAS2D::Point{100, 250}, NAS2D::Rectangle{0, 0, 64, 64}, (mTimer.tick() / 20.0f));
+	renderer.drawSubImageRotated(mImage1, NAS2D::Point{100, 250}, NAS2D::Rectangle{0, 0, 64, 64}, NAS2D::Angle::degrees(mTimer.tick() / 20.0f));
 
-	renderer.drawImageRotated(mImage1, NAS2D::Point{500, 300}, -(mTimer.tick() / 20.0f));
+	renderer.drawImageRotated(mImage1, NAS2D::Point{500, 300}, -NAS2D::Angle::degrees(mTimer.tick() / 20.0f));
 
 	for (int i = 0; i < 2000; ++i)
 	{
@@ -95,19 +97,19 @@ NAS2D::State* Test2State::update()
 }
 
 
-void Test2State::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier /*mod*/, bool /*repeat*/)
+void Test2State::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, bool /*repeat*/)
 {
 	switch (key)
 	{
-		case NAS2D::EventHandler::KeyCode::KEY_ESCAPE:
+		case NAS2D::KeyCode::Escape:
 			NAS2D::postQuitEvent();
 			break;
-		case NAS2D::EventHandler::KeyCode::KEY_F1: {
+		case NAS2D::KeyCode::F1: {
 			auto& renderer = NAS2D::Utility<NAS2D::Renderer>::get();
 			renderer.fullscreen(!renderer.fullscreen());
 			break;
 		}
-		case NAS2D::EventHandler::KeyCode::KEY_F2: {
+		case NAS2D::KeyCode::F2: {
 			auto& renderer = NAS2D::Utility<NAS2D::Renderer>::get();
 			renderer.resizeable(!renderer.resizeable());
 			break;
@@ -122,7 +124,7 @@ void Test2State::onMouseMove(NAS2D::Point<int> /*position*/, NAS2D::Vector<int>
 {}
 
 
-void Test2State::onMouseDown(NAS2D::EventHandler::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
+void Test2State::onMouseDown(NAS2D::MouseButton /*button*/, NAS2D::Point<int> /*position*/)
 {}
 
 

diff --git a/SampleProjects/RendererFunctions/Test2State.h b/SampleProjects/RendererFunctions/Test2State.h
@@ -11,9 +11,9 @@ class Test2State: public NAS2D::State
 	void initialize() override;
 	State* update() override;
 
-	void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
+	void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
 	void onMouseMove(NAS2D::Point<int> position, NAS2D::Vector<int> change);
-	void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
+	void onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position);
 
 	void onWindowResized(NAS2D::Vector<int> newSize);
 

diff --git a/SampleProjects/ZombieGame/GameState.cpp b/SampleProjects/ZombieGame/GameState.cpp
@@ -1,5 +1,8 @@
 #include "GameState.h"
 
+#include <NAS2D/EnumKeyCode.h>
+#include <NAS2D/EnumMouseButton.h>
+
 #include <functional>
 #include <iostream>
 #include <random>
@@ -165,23 +168,23 @@ void GameState::updateZombies()
 }
 
 
-void GameState::onKeyDown(NAS2D::EventHandler::KeyCode /*key*/, NAS2D::EventHandler::KeyModifier /*mod*/, bool repeat)
+void GameState::onKeyDown(NAS2D::KeyCode /*key*/, NAS2D::KeyModifier /*mod*/, bool repeat)
 {
 	if (repeat)
 		return;
 }
 
 
-void GameState::onKeyUp(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier /*mod*/)
+void GameState::onKeyUp(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/)
 {
-	if (key == NAS2D::EventHandler::KeyCode::KEY_ESCAPE)
+	if (key == NAS2D::KeyCode::Escape)
 		NAS2D::postQuitEvent();
 }
 
 
-void GameState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> /*position*/)
+void GameState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> /*position*/)
 {
-	if (button == NAS2D::EventHandler::MouseButton::Left)
+	if (button == NAS2D::MouseButton::Left)
 	{
 		mGunTimer.reset();
 		mLeftButtonDown = true;
@@ -190,9 +193,9 @@ void GameState::onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Poin
 }
 
 
-void GameState::onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> /*position*/)
+void GameState::onMouseUp(NAS2D::MouseButton button, NAS2D::Point<int> /*position*/)
 {
-	if (button == NAS2D::EventHandler::MouseButton::Left)
+	if (button == NAS2D::MouseButton::Left)
 	{
 		mLeftButtonDown = false;
 	}

diff --git a/SampleProjects/ZombieGame/GameState.h b/SampleProjects/ZombieGame/GameState.h
@@ -16,11 +16,11 @@ class GameState: public NAS2D::State
 	void initialize() override;
 	State* update() override;
 
-	void onKeyUp(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod);
-	void onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandler::KeyModifier mod, bool repeat);
+	void onKeyUp(NAS2D::KeyCode key, NAS2D::KeyModifier mod);
+	void onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier mod, bool repeat);
 	void onMouseMove(NAS2D::Point<int> position, NAS2D::Vector<int> change);
-	void onMouseUp(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
-	void onMouseDown(NAS2D::EventHandler::MouseButton button, NAS2D::Point<int> position);
+	void onMouseUp(NAS2D::MouseButton button, NAS2D::Point<int> position);
+	void onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> position);
 
 	void onQuit();
 

diff --git a/SampleProjects/ZombieGame/Zombie.h b/SampleProjects/ZombieGame/Zombie.h
@@ -10,7 +10,7 @@ class Zombie
 
 	void update(int timeDelta, NAS2D::Point<float> playerPosition);
 
-	float rotation() const { return mSprite.rotation(); }
+	float rotation() const { return mSprite.rotation().degrees(); }
 	NAS2D::Point<float> position() const { return mPosition; }
 	bool hit(NAS2D::Point<int> pt);
 

diff --git a/nas2d-core b/nas2d-core
+12 −9		.circleci/config.yml
+81 −31		.github/workflows/build.yml
+52 −0		.github/workflows/buildDockerBuildEnv.yml
+192 −0		NAS2D/EnumKeyCode.h
+37 −0		NAS2D/EnumKeyModifier.cpp
+34 −0		NAS2D/EnumKeyModifier.h
+13 −0		NAS2D/EnumMouseButton.h
+114 −137		NAS2D/EventHandler.cpp
+88 −317		NAS2D/EventHandler.h
+1 −9		NAS2D/Filesystem.cpp
+1 −1		NAS2D/Game.cpp
+42 −0		NAS2D/Math/Angle.h
+1 −1		NAS2D/Math/MathUtils.h
+0 −3		NAS2D/Math/Point.cpp
+17 −6		NAS2D/Math/Point.h
+0 −3		NAS2D/Math/Rectangle.cpp
+7 −3		NAS2D/Math/Rectangle.h
+7 −24		NAS2D/Math/Trig.cpp
+3 −11		NAS2D/Math/Trig.h
+8 −0		NAS2D/Math/Vector.cpp
+16 −6		NAS2D/Math/Vector.h
+2 −2		NAS2D/Mixer/Mixer.cpp
+2 −4		NAS2D/Mixer/Mixer.h
+1 −1		NAS2D/Mixer/MixerNull.cpp
+1 −1		NAS2D/Mixer/MixerNull.h
+2 −2		NAS2D/Mixer/MixerSDL.cpp
+1 −1		NAS2D/Mixer/MixerSDL.h
+9 −1		NAS2D/NAS2D.vcxproj
+18 −0		NAS2D/NAS2D.vcxproj.filters
+25 −1		NAS2D/Renderer/Fade.cpp
+13 −7		NAS2D/Renderer/Fade.h
+7 −7		NAS2D/Renderer/Renderer.h
+4 −2		NAS2D/Renderer/RendererNull.h
+50 −41		NAS2D/Renderer/RendererOpenGL.cpp
+2 −2		NAS2D/Renderer/RendererOpenGL.h
+9 −9		NAS2D/Renderer/Window.cpp
+8 −2		NAS2D/Renderer/Window.h
+45 −17		NAS2D/Resource/Font.cpp
+5 −1		NAS2D/Resource/Font.h
+2 −1		NAS2D/Resource/Image.cpp
+5 −2		NAS2D/Resource/Image.h
+7 −7		NAS2D/Resource/Sprite.cpp
+4 −3		NAS2D/Resource/Sprite.h
+0 −1		NAS2D/Signal/Delegate.h
+0 −1		NAS2D/Signal/SignalConnection.h
+2 −2		NAS2D/State.h
+1 −12		NAS2D/StringUtils.h
+11 −12		NAS2D/Utility.h
+1 −1		README.md
+0 −91		docker/Makefile
+42 −0		dockerBuildEnv/makefile
+1 −1		dockerBuildEnv/nas2d-arch.Dockerfile
+1 −0		dockerBuildEnv/nas2d-arch.version.mk
+14 −14		dockerBuildEnv/nas2d-clang.Dockerfile
+1 −0		dockerBuildEnv/nas2d-clang.version.mk
+13 −13		dockerBuildEnv/nas2d-gcc.Dockerfile
+1 −0		dockerBuildEnv/nas2d-gcc.version.mk
+37 −25		dockerBuildEnv/nas2d-mingw.Dockerfile
+1 −0		dockerBuildEnv/nas2d-mingw.version.mk
+16 −51		makefile
+69 −32		test-graphics/TestGraphics.cpp
+2 −2		test-graphics/TestGraphics.h
+0 −1		test/Configuration.test.cpp
+0 −1		test/ContainerUtils.test.cpp
+2 −3		test/Dictionary.test.cpp
+37 −0		test/EventHandler.test.cpp
+59 −0		test/Math/Angle.test.cpp
+2 −3		test/Math/MathUtils.test.cpp
+26 −13		test/Math/Point.test.cpp
+4 −4		test/Math/Rectangle.test.cpp
+13 −20		test/Math/Trig.test.cpp
+28 −13		test/Math/Vector.test.cpp
+4 −4		test/Renderer/DisplayDesc.test.cpp
+29 −0		test/Resource/Font.test.cpp
+45 −21		test/Resource/Sprite.test.cpp
+54 −7		test/Signal/Signal.test.cpp
+32 −28		test/StringUtils.test.cpp
+1 −1		test/StringValue.test.cpp
+1 −1		test/Version.test.cpp
+4 −3		test/test.vcxproj
+11 −10		vcpkg.json