diff --git a/.gitignore b/.gitignore
index c71c960..e591cbb 100755
--- a/.gitignore
+++ b/.gitignore
@@ -400,3 +400,4 @@ jumpingbird.*
 jumpingbird.data
 build
 build-emcmake
+thirdparty1
diff --git a/BoneAnimatedModel.h b/BoneAnimatedModel.h
index e643d2a..b59a9e9 100644
--- a/BoneAnimatedModel.h
+++ b/BoneAnimatedModel.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Math.h"
+#include "ZLMath.h"
 #include "Renderer.h"
 #include <unordered_map>
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..0ff3428
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,441 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(space_game001 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# ==============================
+# Папка для всех сторонних либ
+# ==============================
+set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty1")
+file(MAKE_DIRECTORY "${THIRDPARTY_DIR}")
+
+macro(log msg)
+    message(STATUS "${msg}")
+endmacro()
+
+# ===========================================
+# 1) ZLIB (zlib131.zip → zlib-1.3.1)
+# ===========================================
+set(ZLIB_ARCHIVE      "${THIRDPARTY_DIR}/zlib131.zip")
+set(ZLIB_SRC_DIR      "${THIRDPARTY_DIR}/zlib-1.3.1")
+set(ZLIB_BUILD_DIR    "${ZLIB_SRC_DIR}/build")
+set(ZLIB_INSTALL_DIR  "${ZLIB_SRC_DIR}/install")
+
+if(NOT EXISTS "${ZLIB_ARCHIVE}")
+    log("Downloading zlib131.zip ...")
+    file(DOWNLOAD
+        "https://www.zlib.net/zlib131.zip"
+        "${ZLIB_ARCHIVE}"
+        SHOW_PROGRESS
+    )
+endif()
+
+if(NOT EXISTS "${ZLIB_SRC_DIR}/CMakeLists.txt")
+    log("Extracting zlib131.zip to zlib-1.3.1 ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND} -E tar xvf "${ZLIB_ARCHIVE}"
+        WORKING_DIRECTORY "${THIRDPARTY_DIR}"
+        RESULT_VARIABLE _zlib_extract_res
+    )
+    if(NOT _zlib_extract_res EQUAL 0)
+        message(FATAL_ERROR "Failed to extract zlib archive")
+    endif()
+endif()
+
+file(MAKE_DIRECTORY "${ZLIB_BUILD_DIR}")
+
+# проверяем, собран ли уже zlib
+set(_have_zlib FALSE)
+foreach(candidate
+    "${ZLIB_INSTALL_DIR}/lib/zlibstatic.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlib.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlibd.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlib1.lib"
+)
+    if(EXISTS "${candidate}")
+        set(_have_zlib TRUE)
+        break()
+    endif()
+endforeach()
+
+if(NOT _have_zlib)
+    log("Configuring zlib ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            -G "${CMAKE_GENERATOR}"
+            -S "${ZLIB_SRC_DIR}"
+            -B "${ZLIB_BUILD_DIR}"
+            -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTALL_DIR}
+        RESULT_VARIABLE _zlib_cfg_res
+    )
+    if(NOT _zlib_cfg_res EQUAL 0)
+        message(FATAL_ERROR "zlib configure failed")
+    endif()
+
+    log("Building zlib (Debug) ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            --build "${ZLIB_BUILD_DIR}" --config Debug
+        RESULT_VARIABLE _zlib_build_res
+    )
+    if(NOT _zlib_build_res EQUAL 0)
+        message(FATAL_ERROR "zlib build failed")
+    endif()
+
+    log("Installing zlib (Debug) ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            --install "${ZLIB_BUILD_DIR}" --config Debug
+        RESULT_VARIABLE _zlib_inst_res
+    )
+    if(NOT _zlib_inst_res EQUAL 0)
+        message(FATAL_ERROR "zlib install failed")
+    endif()
+endif()
+
+set(ZLIB_LIB_FILE "")
+foreach(candidate
+    "${ZLIB_INSTALL_DIR}/lib/zlibstatic.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlib.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlibd.lib"
+    "${ZLIB_INSTALL_DIR}/lib/zlib1.lib"
+)
+    if(EXISTS "${candidate}")
+        set(ZLIB_LIB_FILE "${candidate}")
+        break()
+    endif()
+endforeach()
+if(ZLIB_LIB_FILE STREQUAL "")
+    message(FATAL_ERROR "Could not find zlib library in ${ZLIB_INSTALL_DIR}/lib")
+endif()
+
+add_library(zlib_external_lib UNKNOWN IMPORTED GLOBAL)
+set_target_properties(zlib_external_lib PROPERTIES
+    IMPORTED_LOCATION "${ZLIB_LIB_FILE}"
+    INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INSTALL_DIR}/include"
+)
+
+# ===========================================
+# 2) SDL2 (release-2.32.10.zip → SDL-release-2.32.10)
+# ===========================================
+set(SDL2_ARCHIVE      "${THIRDPARTY_DIR}/release-2.32.10.zip")
+set(SDL2_SRC_DIR      "${THIRDPARTY_DIR}/SDL-release-2.32.10")
+set(SDL2_BUILD_DIR    "${SDL2_SRC_DIR}/build")
+set(SDL2_INSTALL_DIR  "${SDL2_SRC_DIR}/install")
+
+if(NOT EXISTS "${SDL2_ARCHIVE}")
+    log("Downloading SDL2 release-2.32.10.zip ...")
+    file(DOWNLOAD
+        "https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.10.zip"
+        "${SDL2_ARCHIVE}"
+        SHOW_PROGRESS
+    )
+endif()
+
+if(NOT EXISTS "${SDL2_SRC_DIR}/CMakeLists.txt")
+    log("Extracting SDL2 archive to SDL-release-2.32.10 ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND} -E tar xvf "${SDL2_ARCHIVE}"
+        WORKING_DIRECTORY "${THIRDPARTY_DIR}"
+        RESULT_VARIABLE _sdl_extract_res
+    )
+    if(NOT _sdl_extract_res EQUAL 0)
+        message(FATAL_ERROR "Failed to extract SDL2 archive")
+    endif()
+endif()
+
+file(MAKE_DIRECTORY "${SDL2_BUILD_DIR}")
+
+set(_have_sdl2 FALSE)
+foreach(candidate
+    "${SDL2_INSTALL_DIR}/lib/SDL2.lib"
+    "${SDL2_INSTALL_DIR}/lib/SDL2-static.lib"
+    "${SDL2_INSTALL_DIR}/lib/SDL2d.lib"
+)
+    if(EXISTS "${candidate}")
+        set(_have_sdl2 TRUE)
+        break()
+    endif()
+endforeach()
+
+if(NOT _have_sdl2)
+    log("Configuring SDL2 ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            -G "${CMAKE_GENERATOR}"
+            -S "${SDL2_SRC_DIR}"
+            -B "${SDL2_BUILD_DIR}"
+            -DCMAKE_INSTALL_PREFIX=${SDL2_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${ZLIB_INSTALL_DIR}   # путь к zlib для SDL2
+        RESULT_VARIABLE _sdl_cfg_res
+    )
+    if(NOT _sdl_cfg_res EQUAL 0)
+        message(FATAL_ERROR "SDL2 configure failed")
+    endif()
+
+    log("Building SDL2 (Debug) ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            --build "${SDL2_BUILD_DIR}" --config Debug
+        RESULT_VARIABLE _sdl_build_res
+    )
+    if(NOT _sdl_build_res EQUAL 0)
+        message(FATAL_ERROR "SDL2 build failed")
+    endif()
+
+    log("Installing SDL2 (Debug) ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            --install "${SDL2_BUILD_DIR}" --config Debug
+        RESULT_VARIABLE _sdl_inst_res
+    )
+    if(NOT _sdl_inst_res EQUAL 0)
+        message(FATAL_ERROR "SDL2 install failed")
+    endif()
+endif()
+
+set(SDL2_LIB_FILE "")
+foreach(candidate
+    "${SDL2_INSTALL_DIR}/lib/SDL2.lib"
+    "${SDL2_INSTALL_DIR}/lib/SDL2-static.lib"
+    "${SDL2_INSTALL_DIR}/lib/SDL2d.lib"
+)
+    if(EXISTS "${candidate}")
+        set(SDL2_LIB_FILE "${candidate}")
+        break()
+    endif()
+endforeach()
+if(SDL2_LIB_FILE STREQUAL "")
+    message(FATAL_ERROR "Could not find SDL2 library in ${SDL2_INSTALL_DIR}/lib")
+endif()
+
+set(SDL2MAIN_LIB_FILE "")
+if(EXISTS "${SDL2_INSTALL_DIR}/lib/SDL2main.lib")
+    set(SDL2MAIN_LIB_FILE "${SDL2_INSTALL_DIR}/lib/SDL2main.lib")
+endif()
+
+add_library(SDL2_external_lib UNKNOWN IMPORTED GLOBAL)
+set_target_properties(SDL2_external_lib PROPERTIES
+    IMPORTED_LOCATION "${SDL2_LIB_FILE}"
+    # Оба include-пути: и include, и include/SDL2
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INSTALL_DIR}/include;${SDL2_INSTALL_DIR}/include/SDL2"
+)
+
+if(NOT SDL2MAIN_LIB_FILE STREQUAL "")
+    add_library(SDL2main_external_lib UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(SDL2main_external_lib PROPERTIES
+        IMPORTED_LOCATION "${SDL2MAIN_LIB_FILE}"
+        INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INSTALL_DIR}/include"
+    )
+endif()
+
+# ===========================================
+# 3) libpng (v1.6.51.zip → libpng-1.6.51)
+#    ВАЖНО: не вызываем "cmake --install",
+#    берём .lib из build/Debug
+# ===========================================
+set(LIBPNG_ARCHIVE      "${THIRDPARTY_DIR}/v1.6.51.zip")
+set(LIBPNG_SRC_DIR      "${THIRDPARTY_DIR}/libpng-1.6.51")
+set(LIBPNG_BUILD_DIR    "${LIBPNG_SRC_DIR}/build")
+set(LIBPNG_INSTALL_DIR  "${LIBPNG_SRC_DIR}/install")  # на будущее
+
+if(NOT EXISTS "${LIBPNG_ARCHIVE}")
+    log("Downloading libpng v1.6.51.zip ...")
+    file(DOWNLOAD
+        "https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.51.zip"
+        "${LIBPNG_ARCHIVE}"
+        SHOW_PROGRESS
+    )
+endif()
+
+if(NOT EXISTS "${LIBPNG_SRC_DIR}/CMakeLists.txt")
+    log("Extracting libpng v1.6.51.zip to libpng-1.6.51 ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND} -E tar xvf "${LIBPNG_ARCHIVE}"
+        WORKING_DIRECTORY "${THIRDPARTY_DIR}"
+        RESULT_VARIABLE _png_extract_res
+    )
+    if(NOT _png_extract_res EQUAL 0)
+        message(FATAL_ERROR "Failed to extract libpng archive")
+    endif()
+endif()
+
+file(MAKE_DIRECTORY "${LIBPNG_BUILD_DIR}")
+
+# Проверяем, есть ли уже .lib (build/Debug или install/lib)
+set(_have_png FALSE)
+set(_libpng_candidates
+    "${LIBPNG_BUILD_DIR}/Debug/libpng16_staticd.lib"
+    "${LIBPNG_BUILD_DIR}/Debug/libpng16d.lib"
+    "${LIBPNG_BUILD_DIR}/Debug/png16d.lib"
+    "${LIBPNG_BUILD_DIR}/libpng16_staticd.lib"
+    "${LIBPNG_BUILD_DIR}/libpng16d.lib"
+    "${LIBPNG_INSTALL_DIR}/lib/libpng16_staticd.lib"
+    "${LIBPNG_INSTALL_DIR}/lib/libpng16d.lib"
+    "${LIBPNG_INSTALL_DIR}/lib/png16d.lib"
+)
+
+foreach(candidate IN LISTS _libpng_candidates)
+    if(EXISTS "${candidate}")
+        set(_have_png TRUE)
+        break()
+    endif()
+endforeach()
+
+if(NOT _have_png)
+    log("Configuring libpng ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            -G "${CMAKE_GENERATOR}"
+            -S "${LIBPNG_SRC_DIR}"
+            -B "${LIBPNG_BUILD_DIR}"
+            -DCMAKE_INSTALL_PREFIX=${LIBPNG_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${ZLIB_INSTALL_DIR}
+            -DZLIB_ROOT=${ZLIB_INSTALL_DIR}
+        RESULT_VARIABLE _png_cfg_res
+    )
+    if(NOT _png_cfg_res EQUAL 0)
+        message(FATAL_ERROR "libpng configure failed")
+    endif()
+
+    log("Building libpng (Debug) ...")
+    execute_process(
+        COMMAND ${CMAKE_COMMAND}
+            --build "${LIBPNG_BUILD_DIR}" --config Debug
+        RESULT_VARIABLE _png_build_res
+    )
+    if(NOT _png_build_res EQUAL 0)
+        message(FATAL_ERROR "libpng build failed")
+    endif()
+
+    # без --install, чтобы не упереться в INSTALL target
+endif()
+
+# Ищем конкретный .lib для линковки
+set(LIBPNG_LIB_FILE "")
+foreach(candidate IN LISTS _libpng_candidates)
+    if(EXISTS "${candidate}")
+        set(LIBPNG_LIB_FILE "${candidate}")
+        break()
+    endif()
+endforeach()
+if(LIBPNG_LIB_FILE STREQUAL "")
+    message(FATAL_ERROR "Could not find libpng library (checked build/Debug and install/lib)")
+endif()
+
+add_library(libpng_external_lib UNKNOWN IMPORTED GLOBAL)
+set_target_properties(libpng_external_lib PROPERTIES
+    IMPORTED_LOCATION "${LIBPNG_LIB_FILE}"
+    # png.h, pngconf.h – в SRC, pnglibconf.h – в BUILD
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBPNG_SRC_DIR};${LIBPNG_BUILD_DIR}"
+)
+
+# ===========================================
+# Основной проект space_game001
+# ===========================================
+add_executable(space_game001
+    main.cpp
+    Game.cpp
+    Game.h
+    Environment.cpp
+    Environment.h
+    Renderer.cpp
+    Renderer.h
+    ShaderManager.cpp
+    ShaderManager.h
+    TextureManager.cpp
+    TextureManager.h
+    TextModel.cpp
+    TextModel.h
+    AudioPlayerAsync.cpp
+    AudioPlayerAsync.h
+    BoneAnimatedModel.cpp
+    BoneAnimatedModel.h
+    Math.cpp
+    ZLMath.h
+    OpenGlExtensions.cpp
+    OpenGlExtensions.h
+    Utils.cpp
+    Utils.h
+)
+
+# include-пути проекта
+target_include_directories(space_game001 PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/gl"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmakeaudioplayer/include"
+    "${SDL2_INSTALL_DIR}/include"
+    "${SDL2_INSTALL_DIR}/include/SDL2"
+)
+
+set_target_properties(space_game001 PROPERTIES
+    OUTPUT_NAME "space-game001"
+)
+
+# Определения препроцессора:
+# PNG_ENABLED – включает код PNG в TextureManager
+# SDL_MAIN_HANDLED – отключает переопределение main -> SDL_main
+target_compile_definitions(space_game001 PRIVATE
+    PNG_ENABLED
+    SDL_MAIN_HANDLED
+)
+
+# Линкуем с SDL2main, если он вообще установлен
+if(TARGET SDL2main_external_lib)
+    target_link_libraries(space_game001 PRIVATE SDL2main_external_lib)
+endif()
+
+# Линкуем сторонние библиотеки
+target_link_libraries(space_game001 PRIVATE
+    SDL2_external_lib
+    libpng_external_lib
+    zlib_external_lib
+)
+
+# Линкуем OpenGL (Windows)
+if(WIN32)
+    target_link_libraries(space_game001 PRIVATE opengl32)
+endif()
+
+# ===========================================
+# Копирование SDL2d.dll и zlibd.dll рядом с exe
+# ===========================================
+if (WIN32)
+    add_custom_command(TARGET space_game001 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "Copying SDL2d.dll and zlibd.dll to output folder..."
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${SDL2_BUILD_DIR}/Debug/SDL2d.dll"
+            "$<TARGET_FILE_DIR:space_game001>/SDL2d.dll"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${ZLIB_BUILD_DIR}/Debug/zlibd.dll"
+            "$<TARGET_FILE_DIR:space_game001>/zlibd.dll"
+    )
+endif()
+
+
+# ===========================================
+# Копирование ресурсов после сборки
+# ===========================================
+
+# Какие папки с ресурсами нужно копировать
+set(RUNTIME_RESOURCE_DIRS
+    "resources"
+    "shaders"
+)
+
+# Копируем ресурсы и шейдеры в папку exe и в корень build/
+foreach(resdir IN LISTS RUNTIME_RESOURCE_DIRS)
+    add_custom_command(TARGET space_game001 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "Copying ${resdir} to runtime folders..."
+        # 1) туда, где лежит exe (build/Debug, build/Release и т.п.)
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_SOURCE_DIR}/${resdir}"
+            "$<TARGET_FILE_DIR:space_game001>/${resdir}"
+        # 2) в корень build, если захочешь запускать из этой папки
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_SOURCE_DIR}/${resdir}"
+            "${CMAKE_BINARY_DIR}/${resdir}"
+    )
+endforeach()
diff --git a/Environment.h b/Environment.h
index d974a9e..a625258 100644
--- a/Environment.h
+++ b/Environment.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Math.h"
+#include "ZLMath.h"
 #ifdef __linux__
 #include <SDL2/SDL.h>
 #endif
