summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/opencsgtest.cc2
-rw-r--r--tests/regression/opencsgtest/background-modifier-expected.pngbin12387 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/circle-tests-expected.pngbin9840 -> 9537 bytes
-rw-r--r--tests/regression/opencsgtest/color-tests-expected.pngbin0 -> 11055 bytes
-rw-r--r--tests/regression/opencsgtest/cube-expected.pngbin8929 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/cube-tests-expected.pngbin0 -> 7965 bytes
-rw-r--r--tests/regression/opencsgtest/cylinder-expected.pngbin8424 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/cylinder-tests-expected.pngbin0 -> 13165 bytes
-rw-r--r--tests/regression/opencsgtest/difference-tests-expected.pngbin0 -> 12383 bytes
-rw-r--r--tests/regression/opencsgtest/example001-expected.pngbin11808 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/highlight-modifier-expected.pngbin11455 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/import_dxf-tests-expected.pngbin0 -> 9289 bytes
-rw-r--r--tests/regression/opencsgtest/intersection-tests-expected.pngbin0 -> 8069 bytes
-rw-r--r--tests/regression/opencsgtest/polygon-tests-expected.pngbin0 -> 9057 bytes
-rw-r--r--tests/regression/opencsgtest/sphere-expected.pngbin8949 -> 0 bytes
-rw-r--r--tests/regression/opencsgtest/sphere-tests-expected.pngbin0 -> 18276 bytes
-rw-r--r--tests/regression/opencsgtest/square-tests-expected.pngbin7433 -> 8237 bytes
-rw-r--r--tests/regression/opencsgtest/union-tests-expected.pngbin0 -> 10539 bytes
19 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index af64772..9b8ee59 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -221,7 +221,7 @@ add_cmdline_test(cgalpngtest png ${CGALPNGTEST_FILES})
# Add opencsg tests to CTest
LIST(APPEND OPENCSGTEST_FILES ${CGALPNGTEST_FILES})
-#add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES})
+add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES})
# Add dxfexport tests to CTest
#add_cmdline_test(${CMAKE_SOURCE_DIR}/../test-code/exportdxf dxf ${SCAD_FILES})
diff --git a/tests/opencsgtest.cc b/tests/opencsgtest.cc
index b946b4f..7e85322 100644
--- a/tests/opencsgtest.cc
+++ b/tests/opencsgtest.cc
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
Vector3d cameradir(1, 1, -0.5);
- Vector3d camerapos = center - radius*1.5*cameradir;
+ Vector3d camerapos = center - radius*1.8*cameradir;
csgInfo.glview->setCamera(camerapos, center);
glewInit();
diff --git a/tests/regression/opencsgtest/background-modifier-expected.png b/tests/regression/opencsgtest/background-modifier-expected.png
deleted file mode 100644
index 12ba8a1..0000000
--- a/tests/regression/opencsgtest/background-modifier-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/circle-tests-expected.png b/tests/regression/opencsgtest/circle-tests-expected.png
index 6a826c9..7066eb9 100644
--- a/tests/regression/opencsgtest/circle-tests-expected.png
+++ b/tests/regression/opencsgtest/circle-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/color-tests-expected.png b/tests/regression/opencsgtest/color-tests-expected.png
new file mode 100644
index 0000000..b2ef8dd
--- /dev/null
+++ b/tests/regression/opencsgtest/color-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/cube-expected.png b/tests/regression/opencsgtest/cube-expected.png
deleted file mode 100644
index 2de1a5f..0000000
--- a/tests/regression/opencsgtest/cube-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/cube-tests-expected.png b/tests/regression/opencsgtest/cube-tests-expected.png
new file mode 100644
index 0000000..8f0a361
--- /dev/null
+++ b/tests/regression/opencsgtest/cube-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/cylinder-expected.png b/tests/regression/opencsgtest/cylinder-expected.png
deleted file mode 100644
index aea350c..0000000
--- a/tests/regression/opencsgtest/cylinder-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/cylinder-tests-expected.png b/tests/regression/opencsgtest/cylinder-tests-expected.png
new file mode 100644
index 0000000..17c10b8
--- /dev/null
+++ b/tests/regression/opencsgtest/cylinder-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/difference-tests-expected.png b/tests/regression/opencsgtest/difference-tests-expected.png
new file mode 100644
index 0000000..d88d98b
--- /dev/null
+++ b/tests/regression/opencsgtest/difference-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/example001-expected.png b/tests/regression/opencsgtest/example001-expected.png
deleted file mode 100644
index 6086195..0000000
--- a/tests/regression/opencsgtest/example001-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/highlight-modifier-expected.png b/tests/regression/opencsgtest/highlight-modifier-expected.png
deleted file mode 100644
index 042923f..0000000
--- a/tests/regression/opencsgtest/highlight-modifier-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/import_dxf-tests-expected.png b/tests/regression/opencsgtest/import_dxf-tests-expected.png
new file mode 100644
index 0000000..6e568c7
--- /dev/null
+++ b/tests/regression/opencsgtest/import_dxf-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/intersection-tests-expected.png b/tests/regression/opencsgtest/intersection-tests-expected.png
new file mode 100644
index 0000000..fc23560
--- /dev/null
+++ b/tests/regression/opencsgtest/intersection-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/polygon-tests-expected.png b/tests/regression/opencsgtest/polygon-tests-expected.png
new file mode 100644
index 0000000..4d88973
--- /dev/null
+++ b/tests/regression/opencsgtest/polygon-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/sphere-expected.png b/tests/regression/opencsgtest/sphere-expected.png
deleted file mode 100644
index 63636d4..0000000
--- a/tests/regression/opencsgtest/sphere-expected.png
+++ /dev/null
Binary files differ
diff --git a/tests/regression/opencsgtest/sphere-tests-expected.png b/tests/regression/opencsgtest/sphere-tests-expected.png
new file mode 100644
index 0000000..06161f3
--- /dev/null
+++ b/tests/regression/opencsgtest/sphere-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/square-tests-expected.png b/tests/regression/opencsgtest/square-tests-expected.png
index d5106e9..4f9db9d 100644
--- a/tests/regression/opencsgtest/square-tests-expected.png
+++ b/tests/regression/opencsgtest/square-tests-expected.png
Binary files differ
diff --git a/tests/regression/opencsgtest/union-tests-expected.png b/tests/regression/opencsgtest/union-tests-expected.png
new file mode 100644
index 0000000..caa1467
--- /dev/null
+++ b/tests/regression/opencsgtest/union-tests-expected.png
Binary files differ
contact: Jan Huwald // Impressum