1 files changed, 8 insertions, 111 deletions

diff --git a/src/render/llr.c b/src/render/llr.c
index c9c6d34..752b65b 100644
--- a/src/render/llr.c
+++ b/src/render/llr.c
@@ -1,14 +1,15 @@
 #include "llr_impl.h"
 
 #include "animation_impl.h"
-#include "memory.h"
+#include "scene/light_impl.h"
+#include "scene/material_impl.h"
+#include "scene/mesh_impl.h"
 #include "scene/node_impl.h"
 
 #include <gfx/core.h>
 #include <gfx/util/ibl.h>
 
 #include <cassert.h>
-#include <error.h>
 
 static const int IRRADIANCE_MAP_WIDTH               = 1024;
 static const int IRRADIANCE_MAP_HEIGHT              = 1024;
@@ -17,108 +18,23 @@ static const int PREFILTERED_ENVIRONMENT_MAP_HEIGHT = 128;
 static const int BRDF_INTEGRATION_MAP_WIDTH         = 512;
 static const int BRDF_INTEGRATION_MAP_HEIGHT        = 512;
 
-static void make_environment_light(
-    Light* light, const EnvironmentLightDesc* desc) {
-  assert(light);
-  assert(desc);
-  light->type                        = EnvironmentLightType;
-  light->environment.environment_map = desc->environment_map;
-}
-
-Light* gfx_make_light(const LightDesc* desc) {
-  assert(desc);
-
-  Light* light = mem_alloc_light();
-
-  switch (desc->type) {
-  case EnvironmentLightType:
-    make_environment_light(light, &desc->light.environment);
-    break;
-  default:
-    log_error("Unhandled light type");
-    gfx_destroy_light(&light);
-    return 0;
-  }
-
-  return light;
-}
-
-void gfx_destroy_light(Light** light) {
-  assert(light);
-  if (*light) {
-    mem_free_light(light);
-  }
-}
-
-static void material_make(Material* material, const MaterialDesc* desc) {
-  assert(material);
-  assert(desc);
-  assert(desc->num_uniforms < GFX_MAX_UNIFORMS_PER_MATERIAL);
-  material->alpha_mode   = desc->alpha_mode;
-  material->alpha_cutoff = desc->alpha_cutoff;
-  material->num_uniforms = (int8_t)desc->num_uniforms;
-  for (int i = 0; i < desc->num_uniforms; ++i) {
-    material->uniforms[i] = desc->uniforms[i];
-  }
-}
-
-Material* gfx_make_material(const MaterialDesc* desc) {
-  assert(desc);
-  Material* material = mem_alloc_material();
-  material_make(material, desc);
-  return material;
-}
-
-void gfx_destroy_material(Material** material) { mem_free_material(material); }
-
-// TODO: Move this to core/shader_program.
-static void set_uniform(ShaderProgram* prog, const ShaderUniform* uniform) {
-  switch (uniform->type) {
-  case UniformInt:
-    gfx_set_int_uniform(prog, uniform->name.str, uniform->value.uniform_int);
-    break;
-  case UniformFloat:
-    gfx_set_float_uniform(
-        prog, uniform->name.str, uniform->value.uniform_float);
-    break;
-  case UniformMat4:
-    gfx_set_mat4_uniform(prog, uniform->name.str, &uniform->value.uniform_mat4);
-    break;
-  case UniformVec3:
-    gfx_set_vec3_uniform(prog, uniform->name.str, uniform->value.uniform_vec3);
-    break;
-  case UniformVec4:
-    gfx_set_vec4_uniform(prog, uniform->name.str, uniform->value.uniform_vec4);
-    break;
-  case UniformTexture:
-    gfx_set_texture_uniform(prog, uniform->name.str, uniform->value.texture);
-    break;
-  case UniformMat4Array:
-    gfx_set_mat4_array_uniform(
-        prog, uniform->name.str, uniform->value.array.values,
-        uniform->value.array.count);
-    break;
-  }
-}
-
 /// Activate the material.
 ///
 /// This configures the shader uniforms that are specific to the material.
-static void gfx_material_activate(
-    ShaderProgram* shader, const Material* material) {
+static void material_activate(ShaderProgram* shader, const Material* material) {
   assert(material);
   for (int i = 0; i < material->num_uniforms; ++i) {
     const ShaderUniform* uniform = &material->uniforms[i];
-    set_uniform(shader, uniform);
+    gfx_set_uniform(shader, uniform);
   }
   if (material->alpha_mode != Opaque) {
-    set_uniform(
+    gfx_set_uniform(
         shader, &(ShaderUniform){.name              = sstring_make("AlphaMode"),
                                  .type              = UniformInt,
                                  .value.uniform_int = material->alpha_mode});
   }
   if (material->alpha_mode == Mask) {
-    set_uniform(
+    gfx_set_uniform(
         shader,
         &(ShaderUniform){.name                = sstring_make("AlphaCutoff"),
                          .type                = UniformFloat,
@@ -126,25 +42,6 @@ static void gfx_material_activate(
   }
 }
 
-static void mesh_make(Mesh* mesh, const MeshDesc* desc) {
-  assert(mesh);
-  assert(desc);
-  assert(desc->geometry);
-  assert(desc->material);
-  assert(desc->shader);
-  mesh->geometry = desc->geometry;
-  mesh->material = desc->material;
-  mesh->shader   = desc->shader;
-}
-
-Mesh* gfx_make_mesh(const MeshDesc* desc) {
-  Mesh* mesh = mem_alloc_mesh();
-  mesh_make(mesh, desc);
-  return mesh;
-}
-
-void gfx_destroy_mesh(Mesh** mesh) { mem_free_mesh(mesh); }
-
 /// Initialize renderer state for IBL.
 static bool init_ibl(LLR* renderer) {
   assert(renderer);
@@ -334,7 +231,7 @@ static void configure_state(LLR* renderer) {
 
     // Geometry may be rendered without a material.
     if (renderer->material) {
-      gfx_material_activate(renderer->shader, renderer->material);
+      material_activate(renderer->shader, renderer->material);
     }
   }