summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libdimension/Makefile.am6
-rw-r--r--libdimension/X.c36
-rw-r--r--libdimension/dimension.h1
-rw-r--r--libdimension/dimension/X.h37
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/X.c188
-rw-r--r--tests/gl.c2
-rw-r--r--tests/tests.c78
-rw-r--r--tests/tests.h5
9 files changed, 8 insertions, 349 deletions
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index 42d3788..7a18535 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -31,8 +31,7 @@ nobase_include_HEADERS = dimension.h \
dimension/object.h \
dimension/objects.h \
dimension/raytrace.h \
- dimension/scene.h \
- dimension/X.h
+ dimension/scene.h
lib_LTLIBRARIES = libdimension.la
@@ -50,7 +49,6 @@ libdimension_la_SOURCES = $(nobase_include_HEADERS) \
object.c \
objects.c \
raytrace.c \
- scene.c \
- X.c
+ scene.c
libdimension_la_LDFLAGS = -version-info 0:0:0
libdimension_la_LIBADD = -lm -lpthread -lpng -lGL
diff --git a/libdimension/X.c b/libdimension/X.c
deleted file mode 100644
index 05ab5a2..0000000
--- a/libdimension/X.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> *
- * *
- * This file is part of The Dimension Library. *
- * *
- * The Dimension Library is free software; you can redistribute it and/ *
- * or modify it under the terms of the GNU Lesser General Public License *
- * as published by the Free Software Foundation; either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * The Dimension Library is distributed in the hope that it will be *
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty *
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this program. If not, see *
- * <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-#include "dimension.h"
-
-/* Write canvas to X window. Returns 0 on success, nonzero on failure. */
-int
-dmnsn_X_write_canvas(const dmnsn_canvas *canvas)
-{
- return 1;
-}
-
-/* Read a canvas from a GL framebuffer. Returns NULL on failure. */
-dmnsn_canvas *
-dmnsn_X_read_canvas(unsigned int x0, unsigned int y0,
- unsigned int width, unsigned int height)
-{
- return NULL;
-}
diff --git a/libdimension/dimension.h b/libdimension/dimension.h
index 4d67ce0..1f5b59b 100644
--- a/libdimension/dimension.h
+++ b/libdimension/dimension.h
@@ -57,7 +57,6 @@ extern "C" {
#include <dimension/geometry.h>
#include <dimension/color.h>
#include <dimension/canvas.h>
-#include <dimension/X.h>
#include <dimension/gl.h>
#include <dimension/png.h>
#include <dimension/object.h>
diff --git a/libdimension/dimension/X.h b/libdimension/dimension/X.h
deleted file mode 100644
index 58de945..0000000
--- a/libdimension/dimension/X.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> *
- * *
- * This file is part of The Dimension Library. *
- * *
- * The Dimension Library is free software; you can redistribute it and/ *
- * or modify it under the terms of the GNU Lesser General Public License *
- * as published by the Free Software Foundation; either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * The Dimension Library is distributed in the hope that it will be *
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty *
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this program. If not, see *
- * <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-/*
- * Draw a canvas to an X window.
- */
-
-#ifndef DIMENSION_X_H
-#define DIMENSION_X_H
-
-#include <stdio.h>
-
-/* Write canvas to X window. Returns 0 on success, nonzero on failure. */
-int dmnsn_X_write_canvas(const dmnsn_canvas *canvas);
-
-/* Read a canvas from a GL framebuffer. Returns NULL on failure. */
-dmnsn_canvas *dmnsn_X_read_canvas(unsigned int x0, unsigned int y0,
- unsigned int width, unsigned int height);
-
-#endif /* DIMENSION_X_H */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ad26c5..6d496f6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,6 @@ check_PROGRAMS = warning-test \
pngxx-test \
raytrace-test \
raytracexx-test \
- X-test \
gl-test
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = error-test
@@ -58,8 +57,5 @@ raytrace_test_LDADD = ./libdimension-tests.la
raytracexx_test_SOURCES = raytracexx.cpp
raytracexx_test_LDADD = ./libdimensionxx-tests.la
-X_test_SOURCES = X.c
-X_test_LDADD = ./libdimension-tests.la
-
gl_test_SOURCES = gl.c
gl_test_LDADD = ./libdimension-tests.la
diff --git a/tests/X.c b/tests/X.c
deleted file mode 100644
index aa672fd..0000000
--- a/tests/X.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*************************************************************************
- * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> *
- * *
- * This file is part of The Dimension Test Suite. *
- * *
- * The Dimension Test Suite is free software; you can redistribute it *
- * and/or modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 3 of the *
- * License, or (at your option) any later version. *
- * *
- * The Dimension Test Suite is distributed in the hope that it will be *
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty *
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-#include "tests.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-main() {
- dmnsn_display *display;
- dmnsn_progress *progress;
- dmnsn_scene *scene;
- dmnsn_object *sphere, *cube;
- dmnsn_sRGB sRGB;
- dmnsn_color color;
- dmnsn_matrix trans;
- unsigned int i;
-
- /* Set the resilience low for tests */
- dmnsn_set_resilience(DMNSN_SEVERITY_LOW);
-
- /* Allocate our new scene */
- scene = dmnsn_new_scene();
- if (!scene) {
- fprintf(stderr, "--- Allocation of scene failed! ---\n");
- return EXIT_FAILURE;
- }
-
- /* Allocate a canvas */
- scene->canvas = dmnsn_new_canvas(768, 480);
- if (!scene->canvas) {
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Allocation of canvas failed! ---\n");
- return EXIT_FAILURE;
- }
-
- /* Set up the transformation matrix for the perspective camera */
- trans = dmnsn_scale_matrix(
- dmnsn_vector_construct(
- ((double)scene->canvas->x)/scene->canvas->y, 1.0, 1.0
- )
- );
- trans = dmnsn_matrix_mul(
- dmnsn_translation_matrix(dmnsn_vector_construct(0.0, 0.0, -4.0)),
- trans
- );
- trans = dmnsn_matrix_mul(
- dmnsn_rotation_matrix(dmnsn_vector_construct(0.0, 1.0, 0.0)),
- trans
- );
-
- /* Create a perspective camera */
- scene->camera = dmnsn_new_perspective_camera(trans);
- if (!scene->camera) {
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Allocation of camera failed! ---\n");
- return EXIT_FAILURE;
- }
-
- /* Background color */
- sRGB.R = 0.0;
- sRGB.G = 0.0;
- sRGB.B = 0.1;
- color = dmnsn_color_from_sRGB(sRGB);
- color.filter = 0.1;
- scene->background = color;
-
- /* Now make our objects */
-
- sphere = dmnsn_new_sphere();
- if (!sphere) {
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Allocation of sphere failed! ---\n");
- return EXIT_FAILURE;
- }
-
- sphere->trans = dmnsn_matrix_inverse(
- dmnsn_scale_matrix(dmnsn_vector_construct(1.25, 1.25, 1.25))
- );
- dmnsn_array_push(scene->objects, &sphere);
-
- cube = dmnsn_new_cube();
- if (!cube) {
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Allocation of cube failed! ---\n");
- return EXIT_FAILURE;
- }
-
- cube->trans = dmnsn_matrix_inverse(
- dmnsn_rotation_matrix(dmnsn_vector_construct(0.75, 0.0, 0.0))
- );
- dmnsn_array_push(scene->objects, &cube);
-
- display = dmnsn_new_X_display(scene->canvas);
- if (!display) {
- dmnsn_delete_cube(cube);
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Couldn't initialize X! ---\n");
- return EXIT_FAILURE;
- }
-
- for (i = 0; i < 10; ++i) {
- progress = dmnsn_raytrace_scene_async(scene);
- if (!progress) {
- dmnsn_delete_display(display);
- dmnsn_delete_cube(cube);
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Couldn't start raytracing worker thread! ---\n");
- return EXIT_FAILURE;
- }
-
- progressbar("Raytracing scene: ", progress);
-
- if (dmnsn_finish_progress(progress) != 0) {
- dmnsn_delete_display(display);
- dmnsn_delete_cube(cube);
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Raytracing failed! ---\n");
- return EXIT_FAILURE;
- }
-
- if (dmnsn_X_write_canvas(scene->canvas) != 0) {
- dmnsn_delete_display(display);
- dmnsn_delete_cube(cube);
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- fprintf(stderr, "--- Drawing to X failed! ---\n");
- return EXIT_FAILURE;
- }
- dmnsn_display_frame(display);
-
- /* Rotate the cube and camera for the next frame */
-
- cube->trans = dmnsn_matrix_mul(
- dmnsn_matrix_inverse(
- dmnsn_rotation_matrix(dmnsn_vector_construct(0.025, 0.0, 0.0))
- ),
- cube->trans
- );
-
- trans = dmnsn_matrix_mul(
- dmnsn_rotation_matrix(dmnsn_vector_construct(0.0, -0.05, 0.0)),
- trans
- );
- dmnsn_set_perspective_camera_trans(scene->camera, trans);
- }
-
- dmnsn_delete_display(display);
- dmnsn_delete_cube(cube);
- dmnsn_delete_sphere(sphere);
- dmnsn_delete_perspective_camera(scene->camera);
- dmnsn_delete_canvas(scene->canvas);
- dmnsn_delete_scene(scene);
- return EXIT_SUCCESS;
-}
diff --git a/tests/gl.c b/tests/gl.c
index 12e3d77..c9a3ae4 100644
--- a/tests/gl.c
+++ b/tests/gl.c
@@ -49,7 +49,7 @@ main() {
dmnsn_array_get(scene->objects, 1, &cube);
trans = dmnsn_get_perspective_camera_trans(scene->camera);
- display = dmnsn_new_glX_display(scene->canvas);
+ display = dmnsn_new_display(scene->canvas);
if (!display) {
dmnsn_delete_default_scene(scene);
fprintf(stderr, "--- Couldn't initialize X or glX! ---\n");
diff --git a/tests/tests.c b/tests/tests.c
index ad43c26..7fd7f19 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -125,73 +125,8 @@ WaitForNotify(Display *d, XEvent *e, char *arg)
return (e->type == MapNotify) && (e->xmap.window == (Window)arg);
}
-/* New non-glX X window */
dmnsn_display *
-dmnsn_new_X_display(const dmnsn_canvas *canvas)
-{
- dmnsn_display *display;
- int screen, depth;
- Visual *visual;
- XSetWindowAttributes swa;
-
- display = malloc(sizeof(dmnsn_display));
- if (!display) {
- return NULL;
- }
-
- /* Get an X connection */
- display->dpy = XOpenDisplay(0);
- if (!display->dpy) {
- free(display);
- return NULL;
- }
- screen = DefaultScreen(display->dpy);
- depth = DefaultDepth(display->dpy, screen);
-
- /* Get an appropriate visual */
- visual = DefaultVisual(display->dpy, screen);
-
- /* Set display->cx to NULL */
- display->cx = NULL;
-
- /* Create a color map */
- display->cmap = XCreateColormap(display->dpy,
- RootWindow(display->dpy, screen),
- visual, AllocNone);
- if (!display->cmap) {
- glXDestroyContext(display->dpy, display->cx);
- XCloseDisplay(display->dpy);
- free(display);
- return NULL;
- }
-
- /* Create a window */
- swa.colormap = display->cmap;
- swa.border_pixel = 0;
- swa.event_mask = StructureNotifyMask;
- display->win = XCreateWindow(display->dpy,
- RootWindow(display->dpy, screen),
- 0, 0, canvas->x, canvas->y,
- 0, depth, InputOutput, visual,
- CWBorderPixel|CWColormap|CWEventMask, &swa);
- if (!display->win) {
- XFreeColormap(display->dpy, display->cmap);
- glXDestroyContext(display->dpy, display->cx);
- XCloseDisplay(display->dpy);
- free(display);
- return NULL;
- }
-
- XStoreName(display->dpy, display->win, "X");
-
- XMapWindow(display->dpy, display->win);
- XIfEvent(display->dpy, &display->event, WaitForNotify, (char*)display->win);
-
- return display;
-}
-
-dmnsn_display *
-dmnsn_new_glX_display(const dmnsn_canvas *canvas)
+dmnsn_new_display(const dmnsn_canvas *canvas)
{
int attributeList[] = {
GLX_RGBA,
@@ -279,9 +214,7 @@ dmnsn_delete_display(dmnsn_display *display)
if (display) {
XDestroyWindow(display->dpy, display->win);
XFreeColormap(display->dpy, display->cmap);
- if (display->cx) {
- glXDestroyContext(display->dpy, display->cx);
- }
+ glXDestroyContext(display->dpy, display->cx);
XCloseDisplay(display->dpy);
free(display);
}
@@ -290,11 +223,8 @@ dmnsn_delete_display(dmnsn_display *display)
void
dmnsn_display_frame(dmnsn_display *display)
{
- if (display->cx) {
- glFlush();
- glXSwapBuffers(display->dpy, display->win);
- }
- XSync(display->dpy, True);
+ glFlush();
+ glXSwapBuffers(display->dpy, display->win);
}
/* Print a progress bar of the progress of `progress' */
diff --git a/tests/tests.h b/tests/tests.h
index 2d390a5..fcb9ad9 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -41,10 +41,7 @@ typedef struct {
XEvent event;
} dmnsn_display;
-/* Create a new X window */
-dmnsn_display *dmnsn_new_X_display(const dmnsn_canvas *canvas);
-dmnsn_display *dmnsn_new_glX_display(const dmnsn_canvas *canvas);
-/* Destroy the X window */
+dmnsn_display *dmnsn_new_display(const dmnsn_canvas *canvas);
void dmnsn_delete_display(dmnsn_display *display);
/* Flush the GL buffers */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 00:32:29 +0000