diff --git a/Math.cpp b/Math.cpp
index c492597..a7953ba 100755
--- a/Math.cpp
+++ b/Math.cpp
@@ -1,4 +1,4 @@
-#include "Math.h"
+#include "ZLMath.h"
 
 #include <exception>
 #include <cmath>
diff --git a/Renderer.h b/Renderer.h
index 55bbc4d..e502b74 100755
--- a/Renderer.h
+++ b/Renderer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "OpenGlExtensions.h"
-#include "Math.h"
+#include "ZLMath.h"
 #include <exception>
 #include <stdexcept>
 #include "ShaderManager.h"
diff --git a/TextModel.h b/TextModel.h
index df2a491..8273b03 100644
--- a/TextModel.h
+++ b/TextModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Math.h"
+#include "ZLMath.h"
 #include "Renderer.h"
 #include <unordered_map>
 
diff --git a/Math.h b/ZLMath.h
old mode 100755
new mode 100644
similarity index 96%
rename from Math.h
rename to ZLMath.h
index bba9774..6f5ecc0
--- a/Math.h
+++ b/ZLMath.h
@@ -1,110 +1,111 @@
-#pragma once
-
-#include <array>
-#include <exception>
-#include <stdexcept>
-#include <cmath>
-
-namespace ZL {
-
-	struct Vector4f
-	{
-		std::array<float, 4> v = { 0.f, 0.f, 0.f, 0.f };
-
-		Vector4f normalized() const {
-			double norm = std::sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + v[3] * v[3]);
-			Vector4f r;
-
-			r.v[0] = v[0] / norm;
-			r.v[1] = v[1] / norm;
-			r.v[2] = v[2] / norm;
-			r.v[3] = v[3] / norm;
-
-			return r;
-		}
-
-		double dot(const Vector4f& other) const {
-			return v[0] * other.v[0] + v[1] * other.v[1] + v[2] * other.v[2] + v[3] * other.v[3];
-		}
-	};
-
-	struct Vector3f
-	{
-		std::array<float, 3> v = { 0.f, 0.f, 0.f };
-	};
-
-	struct Vector2f
-	{
-		std::array<float, 2> v = {0.f, 0.f};
-	};
-
-	Vector2f operator+(const Vector2f& x, const Vector2f& y);
-
-	Vector2f operator-(const Vector2f& x, const Vector2f& y);
-	
-	Vector3f operator+(const Vector3f& x, const Vector3f& y);
-
-	Vector3f operator-(const Vector3f& x, const Vector3f& y);
-	Vector4f operator+(const Vector4f& x, const Vector4f& y);
-
-	Vector4f operator-(const Vector4f& x, const Vector4f& y);
-
-
-	struct Matrix3f
-	{
-		std::array<float, 9> m = {	0.f, 0.f, 0.f, 
-									0.f, 0.f, 0.f,
-									0.f, 0.f, 0.f, };
-
-		static Matrix3f Identity();
-	};
-
-	struct Matrix4f
-	{
-		std::array<float, 16> m = { 0.f, 0.f, 0.f, 0.f,
-									0.f, 0.f, 0.f, 0.f,
-									0.f, 0.f, 0.f, 0.f,
-									0.f, 0.f, 0.f, 0.f };
-
-		static Matrix4f Identity();
-
-		float& operator()(int row, int col) {
-			//return m[row * 4 + col]; //OpenGL specific
-			return m[col * 4 + row];
-		}
-
-		const float& operator()(int row, int col) const {
-			//return m[row * 4 + col];
-			return m[col * 4 + row];
-		}
-	};
-
-	Matrix4f operator*(const Matrix4f& m1, const Matrix4f& m2);
-
-	Matrix4f MakeOrthoMatrix(float width, float height, float zNear, float zFar);
-
-	Matrix4f MakePerspectiveMatrix(float fovY, float aspectRatio, float zNear, float zFar);
-
-	Matrix3f QuatToMatrix(const Vector4f& q);
-
-	Vector4f MatrixToQuat(const Matrix3f& m);
-
-	Vector4f QuatFromRotateAroundX(float angle);
-	Vector4f QuatFromRotateAroundY(float angle);
-	Vector4f QuatFromRotateAroundZ(float angle);
-
-	Vector3f operator*(Vector3f v, float scale);
-	Vector4f operator*(Vector4f v, float scale);
-
-	Vector3f MultVectorMatrix(Vector3f v, Matrix3f mt);
-	Vector4f MultVectorMatrix(Vector4f v, Matrix4f mt);
-	Vector4f MultMatrixVector(Matrix4f mt, Vector4f v);
-
-	Vector4f slerp(const Vector4f& q1, const Vector4f& q2, float t);
-	Matrix3f InverseMatrix(const Matrix3f& m);
-	Matrix4f InverseMatrix(const Matrix4f& m);
-	Matrix3f MultMatrixMatrix(const Matrix3f& m1, const Matrix3f& m2);
-	Matrix4f MultMatrixMatrix(const Matrix4f& m1, const Matrix4f& m2);
-	Matrix4f MakeMatrix4x4(const Matrix3f& m, const Vector3f pos);
-
-};
\ No newline at end of file
+#pragma once
+
+#include <array>
+#include <exception>
+#include <stdexcept>
+#include <cmath>
+
+namespace ZL {
+
+	struct Vector4f
+	{
+		std::array<float, 4> v = { 0.f, 0.f, 0.f, 0.f };
+
+		Vector4f normalized() const {
+			double norm = std::sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + v[3] * v[3]);
+			Vector4f r;
+
+			r.v[0] = v[0] / norm;
+			r.v[1] = v[1] / norm;
+			r.v[2] = v[2] / norm;
+			r.v[3] = v[3] / norm;
+
+			return r;
+		}
+
+		double dot(const Vector4f& other) const {
+			return v[0] * other.v[0] + v[1] * other.v[1] + v[2] * other.v[2] + v[3] * other.v[3];
+		}
+	};
+
+	struct Vector3f
+	{
+		std::array<float, 3> v = { 0.f, 0.f, 0.f };
+	};
+
+	struct Vector2f
+	{
+		std::array<float, 2> v = {0.f, 0.f};
+	};
+
+	Vector2f operator+(const Vector2f& x, const Vector2f& y);
+
+	Vector2f operator-(const Vector2f& x, const Vector2f& y);
+	
+	Vector3f operator+(const Vector3f& x, const Vector3f& y);
+
+	Vector3f operator-(const Vector3f& x, const Vector3f& y);
+	Vector4f operator+(const Vector4f& x, const Vector4f& y);
+
+	Vector4f operator-(const Vector4f& x, const Vector4f& y);
+
+
+	struct Matrix3f
+	{
+		std::array<float, 9> m = {	0.f, 0.f, 0.f, 
+									0.f, 0.f, 0.f,
+									0.f, 0.f, 0.f, };
+
+		static Matrix3f Identity();
+	};
+
+	struct Matrix4f
+	{
+		std::array<float, 16> m = { 0.f, 0.f, 0.f, 0.f,
+									0.f, 0.f, 0.f, 0.f,
+									0.f, 0.f, 0.f, 0.f,
+									0.f, 0.f, 0.f, 0.f };
+
+		static Matrix4f Identity();
+
+		float& operator()(int row, int col) {
+			//return m[row * 4 + col]; //OpenGL specific
+			return m[col * 4 + row];
+		}
+
+		const float& operator()(int row, int col) const {
+			//return m[row * 4 + col];
+			return m[col * 4 + row];
+		}
+	};
+
+	Matrix4f operator*(const Matrix4f& m1, const Matrix4f& m2);
+
+	Matrix4f MakeOrthoMatrix(float width, float height, float zNear, float zFar);
+
+	Matrix4f MakePerspectiveMatrix(float fovY, float aspectRatio, float zNear, float zFar);
+
+	Matrix3f QuatToMatrix(const Vector4f& q);
+
+	Vector4f MatrixToQuat(const Matrix3f& m);
+
+	Vector4f QuatFromRotateAroundX(float angle);
+	Vector4f QuatFromRotateAroundY(float angle);
+	Vector4f QuatFromRotateAroundZ(float angle);
+
+	Vector3f operator*(Vector3f v, float scale);
+	Vector4f operator*(Vector4f v, float scale);
+
+	Vector3f MultVectorMatrix(Vector3f v, Matrix3f mt);
+	Vector4f MultVectorMatrix(Vector4f v, Matrix4f mt);
+	Vector4f MultMatrixVector(Matrix4f mt, Vector4f v);
+
+	Vector4f slerp(const Vector4f& q1, const Vector4f& q2, float t);
+	Matrix3f InverseMatrix(const Matrix3f& m);
+	Matrix4f InverseMatrix(const Matrix4f& m);
+	Matrix3f MultMatrixMatrix(const Matrix3f& m1, const Matrix3f& m2);
+	Matrix4f MultMatrixMatrix(const Matrix4f& m1, const Matrix4f& m2);
+	Matrix4f MakeMatrix4x4(const Matrix3f& m, const Vector3f pos);
+
+};
+