commit bdae618a2bfe358310f5cc00b295da7610f68947
parent 4c50605cb46fc4d3ad825f1f67565e100ef1ed1d
Author: Egor Achkasov <eaachkasov@edu.hse.ru>
Date: Mon, 31 Mar 2025 19:23:53 +0200
mv inv/viz.h viz/viz.h
Diffstat:
5 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
@@ -3,6 +3,7 @@ CFLAGS := -Wall -Wextra -Wno-builtin-declaration-mismatch
LDFLAGS := -lm
SRC := src/materials.c src/scene.c src/compute_paths.c test/test.c viz/vizrays.c
+
SCENE_FROMSIONNA_SRC := src/scene.c src/materials.c src/scene_fromSionna.c
TARGET := test.elf
diff --git a/inc/viz.h b/inc/viz.h
@@ -1,28 +0,0 @@
-/* Visualization utils.
-The implementation files are located in viz/
-All of them require OpenGL and GLUT
-add -lGL -lGLU -lglut to compile
-*/
-
-#ifndef VIZ_H
-#define VIZ_H
-
-#include "scene.h" /* for Scene */
-#include "compute_paths.h" /* for RaysInfo */
-#include "common.h" /* for IN */
-
-#include <stdint.h> /* for uint32_t */
-
-/** Visualize rays in a 3D scene.
- *
- * \param raysInfo pointer to a RaysInfo structure
- * \param scene pointer to a loaded scene in HRT format (see scene.h). Can be NULL
- * \param numTx number of transmitters
- */
-void vizrays(
- IN RaysInfo *raysInfo,
- IN Scene *scene,
- IN uint32_t numTx
-);
-
-#endif
diff --git a/test/test.c b/test/test.c
@@ -2,7 +2,7 @@
#include "../inc/scene.h" /* for Scene, scene_load */
#include "../inc/vec3.h" /* for Vec3 */
#include "../inc/ray.h" /* for Ray */
-#include "../inc/viz.h" /* for vizrays */
+#include "../viz/viz.h" /* for vizrays */
#include <stdio.h> /* for fprintf */
#include <stdlib.h> /* for malloc */
diff --git a/viz/viz.h b/viz/viz.h
@@ -0,0 +1,28 @@
+/* Visualization utils.
+The implementation files are located in viz/
+All of them require OpenGL and GLUT
+add -lGL -lGLU -lglut to compile
+*/
+
+#ifndef VIZ_H
+#define VIZ_H
+
+#include "../inc/scene.h" /* for Scene */
+#include "../inc/compute_paths.h" /* for RaysInfo */
+#include "../inc/common.h" /* for IN */
+
+#include <stdint.h> /* for uint32_t */
+
+/** Visualize rays in a 3D scene.
+ *
+ * \param raysInfo pointer to a RaysInfo structure
+ * \param scene pointer to a loaded scene in HRT format (see scene.h). Can be NULL
+ * \param numTx number of transmitters
+ */
+void vizrays(
+ IN RaysInfo *raysInfo,
+ IN Scene *scene,
+ IN uint32_t numTx
+);
+
+#endif
diff --git a/viz/vizrays.c b/viz/vizrays.c
@@ -1,4 +1,4 @@
-#include "../inc/viz.h" /* for vizrays */
+#include "viz.h" /* for vizrays */
#include "../inc/vec3.h" /* for Vec3 */
#include "../inc/scene.h" /* for Scene, Mesh, scene_load */
#include "../inc/ray.h" /* for Ray */
