chore(thirdparty): rename ice and stb_image libraries to avoid possib…

…le conflicts

CMakeLists.txt

@@ -48,9 +48,9 @@ if(SOURCEPP_USE_VTFPP AND NOT TARGET miniz)
 endif()
 
 
-# stb_image
+# stb
 if(SOURCEPP_USE_VTFPP)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/stb_image")
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/stb")
 endif()
 
 
@@ -147,7 +147,7 @@ if(SOURCEPP_USE_VICEPP)
     add_pretty_parser(vicepp SOURCES
             "${CMAKE_CURRENT_SOURCE_DIR}/include/vicepp/vicepp.h"
             "${CMAKE_CURRENT_SOURCE_DIR}/src/vicepp/vicepp.cpp")
-    target_link_libraries(vicepp PRIVATE ice)
+    target_link_libraries(vicepp PRIVATE sourcepp_ice)
 endif()
 
 
@@ -169,7 +169,7 @@ if(SOURCEPP_USE_VTFPP)
             "${CMAKE_CURRENT_SOURCE_DIR}/include/vtfpp/vtfpp.h"
             "${CMAKE_CURRENT_SOURCE_DIR}/src/vtfpp/ImageConversion.cpp"
             "${CMAKE_CURRENT_SOURCE_DIR}/src/vtfpp/vtfpp.cpp")
-    target_link_libraries(vtfpp PRIVATE miniz stb_image)
+    target_link_libraries(vtfpp PRIVATE miniz sourcepp_stb)
 
     # Compressonator
     if(MSVC)

include/sourcepp/math/Matrix.h

@@ -11,9 +11,6 @@ class Matrix {
 
 	[[nodiscard]] const P* operator[](uint8_t i) const { return this->data[i]; }
 
-	// todo(c++23): convert to operator[]
-	[[nodiscard]] P operator()(uint8_t i, uint8_t j) const { return this->data[i][j]; }
-
 private:
 	P data[M][N];
 };

src/dmxpp/structs/Value.cpp

@@ -115,7 +115,7 @@ std::string Attribute::getValue() const {
 			for (int i = 0; i < 4; i++) {
 				out += (i == 0 ? '[' : ' ');
 				for (int j = 0; j < 4; j++) {
-					out += std::to_string(mat4(i,j));
+					out += std::to_string(mat4[i][j]);
 					if (j < 3) {
 						out += ", ";
 					} else if (i < 3) {
@@ -236,7 +236,7 @@ std::string Attribute::getValue() const {
 				for (int i = 0; i < 4; i++) {
 					out += (i == 0 ? "" : "  ");
 					for (int j = 0; j < 4; j++) {
-						out += std::to_string(matrices[m](i,j));
+						out += std::to_string(matrices[m][i][j]);
 						if (j < 3) {
 							out += ", ";
 						} else if (i < 3) {

src/thirdparty/ice/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(ice)
+project(sourcepp_ice)
 set(CMAKE_CXX_STANDARD 20)
 
 # Create library

src/thirdparty/stb_image/CMakeLists.txt → src/thirdparty/stb/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(stb_image)
+project(sourcepp_stb)
 set(CMAKE_CXX_STANDARD 20)
 
 # Create library