summaryrefslogtreecommitdiff
path: root/src/objects
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2023-07-15 01:16:04 -0400
committerAndrew Opalach <andrew@akon.city> 2023-07-15 01:16:04 -0400
commitf1a9751af6cc6aa0bac91e7f28fc43b1a4cb64fd (patch)
treee9660e27896c00d7a6d57123c172b8574e1e07b6 /src/objects
parentaec7b72a146f489ec1947b4915b9ade6bfc19340 (diff)
downloadmauri-f1a9751af6cc6aa0bac91e7f28fc43b1a4cb64fd.tar.gz
mauri-f1a9751af6cc6aa0bac91e7f28fc43b1a4cb64fd.tar.bz2
mauri-f1a9751af6cc6aa0bac91e7f28fc43b1a4cb64fd.zip
cleanup, finalize notes, add README.md
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/effect.cc8
-rw-r--r--src/objects/effect.h1
-rw-r--r--src/objects/material.cc8
-rw-r--r--src/objects/model.cc6
-rw-r--r--src/objects/model.h3
-rw-r--r--src/objects/object.cc10
-rw-r--r--src/objects/object.h2
-rw-r--r--src/objects/pass.cc9
-rw-r--r--src/objects/pass.h7
-rw-r--r--src/objects/scene.cc6
-rw-r--r--src/objects/scene.h4
11 files changed, 5 insertions, 59 deletions
diff --git a/src/objects/effect.cc b/src/objects/effect.cc
index 9257061..72d9e7e 100644
--- a/src/objects/effect.cc
+++ b/src/objects/effect.cc
@@ -1,11 +1,5 @@
-#include "../assets.h"
-#include "../engine.h"
-#include "../json.h"
-#include "../log.h"
-
-#include "effect.h"
-#include "object.h"
#include "pass.h"
+#include "effect.h"
using namespace Mauri;
diff --git a/src/objects/effect.h b/src/objects/effect.h
index 8be54e7..558396b 100644
--- a/src/objects/effect.h
+++ b/src/objects/effect.h
@@ -2,6 +2,7 @@
#define _EFFECT_H
#include "../util.h"
+#include "../json.h"
#include "../engine.h"
#include "../texture.h"
diff --git a/src/objects/material.cc b/src/objects/material.cc
index b99b918..0957214 100644
--- a/src/objects/material.cc
+++ b/src/objects/material.cc
@@ -1,11 +1,5 @@
-#include "../assets.h"
-#include "../engine.h"
-#include "../json.h"
-#include "../log.h"
-
-#include "material.h"
-#include "object.h"
#include "pass.h"
+#include "material.h"
using namespace Mauri;
diff --git a/src/objects/model.cc b/src/objects/model.cc
index 8af3224..1517b23 100644
--- a/src/objects/model.cc
+++ b/src/objects/model.cc
@@ -1,10 +1,4 @@
-#include "../assets.h"
-#include "../json.h"
-#include "../log.h"
-
-#include "material.h"
#include "model.h"
-#include "pass.h"
using namespace Mauri;
diff --git a/src/objects/model.h b/src/objects/model.h
index a9b2b01..0d5b313 100644
--- a/src/objects/model.h
+++ b/src/objects/model.h
@@ -1,9 +1,6 @@
#ifndef _MODEL_H
#define _MODEL_H
-#include "../engine.h"
-#include "../json.h"
-
#include "material.h"
namespace Mauri
diff --git a/src/objects/object.cc b/src/objects/object.cc
index 833620a..73a16b3 100644
--- a/src/objects/object.cc
+++ b/src/objects/object.cc
@@ -1,12 +1,6 @@
-#include "../gl.h"
-#include "../json.h"
-#include "../log.h"
-
-#include "effect.h"
-#include "model.h"
-#include "object.h"
-#include "scene.h"
#include "pass.h"
+#include "scene.h"
+#include "object.h"
using namespace Mauri;
diff --git a/src/objects/object.h b/src/objects/object.h
index 37b8bce..1a79c6c 100644
--- a/src/objects/object.h
+++ b/src/objects/object.h
@@ -1,8 +1,6 @@
#ifndef _OBJECT_H
#define _OBJECT_H
-#include "../engine.h"
-
#include "model.h"
#include "effect.h"
diff --git a/src/objects/pass.cc b/src/objects/pass.cc
index 12d2cda..e6a9bfa 100644
--- a/src/objects/pass.cc
+++ b/src/objects/pass.cc
@@ -1,17 +1,8 @@
#include <thread>
-#include "../assets.h"
-#include "../engine.h"
#include "../gl.h"
-#include "../json.h"
-#include "../shader.h"
-#include "../texture.h"
#include "pass.h"
-#include "material.h"
-#include "model.h"
-#include "object.h"
-#include "scene.h"
using namespace Mauri;
diff --git a/src/objects/pass.h b/src/objects/pass.h
index d2806d9..97348a3 100644
--- a/src/objects/pass.h
+++ b/src/objects/pass.h
@@ -1,13 +1,6 @@
#ifndef _PASS_H
#define _PASS_H
-#include "../json.h"
-#include "../context.h"
-#include "../engine.h"
-#include "../gl.h"
-#include "../shader.h"
-#include "../texture.h"
-
#include "object.h"
#define MAX_TEXTURES 8
diff --git a/src/objects/scene.cc b/src/objects/scene.cc
index 6df5e02..8331b15 100644
--- a/src/objects/scene.cc
+++ b/src/objects/scene.cc
@@ -1,10 +1,4 @@
-#include "../assets.h"
-#include "../json.h"
-#include "../log.h"
-#include "../util.h"
-
#include "scene.h"
-#include "pass.h"
using namespace Mauri;
diff --git a/src/objects/scene.h b/src/objects/scene.h
index 8f13f3a..672df96 100644
--- a/src/objects/scene.h
+++ b/src/objects/scene.h
@@ -1,10 +1,6 @@
#ifndef _SCENE_H
#define _SCENE_H
-#include "../assets.h"
-#include "../engine.h"
-#include "../json.h"
-
#include "object.h"
namespace Mauri