This commit is contained in:
2025-11-09 16:56:55 +01:00
parent adec566482
commit a783e001b9
6 changed files with 348 additions and 387 deletions
+45 -45
View File
@@ -1,65 +1,65 @@
//Ablage für ChatGPT Sachen, nicht relavant für das Projekt (Nur ein "Cloud"-Zwischenspeicher)
// Created by gamer on 09.11.2025.
//
#include <iostream>
#include <array>
#include <string>
#include <cmath>
// Typalias für 4x4-Matrix mit double
using Matrix4x4 = std::array<std::array<double, 4>, 4>;
#include "gamematrix.h"
// Matrixmultiplikation
static std::array<std::array<double,4>,4> matmul(const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B);
// Matrixmultiplikation: C = A * B
Matrix4x4 matmul(const Matrix4x4& A, const Matrix4x4& B) {
Matrix4x4 C = {}; // Alle Werte automatisch 0
// Rotationsmatrix um Achse x/y/z
static std::array<std::array<double,4>,4> rot3D(double angle_deg, char axis);
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int k = 0; k < 4; ++k) {
// Verschiebung
static std::array<std::array<double,4>,4> translate(const std::array<double, 3>& pos);
//Mathematische Funkion, Rechnung (Matrix C = A*B)
std::array<std::array<double,4>,4> gameMatrix::matmul(
const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B)
{
std::array<std::array<double,4>,4> C{};
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j)
for (int k = 0; k < 4; ++k)
C[i][j] += A[i][k] * B[k][j];
}
}
}
return C;
}
// Matrixeinlesung vom Benutzer
Matrix4x4 inputMatrix(const std::string& name) {
Matrix4x4 M = {};
std::cout << "Bitte Werte für Matrix " << name << " (4x4) eingeben:\n";
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
std::cout << name << "[" << i << "][" << j << "]: ";
std::cin >> M[i][j];
}
}
return M;
}
// Matrixausgabe
void printMatrix(const Matrix4x4& M) {
for (int i = 0; i < 4; ++i) {
int main()
{
std::array<std::array<double,4>,4> A{};
std::array<std::array<double,4>,4> B{};
std::cout << "Gib die Werte für Matrix A (4x4) ein:\n";
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j) {
std::cout << M[i][j] << "\t";
std::cout << "A[" << i << "][" << j << "] = ";
std::cin >> A[i][j];
}
std::cout << "\nGib die Werte für Matrix B (4x4) ein:\n";
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j) {
std::cout << "B[" << i << "][" << j << "] = ";
std::cin >> B[i][j];
}
auto C = gameMatrix::matmul(A, B);
std::cout << "\nErgebnis der Matrixmultiplikation (C = A * B):\n";
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j)
std::cout << C[i][j] << "\t";
std::cout << "\n";
}
}
int main() {
// Benutzerinput
Matrix4x4 A = inputMatrix("A");
Matrix4x4 B = inputMatrix("B");
// Multiplikation
Matrix4x4 C = matmul(A, B);
// Ausgabe
std::cout << "\nErgebnis der Matrixmultiplikation (C = A * B):\n";
printMatrix(C);
return 0;
}
//das ist statisch. Matrix A und B sollen von User als input gegeben werden
+59 -3
View File
@@ -1,10 +1,11 @@
//
// Created by kris- on 03.11.2025.
//
#include <gamematrix.h>
#include <iostream>
#include "gamematrix.h"
// Matrixmultiplikation
static std::array<std::array<double,4>,4> matmul(const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B);
// Rotationsmatrix um Achse x/y/z
static std::array<std::array<double,4>,4> rot3D(double angle_deg, char axis);
@@ -12,3 +13,58 @@ static std::array<std::array<double,4>,4> rot3D(double angle_deg, char axis);
// Verschiebung
static std::array<std::array<double,4>,4> translate(const std::array<double, 3>& pos);
//Matrixmultiplikation-Funktion
std::array<std::array<double,4>,4> gameMatrix::matmul(
const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B)
//Mathematische Funkion, Rechnung (Matrix C = A*B)
{
std::array<std::array<double,4>,4> C{};
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j)
for (int k = 0; k < 4; ++k)
C[i][j] += A[i][k] * B[k][j];
return C;
}
int main()
{
std::array<std::array<double,4>,4> A{};
std::array<std::array<double,4>,4> B{};
std::cout << "Gib die Werte für Matrix A (4x4) ein:\n";
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j) {
std::cout << "A[" << i << "][" << j << "] = ";
std::cin >> A[i][j];
}
std::cout << "\nGib die Werte für Matrix B (4x4) ein:\n";
for (int i = 0; i < 4; ++i)
for (int j = 0; j < 4; ++j) {
std::cout << "B[" << i << "][" << j << "] = ";
std::cin >> B[i][j];
}
auto C = gameMatrix::matmul(A, B);
std::cout << "\nErgebnis der Matrixmultiplikation (C = A * B):\n";
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j)
std::cout << C[i][j] << "\t";
std::cout << "\n";
}
return 0;
}
+4 -2
View File
@@ -8,8 +8,9 @@ class gameMatrix
{
public:
// Matrix Multiplikation
static std::array<std::array<double,4>,4> matmul(const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B);
static std::array<std::array<double,4>,4> matmul(
const std::array<std::array<double,4>,4>& A,
const std::array<std::array<double,4>,4>& B);
// Rotationsmatrix um Achse x/y/z
static std::array<std::array<double,4>,4> rot3D(double angle_deg, char axis);
@@ -17,3 +18,4 @@ public:
// Verschiebung
static std::array<std::array<double,4>,4> translate(const std::array<double, 3>& pos);
};