From c54af1b6644216335361e61e770037aca1527756 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 6 Jul 2009 16:37:44 +0000 Subject: New GL C++ wrapper. --- tests/Makefile.am | 6 ++++- tests/glxx.cpp | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/tests.h | 9 +++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 tests/glxx.cpp (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 6d496f6..1f3f58c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,8 @@ check_PROGRAMS = warning-test \ pngxx-test \ raytrace-test \ raytracexx-test \ - gl-test + gl-test \ + glxx-test TESTS = $(check_PROGRAMS) XFAIL_TESTS = error-test @@ -59,3 +60,6 @@ raytracexx_test_LDADD = ./libdimensionxx-tests.la gl_test_SOURCES = gl.c gl_test_LDADD = ./libdimension-tests.la + +glxx_test_SOURCES = glxx.cpp +glxx_test_LDADD = ./libdimension-tests.la ./libdimensionxx-tests.la diff --git a/tests/glxx.cpp b/tests/glxx.cpp new file mode 100644 index 0000000..1fc08c4 --- /dev/null +++ b/tests/glxx.cpp @@ -0,0 +1,79 @@ +/************************************************************************* + * Copyright (C) 2008 Tavian Barnes * + * * + * 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 . * + *************************************************************************/ + +#include "tests.h" +#include "testsxx.hpp" +#include +#include + +int +main() { + using namespace Dimension; + + // Set the resilience low for tests + resilience(SEVERITY_LOW); + + // Background color + Color background = sRGB(0.0, 0.1, 0.25); + background.filter(0.1); + + // Canvas + Canvas canvas(768, 480); + + // Camera + Perspective_Camera camera( + Matrix::rotation(Vector(0.0, 1.0, 0.0)) + * Matrix::translation(Vector(0.0, 0.0, -4.0)) + * Matrix::scale( + Vector(static_cast(canvas.width())/canvas.height(), 1.0, 1.0) + ) + ); + + // Scene + Scene scene(background, camera, canvas); + + // Objects in scene + + Sphere sphere; + sphere.trans(inverse(Matrix::scale(Vector(1.25, 1.25, 1.25)))); + scene.push_object(sphere); + + Cube cube; + cube.trans(inverse(Matrix::rotation(Vector(0.75, 0.0, 0.0)))); + scene.push_object(cube); + + Raytracer raytracer(scene); + GL_Drawer drawer(scene.canvas()); + dmnsn_display* display = dmnsn_new_display(scene.canvas().dmnsn()); + + // Render the scene + for (unsigned int i = 0; i < 10; ++i) { + Progress rprogress = raytracer.render_async(); + std::cout << "Raytracing scene: " << rprogress << std::endl; + rprogress.finish(); + + drawer.draw(); + dmnsn_display_frame(display); + + cube.trans(inverse(Matrix::rotation(Vector(0.025, 0.0, 0.0)))*cube.trans()); + camera.trans(Matrix::rotation(Vector(0.0, -0.05, 0.0))*camera.trans()); + } + + return EXIT_SUCCESS; +} diff --git a/tests/tests.h b/tests/tests.h index fcb9ad9..30d4002 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -22,6 +22,11 @@ #include #include +#ifdef __cplusplus +/* We've been included from a C++ file; mark everything here as extern "C" */ +extern "C" { +#endif + /* * Convenience */ @@ -53,3 +58,7 @@ void dmnsn_display_frame(dmnsn_display *display); /* Print a progress bar of the progress of `progress' */ void progressbar(const char *str, const dmnsn_progress *progress); + +#ifdef __cplusplus +} +#endif -- cgit v1.2.3