IL: Remove ilG_context

Tiffany Bennett · Tiffany Bennett · commit a33ebcfab26f · 2015-10-17T19:34:48.000-04:00
diff --git a/IntenseLogic b/IntenseLogic
@@ -1 +1 @@
-Subproject commit 59bbc44782272d8c396f385d42ebdf22502c14fd
+Subproject commit 60e351cce1ed4e2298e4f1d240f0763b0ec46dcf
diff --git a/src/bouncing-lights/ball.cpp b/src/bouncing-lights/ball.cpp
@@ -3,7 +3,6 @@
 #include "Demo.h"
 
 extern "C" {
-#include "graphics/context.h"
 #include "graphics/material.h"
 #include "graphics/mesh.h"
 #include "graphics/renderer.h"
@@ -45,8 +44,8 @@ bool BallRenderer::build(ilG_renderman *rm, char **error)
     ilG_material m;
     ilG_material_init(&m);
     ilG_material_name(&m, "Ball Material");
-    ilG_material_fragData(&m, ILG_CONTEXT_NORMAL, "out_Normal");
-    ilG_material_fragData(&m, ILG_CONTEXT_ALBEDO, "out_Albedo");
+    ilG_material_fragData(&m, ILG_GBUFFER_NORMAL, "out_Normal");
+    ilG_material_fragData(&m, ILG_GBUFFER_ALBEDO, "out_Albedo");
     ilG_material_arrayAttrib(&m, ILG_MESH_POS, "in_Position");
     if (!ilG_renderman_addMaterialFromFile(rm, m, "glow.vert", "glow.frag", &mat, error)) {
         return false;
diff --git a/src/bouncing-lights/bouncinglights.cpp b/src/bouncing-lights/bouncinglights.cpp
@@ -26,7 +26,6 @@ extern "C" {
 #include "asset/image.h"
 #include "graphics/transform.h"
 #include "math/matrix.h"
-#include "graphics/context-internal.h"
 #include "graphics/graphics.h"
 #include "graphics/renderer.h"
 #include "graphics/tex.h"
diff --git a/src/bouncing-lights/debugdraw.hpp b/src/bouncing-lights/debugdraw.hpp
@@ -5,7 +5,7 @@
 #include "tgl/tgl.h"
 
 extern "C" {
-#include "graphics/context.h"
+#include "graphics/renderer.h"
 #include "graphics/material.h"
 }
 
diff --git a/src/box/box.cpp b/src/box/box.cpp
@@ -6,7 +6,6 @@
 #include "Demo.h"
 
 extern "C" {
-#include "graphics/context.h"
 #include "graphics/floatspace.h"
 #include "graphics/material.h"
 #include "graphics/renderer.h"
@@ -81,7 +80,7 @@ int main(int argc, char **argv)
     ilG_material_init(&m);
     ilG_material_name(&m, "Box Shader");
     ilG_material_arrayAttrib(&m, 0, "in_Position");
-    ilG_material_fragData(&m, ILG_CONTEXT_ALBEDO, "out_Color");
+    ilG_material_fragData(&m, ILG_GBUFFER_ALBEDO, "out_Color");
     if (!ilG_renderman_addMaterialFromFile(rm, m, "box.vert", "box.frag", &mat, &error)) {
         il_error("Box Shader: %s", error);
         free(error);
diff --git a/src/lighting/comp.cpp b/src/lighting/comp.cpp
@@ -1,7 +1,6 @@
 #include "comp.h"
 
 extern "C" {
-#include "graphics/context.h"
 #include "graphics/floatspace.h"
 #include "graphics/material.h"
 #include "graphics/renderer.h"
@@ -197,11 +196,11 @@ bool Computer::build(ilG_renderman *rm, char **error)
     ilG_material_arrayAttrib(&m, ATTRIB_POSITION,     "in_Position");
     ilG_material_arrayAttrib(&m, ATTRIB_NORMAL,       "in_Normal");
     ilG_material_arrayAttrib(&m, ATTRIB_TEXCOORD,     "in_Texcoord");
-    ilG_material_fragData(&m, ILG_CONTEXT_ALBEDO,     "out_Albedo");
-    ilG_material_fragData(&m, ILG_CONTEXT_NORMAL,     "out_Normal");
-    ilG_material_fragData(&m, ILG_CONTEXT_REFRACTION, "out_Refraction");
-    ilG_material_fragData(&m, ILG_CONTEXT_GLOSS,      "out_Gloss");
-    ilG_material_fragData(&m, ILG_CONTEXT_EMISSION,   "out_Emission");
+    ilG_material_fragData(&m, ILG_GBUFFER_ALBEDO,     "out_Albedo");
+    ilG_material_fragData(&m, ILG_GBUFFER_NORMAL,     "out_Normal");
+    ilG_material_fragData(&m, ILG_GBUFFER_REFRACTION, "out_Refraction");
+    ilG_material_fragData(&m, ILG_GBUFFER_GLOSS,      "out_Gloss");
+    ilG_material_fragData(&m, ILG_GBUFFER_EMISSION,   "out_Emission");
     ilG_material_textureUnit(&m, TEX_ALBEDO,          "tex_Albedo");
     ilG_material_textureUnit(&m, TEX_NORMAL,          "tex_Normal");
     ilG_material_textureUnit(&m, TEX_REFRACTION,      "tex_Reflect");
diff --git a/src/quad/quad.cpp b/src/quad/quad.cpp
@@ -7,7 +7,6 @@
 
 extern "C" {
 #include "graphics/arrayattrib.h"
-#include "graphics/context.h"
 #include "graphics/floatspace.h"
 #include "graphics/material.h"
 #include "tgl/tgl.h"
diff --git a/src/shadertoy/shadertoy.cpp b/src/shadertoy/shadertoy.cpp
@@ -1,13 +1,13 @@
 #include <uv.h>
 #include <SDL.h>
 #include <assert.h>
+#include <sys/time.h>
 
 #include "Demo.h"
 
 extern "C" {
 #include "tgl/tgl.h"
 #include "asset/node.h"
-#include "graphics/context.h"
 #include "graphics/graphics.h"
 #include "graphics/material.h"
 #include "graphics/renderer.h"
diff --git a/src/teapots/teapots.cpp b/src/teapots/teapots.cpp
@@ -9,7 +9,6 @@
 extern "C" {
 #include "asset/node.h"
 #include "graphics/graphics.h"
-#include "graphics/context.h"
 #include "graphics/floatspace.h"
 #include "graphics/material.h"
 #include "graphics/mesh.h"
@@ -55,10 +54,10 @@ struct Teapot {
         ilG_material_arrayAttrib(&m, ILG_MESH_DIFFUSE, "in_Diffuse");
         ilG_material_arrayAttrib(&m, ILG_MESH_SPECULAR, "in_Specular");
         ilG_material_textureUnit(&m, 0, "tex");
-        ilG_material_fragData(&m, ILG_CONTEXT_ALBEDO, "out_Albedo");
-        ilG_material_fragData(&m, ILG_CONTEXT_NORMAL, "out_Normal");
-        ilG_material_fragData(&m, ILG_CONTEXT_REFRACTION, "out_Refraction");
-        ilG_material_fragData(&m, ILG_CONTEXT_GLOSS, "out_Gloss");
+        ilG_material_fragData(&m, ILG_GBUFFER_ALBEDO, "out_Albedo");
+        ilG_material_fragData(&m, ILG_GBUFFER_NORMAL, "out_Normal");
+        ilG_material_fragData(&m, ILG_GBUFFER_REFRACTION, "out_Refraction");
+        ilG_material_fragData(&m, ILG_GBUFFER_GLOSS, "out_Gloss");
         if (!ilG_renderman_addMaterialFromFile(rm, m, "teapot.vert", "teapot.frag", &mat, error)) {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include "tgl/tgl.h"`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`		`-#include "graphics/context.h"`
	`8`	`+#include "graphics/renderer.h"`
`9`	`9`	`#include "graphics/material.h"`
`10`	`10`	`}`
`11`	`11`