Cuboid nicht benätigt und NOTNEEDED ordner hinzugefügt und Fehler behoben

3 files changed, 158 insertions, 0 deletions

diff --git a/NOTNEEDED/Cuboid.cpp b/NOTNEEDED/Cuboid.cpp
new file mode 100644
index 0000000..5afae93
--- /dev/null
+++ b/NOTNEEDED/Cuboid.cpp
@@ -0,0 +1,128 @@
+#include "Cuboid.h"
+#include "gl.h"
+
+Cuboid::Cuboid(float width, float height, float depth) {
+  setSize(width, height, depth);
+  setPos(0, 0, 0);
+}
+
+Cuboid::Cuboid(float width, float height, float depth, float x, float y, float z)
+{
+  setSize(width, height, depth);
+  setPos(x, y, z);
+}
+
+float Cuboid::getHeight()
+{
+  return height;
+}
+
+float Cuboid::getWidth()
+{
+  return width;
+}
+
+float Cuboid::getDepth()
+{
+  return depth;
+}
+
+float Cuboid::getPosX()
+{
+  return x;
+}
+
+float Cuboid::getPosY()
+{
+  return y;
+}
+
+float Cuboid::getPosZ()
+{
+  return z;
+}
+
+void Cuboid::setSize(float w, float h, float d)
+{
+  width = w;
+  height = h;
+  depth = d;
+}
+
+void Cuboid::setPos(float x, float y, float z)
+{
+  this->x = x;
+  this->y = y;
+  this->z = z;
+}
+
+std::list<Triangle> Cuboid::getTriangles()
+{
+  std::list<Triangle> triangles;
+  // width, height, depth
+  // Front face
+  vmml::vec4f c(0.0, 0.0, 1.0, 0.5);
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z+depth/2), c));
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z+depth/2), c));
+  
+  // Back face
+  c = vmml::vec4f(1.0, 1.0, 0.0, 0.5);
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z-depth/2), c));
+
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y-height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z-depth/2), c));
+  
+  // Left face
+  c = vmml::vec4f(0.0, 1.0, 0.0, 0.5);
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z+depth/2), c));
+
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y-height/2, z-depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y+height/2, z-depth/2), c));
+  
+  // Right face
+  
+  triangles.push_back(Triangle(vmml::vec3f(x+width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z-depth/2), c));
+
+  triangles.push_back(Triangle(vmml::vec3f(x+width/2, y-height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z+depth/2), c));
+  
+  // Top face  
+  c = vmml::vec4f(1.0, 0.0, 0.0, 0.5);
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y+height/2, z-depth/2), c));
+
+  triangles.push_back(Triangle(vmml::vec3f(x+width/2, y+height/2, z+depth/2),
+                               vmml::vec3f(x+width/2, y+height/2, z-depth/2),
+                               vmml::vec3f(x-width/2, y+height/2, z-depth/2), c));
+
+  // Bottom face
+  
+  triangles.push_back(Triangle(vmml::vec3f(x-width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z+depth/2), c));
+
+  triangles.push_back(Triangle(vmml::vec3f(x+width/2, y-height/2, z+depth/2),
+                               vmml::vec3f(x-width/2, y-height/2, z-depth/2),
+                               vmml::vec3f(x+width/2, y-height/2, z-depth/2), c));
+  
+  return triangles;
+}
diff --git a/NOTNEEDED/Cuboid.h b/NOTNEEDED/Cuboid.h
new file mode 100644
index 0000000..d1c600d
--- /dev/null
+++ b/NOTNEEDED/Cuboid.h
@@ -0,0 +1,30 @@
+#ifndef _CUBOID_H_
+#define _CUBOID_H_
+
+#include "Triangle.h"
+
+#include <list>
+
+class Cuboid
+{
+  public:
+    Cuboid() : width(0), height(0), depth(0), x(0), y(0), z(0) {}
+    Cuboid(float width, float height, float depth);
+    Cuboid(float width, float height, float depth, float x, float y, float z);
+    float getHeight();
+    float getWidth();
+    float getDepth();
+    float getPosX();
+    float getPosY();
+    float getPosZ();
+    void setSize(float w, float h, float d);
+    void setPos(float x, float y, float z);
+    std::list<Triangle> getTriangles();
+  
+  private:
+    float width, height, depth;
+    float x, y, z;
+
+};
+#endif /*_CUBOID_H_*/
+
diff --git a/NOTNEEDED/Verlauf.bmp b/NOTNEEDED/Verlauf.bmp
new file mode 100644
index 0000000..83c0c23
--- /dev/null
+++ b/NOTNEEDED/Verlauf.bmp