diff options
142 files changed, 490 insertions, 264 deletions
@@ -202,6 +202,12 @@ complete, build OpenSCAD and package it to an installer: ./scripts/release-common.sh mingw32 +If you wish you can only build the openscad.exe binary: + + cd mingw32 + i686-pc-mingw32-qmake .. CONFIG+=mingw-cross-env + make + ### Compilation First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to diff --git a/doc/openscad.1 b/doc/openscad.1 index a4c03dd..7fd911d 100644 --- a/doc/openscad.1 +++ b/doc/openscad.1 @@ -40,6 +40,9 @@ More than one \fB-D\fP options can be given. .TP .B \-v, \-\-version Show version of program. +.TP +.B \-\-render +If exporting an image, use a full CGAL render. (Default is an OpenCSG compile) .SH AUTHOR OpenSCAD was written by Clifford Wolf, Marius Kintel, and others. .PP diff --git a/doc/testing.txt b/doc/testing.txt index bbd7c18..0b14903 100644 --- a/doc/testing.txt +++ b/doc/testing.txt @@ -3,6 +3,9 @@ Running regression tests: Prerequisites: cmake, python, ImageMagick 6.5.9.3 or newer +First, get a working qmake GUI build. It is used by the tests. +Next, get MCAD installed by using 'git submodule update --init' + A) Building test environment Linux, Mac: @@ -12,9 +15,7 @@ $ make Windows + MSVC: -First, get a normal build working by following instructions at -http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows -Then, from the QT command prompt: +From the QT command prompt: > cd tests > cmake . -DCMAKE_BUILD_TYPE=Release diff --git a/openscad.pro b/openscad.pro index a7088ec..ead5d1f 100644 --- a/openscad.pro +++ b/openscad.pro @@ -68,7 +68,7 @@ macx { APP_RESOURCES.path = Contents/Resources APP_RESOURCES.files = OpenSCAD.sdef QMAKE_BUNDLE_DATA += APP_RESOURCES - LIBS += -framework Carbon + LIBS += -framework Cocoa } else { TARGET = openscad @@ -229,7 +229,16 @@ HEADERS += src/version_check.h \ src/linalg.h \ src/system-gl.h \ src/stl-utils.h \ - src/svg.h + src/svg.h \ + \ + src/lodepng.h \ + src/OffscreenView.h \ + src/OffscreenContext.h \ + src/OffscreenContextAll.hpp \ + src/fbo.h \ + src/imageutils.h \ + src/system-gl.h \ + src/CsgInfo.h SOURCES += src/version_check.cc \ src/ProgressWidget.cc \ @@ -279,6 +288,7 @@ SOURCES += src/version_check.cc \ \ src/builtin.cc \ src/export.cc \ + src/export_png.cc \ src/import.cc \ src/renderer.cc \ src/ThrownTogetherRenderer.cc \ @@ -287,10 +297,28 @@ SOURCES += src/version_check.cc \ src/dxftess-cgal.cc \ src/CSGTermEvaluator.cc \ src/svg.cc \ + src/OffscreenView.cc \ + src/fbo.cc \ + src/system-gl.cc \ + src/imageutils.cc \ + src/lodepng.cpp \ \ src/openscad.cc \ src/mainwin.cc +unix:!macx { + SOURCES += src/imageutils-lodepng.cc + SOURCES += src/OffscreenContextGLX.cc +} +macx { + SOURCES += src/imageutils-macosx.cc + OBJECTIVE_SOURCES += src/OffscreenContextCGL.mm +} +win32* { + SOURCES += src/imageutils-lodepng.cc + SOURCES += src/OffscreenContextWGL.cc +} + opencsg { HEADERS += src/OpenCSGRenderer.h SOURCES += src/OpenCSGRenderer.cc diff --git a/src/CsgInfo.h b/src/CsgInfo.h new file mode 100644 index 0000000..fa3e100 --- /dev/null +++ b/src/CsgInfo.h @@ -0,0 +1,42 @@ +#ifndef __CSGINFO_H__ +#define __CSGINFO_H__ + +#include "OffscreenView.h" + +class CsgInfo +{ +public: + CsgInfo() { glview = NULL; } + OffscreenView *glview; +}; + + +#ifdef ENABLE_OPENCSG + +#include <opencsg.h> +#include "OpenCSGRenderer.h" +#include "csgterm.h" +#include "csgtermnormalizer.h" + +class CsgInfo_OpenCSG : public CsgInfo +{ +public: + CsgInfo_OpenCSG() + { + root_chain = NULL; + highlights_chain = NULL; + background_chain = NULL; + glview = NULL; + } + shared_ptr<CSGTerm> root_norm_term; // Normalized CSG products + class CSGChain *root_chain; + std::vector<shared_ptr<CSGTerm> > highlight_terms; + CSGChain *highlights_chain; + std::vector<shared_ptr<CSGTerm> > background_terms; + CSGChain *background_chain; +}; + +#endif // ENABLE_OPENCSG + +#endif + diff --git a/src/MainWindow.h b/src/MainWindow.h index a4835c2..4848db6 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -74,7 +74,6 @@ private slots: private: void openFile(const QString &filename); void refreshDocument(); - AbstractNode *find_root_tag(AbstractNode *n); void updateTemporalVariables(); bool fileChangedOnDisk(); bool includesChanged(); diff --git a/src/OffscreenContext.h b/src/OffscreenContext.h new file mode 100644 index 0000000..500832c --- /dev/null +++ b/src/OffscreenContext.h @@ -0,0 +1,18 @@ +#ifndef OFFSCREENCONTEXT_H_ +#define OFFSCREENCONTEXT_H_ + +// Here we implement a 'portability' pattern but since we are mixing +// Objective-C with C++, it is a bit different. + +#include <iostream> +#include <fstream> +#include <string> +#include "fbo.h" + +struct OffscreenContext *create_offscreen_context(int w, int h); +bool teardown_offscreen_context(OffscreenContext *ctx); +bool save_framebuffer(OffscreenContext *ctx, const char * filename); +bool save_framebuffer(OffscreenContext *ctx, std::ostream &output); +std::string offscreen_context_getinfo(OffscreenContext *ctx); + +#endif diff --git a/src/OffscreenContextAll.hpp b/src/OffscreenContextAll.hpp new file mode 100644 index 0000000..42563be --- /dev/null +++ b/src/OffscreenContextAll.hpp @@ -0,0 +1,74 @@ +// Functions shared by OffscreenContext[platform].cc +// #include this directly after definition of struct OffscreenContext. + +#include <vector> +#include <ostream> + +void bind_offscreen_context(OffscreenContext *ctx) +{ + if (ctx) fbo_bind(ctx->fbo); +} + +/* + Capture framebuffer from OpenGL and write it to the given filename as PNG. +*/ +bool save_framebuffer(OffscreenContext *ctx, const char *filename) +{ + std::ofstream fstream(filename,std::ios::out|std::ios::binary); + if (!fstream.is_open()) { + std::cerr << "Can't open file " << filename << " for writing"; + return false; + } else { + save_framebuffer(ctx, fstream); + fstream.close(); + } + return true; +} + +/*! + Capture framebuffer from OpenGL and write it to the given ostream. + Called by save_framebuffer() from platform-specific code. +*/ +bool save_framebuffer_common(OffscreenContext *ctx, std::ostream &output) +{ + if (!ctx) return false; + int samplesPerPixel = 4; // R, G, B and A + std::vector<GLubyte> pixels(ctx->width * ctx->height * samplesPerPixel); + glReadPixels(0, 0, ctx->width, ctx->height, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[0]); + + // Flip it vertically - images read from OpenGL buffers are upside-down + int rowBytes = samplesPerPixel * ctx->width; + + unsigned char *flippedBuffer = (unsigned char *)malloc(rowBytes * ctx->height); + if (!flippedBuffer) { + std::cerr << "Unable to allocate flipped buffer for corrected image."; + return 1; + } + flip_image(&pixels[0], flippedBuffer, samplesPerPixel, ctx->width, ctx->height); + + bool writeok = write_png(output, flippedBuffer, ctx->width, ctx->height); + + free(flippedBuffer); + + return writeok; +} + +// Called by create_offscreen_context() from platform-specific code. +OffscreenContext *create_offscreen_context_common(OffscreenContext *ctx) +{ + if (!ctx) return NULL; + GLenum err = glewInit(); // must come after Context creation and before FBO c$ + if (GLEW_OK != err) { + std::cerr << "Unable to init GLEW: " << glewGetErrorString(err) << "\n"; + return NULL; + } + //cerr << glew_dump(0); + + ctx->fbo = fbo_new(); + if (!fbo_init(ctx->fbo, ctx->width, ctx->height)) { + return NULL; + } + + return ctx; +} + diff --git a/tests/OffscreenContext.mm b/src/OffscreenContextCGL.mm index a0995fa..76c5418 100644 --- a/tests/OffscreenContext.mm +++ b/src/OffscreenContextCGL.mm @@ -19,7 +19,9 @@ struct OffscreenContext fbo_t *fbo; }; -std::string offscreen_context_getinfo(OffscreenContext *ctx) +#include "OffscreenContextAll.hpp" + +std::string offscreen_context_getinfo(OffscreenContext *) { std::stringstream out; @@ -81,7 +83,7 @@ OffscreenContext *create_offscreen_context(int w, int h) std::cerr << "Unable to init GLEW: " << glewGetErrorString(err) << std::endl; return NULL; } - glew_dump(); + glew_dump(false); ctx->fbo = fbo_new(); if (!fbo_init(ctx->fbo, w, h)) { @@ -107,11 +109,11 @@ bool teardown_offscreen_context(OffscreenContext *ctx) } /*! - Capture framebuffer from OpenGL and write it to the given filename as PNG. + Capture framebuffer from OpenGL and write it to the given ostream */ -bool save_framebuffer(OffscreenContext *ctx, const char *filename) +bool save_framebuffer(OffscreenContext *ctx, std::ostream &output) { - if (!ctx || !filename) return false; + if (!ctx) return false; // Read pixels from OpenGL int samplesPerPixel = 4; // R, G, B and A int rowBytes = samplesPerPixel * ctx->width; @@ -132,7 +134,7 @@ bool save_framebuffer(OffscreenContext *ctx, const char *filename) } flip_image(bufferData, flippedBuffer, samplesPerPixel, ctx->width, ctx->height); - bool writeok = write_png(filename, flippedBuffer, ctx->width, ctx->height); + bool writeok = write_png(output, flippedBuffer, ctx->width, ctx->height); free(flippedBuffer); free(bufferData); @@ -140,7 +142,3 @@ bool save_framebuffer(OffscreenContext *ctx, const char *filename) return writeok; } -void bind_offscreen_context(OffscreenContext *ctx) -{ - fbo_bind(ctx->fbo); -} diff --git a/tests/OffscreenContextGLX.cc b/src/OffscreenContextGLX.cc index e607593..84bcf0e 100644 --- a/tests/OffscreenContextGLX.cc +++ b/src/OffscreenContextGLX.cc @@ -61,6 +61,8 @@ struct OffscreenContext fbo_t *fbo; }; +#include "OffscreenContextAll.hpp" + void offscreen_context_init(OffscreenContext &ctx, int width, int height) { ctx.width = width; @@ -266,20 +268,7 @@ OffscreenContext *create_offscreen_context(int w, int h) return NULL; } - // glewInit must come after Context creation and before FBO calls. - GLenum err = glewInit(); - if (GLEW_OK != err) { - cerr << "Unable to init GLEW: " << glewGetErrorString(err) << endl; - return NULL; - } - - ctx->fbo = fbo_new(); - if (!fbo_init(ctx->fbo, w, h)) { - cerr << "GL Framebuffer Object init failed; dumping GLEW info" << endl; - return NULL; - } - - return ctx; + return create_offscreen_context_common( ctx ); } bool teardown_offscreen_context(OffscreenContext *ctx) @@ -295,34 +284,9 @@ bool teardown_offscreen_context(OffscreenContext *ctx) return false; } -/*! - Capture framebuffer from OpenGL and write it to the given filename as PNG. -*/ -bool save_framebuffer(OffscreenContext *ctx, const char *filename) +bool save_framebuffer(OffscreenContext *ctx, std::ostream &output) { glXSwapBuffers(ctx->xdisplay, ctx->xwindow); - if (!ctx || !filename) return false; - int samplesPerPixel = 4; // R, G, B and A - GLubyte pixels[ctx->width * ctx->height * samplesPerPixel]; - glReadPixels(0, 0, ctx->width, ctx->height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); - - // Flip it vertically - images read from OpenGL buffers are upside-down - int rowBytes = samplesPerPixel * ctx->width; - unsigned char *flippedBuffer = (unsigned char *)malloc(rowBytes * ctx->height); - if (!flippedBuffer) { - cerr << "Unable to allocate flipped buffer for corrected image."; - return 1; - } - flip_image(pixels, flippedBuffer, samplesPerPixel, ctx->width, ctx->height); - - bool writeok = write_png(filename, flippedBuffer, ctx->width, ctx->height); - - free(flippedBuffer); - - return writeok; + return save_framebuffer_common(ctx, output); } -void bind_offscreen_context(OffscreenContext *ctx) -{ - if (ctx) fbo_bind(ctx->fbo); -} diff --git a/tests/OffscreenContextWGL.cc b/src/OffscreenContextWGL.cc index 75a7ed2..b8e1481 100644 --- a/tests/OffscreenContextWGL.cc +++ b/src/OffscreenContextWGL.cc @@ -38,6 +38,8 @@ struct OffscreenContext fbo_t *fbo; }; +#include "OffscreenContextAll.hpp" + void offscreen_context_init(OffscreenContext &ctx, int width, int height) { ctx.window = (HWND)NULL; @@ -80,6 +82,7 @@ string get_os_info() string offscreen_context_getinfo(OffscreenContext *ctx) { + // should probably get some info from WGL context here? stringstream out; out << "GL context creator: WGL\n" << "PNG generator: lodepng\n" @@ -184,19 +187,7 @@ OffscreenContext *create_offscreen_context(int w, int h) return NULL; } - GLenum err = glewInit(); // must come after Context creation and before FBO calls. - if (GLEW_OK != err) { - cerr << "Unable to init GLEW: " << glewGetErrorString(err) << "\n"; - return NULL; - } - //cerr << glew_dump(0); - - ctx->fbo = fbo_new(); - if (!fbo_init(ctx->fbo, w, h)) { - return NULL; - } - - return ctx; + return create_offscreen_context_common( ctx ); } bool teardown_offscreen_context(OffscreenContext *ctx) @@ -204,44 +195,18 @@ bool teardown_offscreen_context(OffscreenContext *ctx) if (ctx) { fbo_unbind(ctx->fbo); fbo_delete(ctx->fbo); - wglMakeCurrent( NULL, NULL ); wglDeleteContext( ctx->openGLContext ); ReleaseDC( ctx->window, ctx->dev_context ); - return true; } return false; } -/*! - Capture framebuffer from OpenGL and write it to the given filename as PNG. -*/ -bool save_framebuffer(OffscreenContext *ctx, const char *filename) +bool save_framebuffer(OffscreenContext *ctx, std::ostream &output) { + if (!ctx) return false; wglSwapLayerBuffers( ctx->dev_context, WGL_SWAP_MAIN_PLANE ); - if (!ctx || !filename) return false; - int samplesPerPixel = 4; // R, G, B and A - vector<GLubyte> pixels(ctx->width * ctx->height * samplesPerPixel); - glReadPixels(0, 0, ctx->width, ctx->height, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[0]); - - // Flip it vertically - images read from OpenGL buffers are upside-down - int rowBytes = samplesPerPixel * ctx->width; - unsigned char *flippedBuffer = (unsigned char *)malloc(rowBytes * ctx->height); - if (!flippedBuffer) { - std::cerr << "Unable to allocate flipped buffer for corrected image."; - return 1; - } - flip_image(&pixels[0], flippedBuffer, samplesPerPixel, ctx->width, ctx->height); - - bool writeok = write_png(filename, flippedBuffer, ctx->width, ctx->height); - - free(flippedBuffer); - - return writeok; + return save_framebuffer_common( ctx, output ); } -void bind_offscreen_context(OffscreenContext *ctx) -{ - if (ctx) fbo_bind(ctx->fbo); -} diff --git a/tests/OffscreenView.cc b/src/OffscreenView.cc index 61d5818..12ebf3a 100644 --- a/tests/OffscreenView.cc +++ b/src/OffscreenView.cc @@ -142,6 +142,11 @@ bool OffscreenView::save(const char *filename) return save_framebuffer(this->ctx, filename); } +bool OffscreenView::save(std::ostream &output) +{ + return save_framebuffer(this->ctx, output); +} + std::string OffscreenView::getInfo() { std::stringstream out; diff --git a/tests/OffscreenView.h b/src/OffscreenView.h index 8b98b29..f401bef 100644 --- a/tests/OffscreenView.h +++ b/src/OffscreenView.h @@ -8,6 +8,8 @@ #ifndef _MSC_VER #include <stdint.h> #endif +#include "system-gl.h" +#include <iostream> class OffscreenView { @@ -23,6 +25,7 @@ public: void setupOrtho(bool offset=false); void paintGL(); bool save(const char *filename); + bool save(std::ostream &output); std::string getInfo(); GLint shaderinfo[11]; @@ -32,14 +35,15 @@ public: private: Renderer *renderer; double w_h_ratio; - Eigen::Vector3d object_rot; - Eigen::Vector3d camera_eye; - Eigen::Vector3d camera_center; bool orthomode; bool showaxes; bool showfaces; bool showedges; + + Eigen::Vector3d object_rot; + Eigen::Vector3d camera_eye; + Eigen::Vector3d camera_center; }; #endif diff --git a/src/export.cc b/src/export.cc index 80670ea..6ec28ef 100644 --- a/src/export.cc +++ b/src/export.cc @@ -195,7 +195,7 @@ void export_dxf(CGAL_Nef_polyhedron *root_N, std::ostream &output) setlocale(LC_NUMERIC, ""); // Set default locale } -#endif +#endif // ENABLE_CGAL #ifdef DEBUG #include <boost/foreach.hpp> diff --git a/src/export.h b/src/export.h index 3897be0..b140db6 100644 --- a/src/export.h +++ b/src/export.h @@ -8,6 +8,8 @@ void export_stl(class CGAL_Nef_polyhedron *root_N, std::ostream &output); void export_off(CGAL_Nef_polyhedron *root_N, std::ostream &output); void export_dxf(CGAL_Nef_polyhedron *root_N, std::ostream &output); +void export_png_with_cgal(CGAL_Nef_polyhedron *root_N, std::ostream &output); +void export_png_with_opencsg(CGAL_Nef_polyhedron *root_N, std::ostream &output); #endif diff --git a/src/export_png.cc b/src/export_png.cc new file mode 100644 index 0000000..7c62cea --- /dev/null +++ b/src/export_png.cc @@ -0,0 +1,57 @@ +#include "export.h" +#include "printutils.h" +#include "OffscreenView.h" +#include "CsgInfo.h" +#include <stdio.h> +#include "polyset.h" + +#ifdef ENABLE_CGAL +#include "CGALRenderer.h" +#include "CGAL_renderer.h" +#include "cgal.h" + +void export_png_with_cgal(CGAL_Nef_polyhedron *root_N, std::ostream &output) +{ + CsgInfo csgInfo; + try { + csgInfo.glview = new OffscreenView(512,512); + } catch (int error) { + fprintf(stderr,"Can't create OpenGL OffscreenView. Code: %i.\n", error); + return; + } + CGALRenderer cgalRenderer(*root_N); + + BoundingBox bbox; + if (cgalRenderer.polyhedron) { + CGAL::Bbox_3 cgalbbox = cgalRenderer.polyhedron->bbox(); + bbox = BoundingBox( + Vector3d(cgalbbox.xmin(), cgalbbox.ymin(), cgalbbox.zmin()), + Vector3d(cgalbbox.xmax(), cgalbbox.ymax(), cgalbbox.zmax()) ); + } + else if (cgalRenderer.polyset) { + bbox = cgalRenderer.polyset->getBoundingBox(); + } + + Vector3d center = getBoundingCenter(bbox); + double radius = getBoundingRadius(bbox); + + Vector3d cameradir(1, 1, -0.5); + Vector3d camerapos = center - radius*2*cameradir; + std::cerr << center << "\n"; + std::cerr << radius << "\n"; + + csgInfo.glview->setCamera(camerapos, center); + csgInfo.glview->setRenderer(&cgalRenderer); + csgInfo.glview->paintGL(); + csgInfo.glview->save(output); +} + +void export_png_with_opencsg(CGAL_Nef_polyhedron *root_N, std::ostream &output) +{ + CsgInfo csgInfo; + output << "solid OpenSCAD_Model opencsg\n"; + output << "endsolid OpenSCAD_Model opencsg\n"; +} + + +#endif // ENABLE_CGAL diff --git a/tests/fbo.cc b/src/fbo.cc index a6677c1..186cb95 100644 --- a/tests/fbo.cc +++ b/src/fbo.cc @@ -59,7 +59,7 @@ bool check_fbo_status() else if (status == GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT) cerr << "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\n"; else - cerr << "Unknown Code: glCheckFramebufferStatusEXT returned %i\n",status; + cerr << "Unknown Code: glCheckFramebufferStatusEXT returned:" << status <<"\n"; return result; } diff --git a/src/imageutils-lodepng.cc b/src/imageutils-lodepng.cc new file mode 100644 index 0000000..a034702 --- /dev/null +++ b/src/imageutils-lodepng.cc @@ -0,0 +1,26 @@ +#include "imageutils.h" +#include "lodepng.h" +#include <stdio.h> +#include <stdlib.h> + +bool write_png(std::ostream &output, unsigned char *pixels, int width, int height) +{ + //encoder.settings.zlibsettings.windowSize = 2048; + //LodePNG_Text_add(&encoder.infoPng.text, "Comment", "Created with LodePNG"); + size_t dataout_size = -1; + bool result = false; + unsigned char *dataout = (unsigned char *)malloc(width*height*4); + if (!dataout) { + perror("Error allocating memory while writing png\n"); + return result; + } + LodePNG_encode(&dataout, &dataout_size, pixels, width, height, LCT_RGBA, 8); + try { + output.write( reinterpret_cast<const char*>(dataout), dataout_size ); + result = true; + } catch (const std::ios_base::failure &e) { + std::cerr << "Error writing to ostream:" << e.what() << "\n"; + } + free( dataout ); + return result; +} diff --git a/tests/imageutils-macosx.cc b/src/imageutils-macosx.cc index 404052f..4c7c446 100644 --- a/tests/imageutils-macosx.cc +++ b/src/imageutils-macosx.cc @@ -1,7 +1,34 @@ #include <ApplicationServices/ApplicationServices.h> #include <iostream> +#include "imageutils.h" +#include <assert.h> -bool write_png(const char *filename, unsigned char *pixels, int width, int height) +CGDataConsumerCallbacks dc_callbacks; + +size_t write_bytes_to_ostream (void *info,const void *buffer,size_t count) +{ + assert( info && buffer ); + std::ostream *output = (std::ostream *)info; + size_t startpos = output->tellp(); + size_t endpos = startpos; + try { + output->write( (const char *)buffer, count ); + endpos = output->tellp(); + } catch (const std::ios_base::failure& e) { + std::cerr << "Error writing to ostream:" << e.what() << "\n"; + } + return (endpos-startpos); +} + +CGDataConsumerRef CGDataConsumerCreateWithOstream(std::ostream &output) +{ + dc_callbacks.putBytes = write_bytes_to_ostream; + dc_callbacks.releaseConsumer = NULL; // ostream closed by caller of write_png + CGDataConsumerRef dc = CGDataConsumerCreate ( (void *)(&output), &dc_callbacks ); + return dc; +} + +bool write_png(std::ostream &output, unsigned char *pixels, int width, int height) { size_t rowBytes = width * 4; // CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); @@ -22,6 +49,8 @@ bool write_png(const char *filename, unsigned char *pixels, int width, int heigh return false; } + CGDataConsumerRef dataconsumer = CGDataConsumerCreateWithOstream(output); + /* CFStringRef fname = CFStringCreateWithCString(kCFAllocatorDefault, filename, kCFStringEncodingUTF8); CFURLRef fileURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, fname, kCFURLPOSIXPathStyle, false); @@ -30,7 +59,9 @@ bool write_png(const char *filename, unsigned char *pixels, int width, int heigh return false; } - CGDataConsumerRef dataconsumer = CGDataConsumerCreateWithURL(fileURL); + CGDataConsumerRef dataconsumer = CGDataConsumerCreateWithURL(fileURL); + */ + CFIndex fileImageIndex = 1; CFMutableDictionaryRef fileDict = NULL; CFStringRef fileUTType = kUTTypePNG; @@ -55,10 +86,13 @@ bool write_png(const char *filename, unsigned char *pixels, int width, int heigh CFRelease(imageDest); CFRelease(dataconsumer); - CFRelease(fileURL); - CFRelease(fname); + //CFRelease(fileURL); + //CFRelease(fname); CFRelease(imageProps); CGColorSpaceRelease(colorSpace); CGImageRelease(imageRef); return true; } + + + diff --git a/src/imageutils.cc b/src/imageutils.cc new file mode 100644 index 0000000..133eaf1 --- /dev/null +++ b/src/imageutils.cc @@ -0,0 +1,24 @@ +#include "imageutils.h" +#include <string.h> +#include <fstream> + +void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, size_t width, size_t height) +{ + size_t rowBytes = pixelsize * width; + for (size_t i = 0 ; i < height ; i++) { + memmove(dst + (height - i - 1) * rowBytes, src + i * rowBytes, rowBytes); + } +} + +bool write_png(const char *filename, unsigned char *pixels, int width, int height) { + std::ofstream fstream( filename, std::ios::binary ); + if (fstream.is_open()) { + write_png( fstream, pixels, width, height ); + fstream.close(); + return true; + } else { + std::cerr << "Can't open file " << filename << " for export."; + return false; + } +} + diff --git a/tests/imageutils.h b/src/imageutils.h index 72602a2..c9bb8de 100644 --- a/tests/imageutils.h +++ b/src/imageutils.h @@ -2,8 +2,10 @@ #define IMAGEUTILS_H_ #include <stdlib.h> +#include <iostream> bool write_png(const char *filename, unsigned char *pixels, int width, int height); +bool write_png(std::ostream &output, unsigned char *pixels, int width, int height); void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, size_t width, size_t height); #endif diff --git a/src/linalg.cc b/src/linalg.cc index 2f368f9..590e01b 100644 --- a/src/linalg.cc +++ b/src/linalg.cc @@ -46,3 +46,15 @@ bool matrix_contains_nan( const Transform3d &m ) return false; } +double getBoundingRadius(BoundingBox bbox) +{ + double radius = (bbox.max() - bbox.min()).norm() / 2; + return radius; // 0; +} + +Vector3d getBoundingCenter(BoundingBox bbox) +{ + Vector3d center = (bbox.min() + bbox.max()) / 2; + return center; // Vector3d(0,0,0); +} + diff --git a/src/linalg.h b/src/linalg.h index 48960b7..1f9ed30 100644 --- a/src/linalg.h +++ b/src/linalg.h @@ -22,6 +22,9 @@ bool matrix_contains_infinity( const Transform3d &m ); bool matrix_contains_nan( const Transform3d &m ); BoundingBox operator*(const Transform3d &m, const BoundingBox &box); +Vector3d getBoundingCenter(BoundingBox bbox); +double getBoundingRadius(BoundingBox bbox); + class Color4f : public Eigen::Vector4f { diff --git a/tests/lodepng.cpp b/src/lodepng.cpp index 831194f..9d21668 100644 --- a/tests/lodepng.cpp +++ b/src/lodepng.cpp @@ -1497,7 +1497,7 @@ static unsigned encodeLZ77(uivector* out, const unsigned char* in, size_t insize unsigned length, tablepos; #ifdef LAZY_MATCHING unsigned lazy = 0; - unsigned lazylength, lazyoffset; + unsigned lazylength = 0, lazyoffset = 0; #endif /*LAZY_MATCHING*/ unsigned hash, initialZeros = 0; unsigned backpos, current_offset, t1, t2, t11, current_length; @@ -4679,7 +4679,7 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, This is very slow and gives only slightly smaller, sometimes even larger, result*/ size_t size[5]; ucvector attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest; + size_t smallest = 0; unsigned type = 0, bestType = 0; unsigned char* dummy; LodePNG_CompressSettings zlibsettings = settings->zlibsettings; diff --git a/tests/lodepng.h b/src/lodepng.h index a0a654f..a0a654f 100644 --- a/tests/lodepng.h +++ b/src/lodepng.h diff --git a/src/mainwin.cc b/src/mainwin.cc index 17b9ef7..d5af643 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -584,15 +584,6 @@ void MainWindow::refreshDocument() setCurrentOutput(); } -AbstractNode *MainWindow::find_root_tag(AbstractNode *n) -{ - BOOST_FOREACH (AbstractNode *v, n->children) { - if (v->modinst->isRoot()) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - /*! Parse and evaluate the design => this->root_node diff --git a/src/node.cc b/src/node.cc index e61174f..a7a7630 100644 --- a/src/node.cc +++ b/src/node.cc @@ -32,6 +32,7 @@ #include <iostream> #include <algorithm> +#include <boost/foreach.hpp> size_t AbstractNode::idx_counter; @@ -101,3 +102,14 @@ std::ostream &operator<<(std::ostream &stream, const AbstractNode &node) stream << node.toString(); return stream; } + +// Do we have an explicit root node (! modifier)? +AbstractNode *find_root_tag(AbstractNode *n) +{ + BOOST_FOREACH(AbstractNode *v, n->children) { + if (v->modinst->tag_root) return v; + if (AbstractNode *vroot = find_root_tag(v)) return vroot; + } + return NULL; +} + @@ -84,5 +84,6 @@ public: }; std::ostream &operator<<(std::ostream &stream, const AbstractNode &node); +AbstractNode *find_root_tag(AbstractNode *n); #endif diff --git a/src/openscad.cc b/src/openscad.cc index 880aa0d..7ebad33 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -71,7 +71,7 @@ namespace fs = boost::filesystem; static void help(const char *progname) { fprintf(stderr, "Usage: %s [ -o output_file [ -d deps_file ] ]\\\n" - "%*s[ -m make_command ] [ -D var=val [..] ] filename\n", + "%*s[ -m make_command ] [ -D var=val [..] ] [ --render ] filename\n", progname, int(strlen(progname))+8, ""); exit(1); } @@ -132,6 +132,7 @@ int main(int argc, char **argv) desc.add_options() ("help,h", "help message") ("version,v", "print the version") + ("render", "if exporting an image, do a full CGAL render") ("o,o", po::value<string>(), "out-file") ("s,s", po::value<string>(), "stl-file") ("x,x", po::value<string>(), "dxf-file") @@ -242,12 +243,14 @@ int main(int argc, char **argv) const char *off_output_file = NULL; const char *dxf_output_file = NULL; const char *csg_output_file = NULL; + const char *png_output_file = NULL; QString suffix = QFileInfo(output_file).suffix().toLower(); if (suffix == "stl") stl_output_file = output_file; else if (suffix == "off") off_output_file = output_file; else if (suffix == "dxf") dxf_output_file = output_file; else if (suffix == "csg") csg_output_file = output_file; + else if (suffix == "png") png_output_file = output_file; else { fprintf(stderr, "Unknown suffix for output file %s\n", output_file); exit(1); @@ -261,6 +264,7 @@ int main(int argc, char **argv) Module *root_module; ModuleInstantiation root_inst; AbstractNode *root_node; + AbstractNode *absolute_root_node; handle_dep(filename); @@ -282,7 +286,13 @@ int main(int argc, char **argv) fs::current_path(fparent); AbstractNode::resetIndexCounter(); + absolute_root_node = root_module->evaluate(&root_ctx, &root_inst); root_node = root_module->evaluate(&root_ctx, &root_inst); + + // Do we have an explicit root node (! modifier)? + if (!(root_node = find_root_tag(absolute_root_node))) + root_node = absolute_root_node; + tree.setRoot(root_node); if (csg_output_file) { @@ -309,6 +319,7 @@ int main(int argc, char **argv) if ( stl_output_file ) geom_out = std::string(stl_output_file); else if ( off_output_file ) geom_out = std::string(off_output_file); else if ( dxf_output_file ) geom_out = std::string(dxf_output_file); + else if ( png_output_file ) geom_out = std::string(png_output_file); else { PRINTB("Output file:%s\n",output_file); PRINT("Sorry, don't know how to write deps for that file type. Exiting\n"); @@ -373,12 +384,27 @@ int main(int argc, char **argv) fstream.close(); } } + + if (png_output_file) { + std::ofstream fstream(png_output_file,std::ios::out|std::ios::binary); + if (!fstream.is_open()) { + PRINTB("Can't open file \"%s\" for export", png_output_file); + } + else { + if (vm.count("render")) { + export_png_with_cgal(&root_N, fstream); + } else { + export_png_with_opencsg(&root_N, fstream); + } + fstream.close(); + } + } + } + delete root_node; #else fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); exit(1); #endif - } - delete root_node; } else if (useGUI) { diff --git a/tests/system-gl.cc b/src/system-gl.cc index 2e3f3bc..2e3f3bc 100644 --- a/tests/system-gl.cc +++ b/src/system-gl.cc diff --git a/src/system-gl.h b/src/system-gl.h index d7de3c6..57e9080 100644 --- a/src/system-gl.h +++ b/src/system-gl.h @@ -13,4 +13,9 @@ #endif #endif +#include <string> + +std::string glew_dump(bool dumpall); +bool report_glerror(const char * function); + #endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d2daf43..d0e5075 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -453,28 +453,32 @@ set(COMMON_SOURCES ../src/PolySetEvaluator.cc ../src/PolySetCache.cc ../src/Tree.cc - lodepng.cpp) + ../src/lodepng.cpp) # # Offscreen OpenGL context source code # if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") message(STATUS "Offscreen OpenGL Context - using Apple CGL") - set(OFFSCREEN_CTX_SOURCE "OffscreenContext.mm" CACHE TYPE STRING) + set(OFFSCREEN_CTX_SOURCE "OffscreenContextCGL.mm" CACHE TYPE STRING) + set(OFFSCREEN_IMGUTILS_SOURCE "imageutils-macosx.cc" CACHE TYPE STRING) elseif(UNIX) message(STATUS "Offscreen OpenGL Context - using Unix GLX") set(OFFSCREEN_CTX_SOURCE "OffscreenContextGLX.cc" CACHE TYPE STRING) + set(OFFSCREEN_IMGUTILS_SOURCE "imageutils-lodepng.cc" CACHE TYPE STRING) elseif(WIN32) message(STATUS "Offscreen OpenGL Context - using Microsoft WGL") set(OFFSCREEN_CTX_SOURCE "OffscreenContextWGL.cc" CACHE TYPE STRING) + set(OFFSCREEN_IMGUTILS_SOURCE "imageutils-lodepng.cc" CACHE TYPE STRING) endif() set(OFFSCREEN_SOURCES - OffscreenView.cc - ${OFFSCREEN_CTX_SOURCE} - imageutils.cc - fbo.cc - system-gl.cc) + ../src/OffscreenView.cc + ../src/${OFFSCREEN_CTX_SOURCE} + ../src/${OFFSCREEN_IMGUTILS_SOURCE} + ../src/imageutils.cc + ../src/fbo.cc + ../src/system-gl.cc) add_library(tests-core STATIC ${CORE_SOURCES}) target_link_libraries(tests-core ${OPENGL_LIBRARY}) @@ -541,14 +545,14 @@ target_link_libraries(cgalstlsanitytest tests-cgal ${TESTS-CGAL-LIBRARIES}) # # cgalpngtest # -add_executable(cgalpngtest cgalpngtest.cc bboxhelp.cc ../src/CGALRenderer.cc ../src/renderer.cc ../src/rendersettings.cc) +add_executable(cgalpngtest cgalpngtest.cc ../src/CGALRenderer.cc ../src/renderer.cc ../src/rendersettings.cc) set_target_properties(cgalpngtest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") target_link_libraries(cgalpngtest tests-offscreen tests-cgal ${OPENCSG_LIBRARY} ${TESTS-CGAL-LIBRARIES} ${GLEW_LIBRARY} ${COCOA_LIBRARY}) # # cgalcachetest # -add_executable(cgalcachetest cgalcachetest.cc bboxhelp.cc) +add_executable(cgalcachetest cgalcachetest.cc) set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") target_link_libraries(cgalcachetest tests-cgal ${TESTS-CGAL-LIBRARIES} ${GLEW_LIBRARY} ${COCOA_LIBRARY}) @@ -569,6 +573,20 @@ set_target_properties(throwntogethertest PROPERTIES COMPILE_FLAGS "-DENABLE_OPEN target_link_libraries(throwntogethertest tests-offscreen tests-cgal ${OPENCSG_LIBRARY} ${TESTS-CGAL-LIBRARIES} ${GLEW_LIBRARY} ${COCOA_LIBRARY}) # +# gui tests (simple wrappers around the GUI binary built by qmake) +# +if(APPLE) + set(GUI_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../OpenSCAD.app/Contents/MacOS/OpenSCAD") +elseif(WIN32) + set(GUI_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../Release/openscad.exe") +else() + set(GUI_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../openscad") +endif() + +add_executable(guicgalpngtest guicgalpngtest.cc) +set_target_properties(guicgalpngtest PROPERTIES COMPILE_FLAGS "-DBINPATH=${GUI_BINPATH}") + +# # Tags tests as disabled. This is more convenient than removing them manually # from the lists of filenames # @@ -669,8 +687,6 @@ endmacro() enable_testing() - - set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_SOURCE_DIR}/EnforceConfig.cmake") # Subst files @@ -720,6 +736,8 @@ list(APPEND THROWNTOGETHERTEST_FILES ${OPENCSGTEST_FILES}) list(APPEND CGALSTLSANITYTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/normal-nan.scad) +list(APPEND GUICGALPNGTEST_FILES ${CGALPNGTEST_FILES}) + # Disable tests which are known to cause floating point comparison issues # Once we're capable of comparing these across platforms, we can put these back in disable_tests(dumptest_transform-tests @@ -752,6 +770,9 @@ disable_tests(opencsgtest_example006 cgalpngtest_example006) disable_tests(cgalpngtest_child-background cgalpngtest_highlight-and-background-modifier cgalpngtest_testcolornames + guicgalpngtest_child-background + guicgalpngtest_highlight-and-background-modifier + guicgalpngtest_testcolornames throwntogethertest_child-background throwntogethertest_highlight-and-background-modifier throwntogethertest_testcolornames) @@ -778,6 +799,8 @@ foreach(FILE ${EXAMPLE_FILES}) set_test_config(Examples ${TEST_FULLNAME}) get_test_fullname(throwntogethertest ${FILE} TEST_FULLNAME) set_test_config(Examples ${TEST_FULLNAME}) + get_test_fullname(guicgalpngtest ${FILE} TEST_FULLNAME) + set_test_config(Examples ${TEST_FULLNAME}) endforeach() # Workaround Gallium bugs @@ -819,6 +842,8 @@ add_cmdline_test(csgtermtest txt ${MINIMAL_FILES}) add_cmdline_test(cgalpngtest png ${CGALPNGTEST_FILES}) add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES}) add_cmdline_test(throwntogethertest png ${THROWNTOGETHERTEST_FILES}) +add_cmdline_test(guicgalpngtest png ${GUICGALPNGTEST_FILES}) + # FIXME: We don't actually need to compare the output of cgalstlsanitytest # with anything. It's self-contained and returns != 0 on error add_cmdline_test(cgalstlsanitytest txt ${CGALSTLSANITYTEST_FILES}) diff --git a/tests/EnforceConfig.cmake b/tests/EnforceConfig.cmake index 8e2ebf7..8ef7be8 100644 --- a/tests/EnforceConfig.cmake +++ b/tests/EnforceConfig.cmake @@ -1,4 +1,4 @@ -message("Enforcing config") if(NOT CTEST_CONFIGURATION_TYPE) + message("Enforcing Default test configuration. Use ctest -C <config> to override") set(CTEST_CONFIGURATION_TYPE Default) endif() diff --git a/tests/OffscreenContext.h b/tests/OffscreenContext.h deleted file mode 100644 index 6eebcba..0000000 --- a/tests/OffscreenContext.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef OFFSCREENCONTEXT_H_ -#define OFFSCREENCONTEXT_H_ - -#include <iostream> // for error output -#include <string> - -struct OffscreenContext *create_offscreen_context(int w, int h); -void bind_offscreen_context(OffscreenContext *ctx); -bool teardown_offscreen_context(OffscreenContext *ctx); -bool save_framebuffer(OffscreenContext *ctx, const char *filename); -std::string offscreen_context_getinfo(OffscreenContext *ctx); - -#endif diff --git a/tests/bboxhelp.cc b/tests/bboxhelp.cc deleted file mode 100644 index b70ddcf..0000000 --- a/tests/bboxhelp.cc +++ /dev/null @@ -1,21 +0,0 @@ -/* - Work around bugs in MSVC compiler with Eigen AlignmentBox - bbox.min and bbox.max will fail with Syntax Errors if placed inside - of cgalpngtest.cc -*/ - -#include "linalg.h" - -Vector3d getBoundingCenter(BoundingBox bbox) -{ - Vector3d center = (bbox.min() + bbox.max()) / 2; - return center; // Vector3d(0,0,0); -} - -double getBoundingRadius(BoundingBox bbox) -{ - double radius = (bbox.max() - bbox.min()).norm() / 2; - return radius; // 0; -} - - diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc index 46e0e9a..3a0a855 100644 --- a/tests/cgalcachetest.cc +++ b/tests/cgalcachetest.cc @@ -70,15 +70,6 @@ void cgalTree(Tree &tree) evaluate.execute(); } -AbstractNode *find_root_tag(AbstractNode *n) -{ - foreach(AbstractNode *v, n->children) { - if (v->modinst->tag_root) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - po::variables_map parse_options(int argc, char *argv[]) { po::options_description desc("Allowed options"); diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 56861c6..ac4ebdf 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -70,15 +70,6 @@ void cgalTree(Tree &tree) evaluate.execute(); } -AbstractNode *find_root_tag(AbstractNode *n) -{ - foreach(AbstractNode *v, n->children) { - if (v->modinst->tag_root) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - struct CsgInfo { OffscreenView *glview; diff --git a/tests/cgalstlsanitytest.cc b/tests/cgalstlsanitytest.cc index 52cfb41..2815463 100644 --- a/tests/cgalstlsanitytest.cc +++ b/tests/cgalstlsanitytest.cc @@ -69,15 +69,6 @@ void cgalTree(Tree &tree) evaluate.execute(); } -AbstractNode *find_root_tag(AbstractNode *n) -{ - foreach(AbstractNode *v, n->children) { - if (v->modinst->tag_root) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - int main(int argc, char **argv) { int retval = 0; diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc index b546286..4a15050 100644 --- a/tests/cgaltest.cc +++ b/tests/cgaltest.cc @@ -65,15 +65,6 @@ void cgalTree(Tree &tree) evaluate.execute(); } -AbstractNode *find_root_tag(AbstractNode *n) -{ - foreach(AbstractNode *v, n->children) { - if (v->modinst->tag_root) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - int main(int argc, char **argv) { if (argc != 2) { diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index acc7c31..36e94e7 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -65,15 +65,6 @@ CsgInfo::CsgInfo() { glview = NULL; } -AbstractNode *find_root_tag(AbstractNode *n) -{ - foreach(AbstractNode *v, n->children) { - if (v->modinst->tag_root) return v; - if (AbstractNode *vroot = find_root_tag(v)) return vroot; - } - return NULL; -} - string info_dump(OffscreenView *glview) { assert(glview); @@ -370,7 +361,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.glview->paintGL(); - csgInfo.glview->save(outfilename); + if (outfilename) csgInfo.glview->save(outfilename); delete root_node; delete root_module; diff --git a/tests/guicgalpngtest.cc b/tests/guicgalpngtest.cc new file mode 100644 index 0000000..dd4441c --- /dev/null +++ b/tests/guicgalpngtest.cc @@ -0,0 +1,28 @@ +// Wrapper around openscad gui binary, so it can act like a 'test' + +#include <unistd.h> +#include <stdio.h> +#ifndef BINPATH +#error please define BINPATH=/some/path/openscad when compiling +#endif +#define PREQUOTE(x) #x +#define QUOTE(x) PREQUOTE(x) +int main( int argc, char * argv[] ) +{ + fprintf(stderr,"%s: wrapper for OpenSCAD at %s\n", argv[0], QUOTE( BINPATH ) ); + if (argc<3 || argc>3) { + fprintf(stderr,"%s: bad number of arguments: %i\n", argv[0], argc); + return 1; + } + char *newargs[6]; + char *scadfilename = argv[1]; + char *pngfile = argv[2]; + newargs[0] = const_cast<char *>(QUOTE( BINPATH )); + newargs[1] = scadfilename; + newargs[2] = const_cast<char *>("-o"); + newargs[3] = pngfile; + newargs[4] = const_cast<char *>("--render"); + newargs[5] = NULL; + return execv( QUOTE( BINPATH ), newargs ); +} + diff --git a/tests/imageutils-lodepng.cc b/tests/imageutils-lodepng.cc deleted file mode 100644 index 8460d9e..0000000 --- a/tests/imageutils-lodepng.cc +++ /dev/null @@ -1,24 +0,0 @@ -#include "lodepng.h" -#include <stdio.h> - -bool write_png(const char *filename, unsigned char *pixels, int width, int height) -{ - //encoder.settings.zlibsettings.windowSize = 2048; - //LodePNG_Text_add(&encoder.infoPng.text, "Comment", "Created with LodePNG"); - - size_t dataout_size = -1; - unsigned char *dataout = (unsigned char *)malloc(width*height*4); - LodePNG_encode(&dataout, &dataout_size, pixels, width, height, LCT_RGBA, 8); - //LodePNG_saveFile(dataout, dataout_size, "blah2.png"); - - FILE *f = fopen(filename, "wb"); - if (!f) { - free(dataout); - return false; - } - - fwrite(dataout, 1, dataout_size, f); - fclose(f); - free(dataout); - return true; -} diff --git a/tests/imageutils.cc b/tests/imageutils.cc deleted file mode 100644 index e15ba2b..0000000 --- a/tests/imageutils.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "imageutils.h" -#include <string.h> - -void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, size_t width, size_t height) -{ - size_t rowBytes = pixelsize * width; - for (size_t i = 0 ; i < height ; i++) { - memmove(dst + (height - i - 1) * rowBytes, src + i * rowBytes, rowBytes); - } -} - -#ifdef __APPLE__ -#include "imageutils-macosx.cc" -#else -#include "imageutils-lodepng.cc" -#endif diff --git a/tests/regression/guicgalpngtest/2d-3d-expected.png b/tests/regression/guicgalpngtest/2d-3d-expected.png Binary files differnew file mode 100644 index 0000000..4d202ac --- /dev/null +++ b/tests/regression/guicgalpngtest/2d-3d-expected.png diff --git a/tests/regression/guicgalpngtest/arc-expected.png b/tests/regression/guicgalpngtest/arc-expected.png Binary files differnew file mode 100644 index 0000000..2f555c4 --- /dev/null +++ b/tests/regression/guicgalpngtest/arc-expected.png diff --git a/tests/regression/guicgalpngtest/assign-tests-expected.png b/tests/regression/guicgalpngtest/assign-tests-expected.png Binary files differnew file mode 100644 index 0000000..465a94d --- /dev/null +++ b/tests/regression/guicgalpngtest/assign-tests-expected.png diff --git a/tests/regression/guicgalpngtest/background-modifier-expected.png b/tests/regression/guicgalpngtest/background-modifier-expected.png Binary files differnew file mode 100644 index 0000000..e003a87 --- /dev/null +++ b/tests/regression/guicgalpngtest/background-modifier-expected.png diff --git a/tests/regression/guicgalpngtest/child-tests-expected.png b/tests/regression/guicgalpngtest/child-tests-expected.png Binary files differnew file mode 100644 index 0000000..ed6207c --- /dev/null +++ b/tests/regression/guicgalpngtest/child-tests-expected.png diff --git a/tests/regression/guicgalpngtest/circle-advanced-expected.png b/tests/regression/guicgalpngtest/circle-advanced-expected.png Binary files differnew file mode 100644 index 0000000..3b31c78 --- /dev/null +++ b/tests/regression/guicgalpngtest/circle-advanced-expected.png diff --git a/tests/regression/guicgalpngtest/circle-double-expected.png b/tests/regression/guicgalpngtest/circle-double-expected.png Binary files differnew file mode 100644 index 0000000..17e6b39 --- /dev/null +++ b/tests/regression/guicgalpngtest/circle-double-expected.png diff --git a/tests/regression/guicgalpngtest/circle-expected.png b/tests/regression/guicgalpngtest/circle-expected.png Binary files differnew file mode 100644 index 0000000..aacf12d --- /dev/null +++ b/tests/regression/guicgalpngtest/circle-expected.png diff --git a/tests/regression/guicgalpngtest/circle-small-expected.png b/tests/regression/guicgalpngtest/circle-small-expected.png Binary files differnew file mode 100644 index 0000000..bc2a75b --- /dev/null +++ b/tests/regression/guicgalpngtest/circle-small-expected.png diff --git a/tests/regression/guicgalpngtest/circle-tests-expected.png b/tests/regression/guicgalpngtest/circle-tests-expected.png Binary files differnew file mode 100644 index 0000000..0736af5 --- /dev/null +++ b/tests/regression/guicgalpngtest/circle-tests-expected.png diff --git a/tests/regression/guicgalpngtest/color-tests-expected.png b/tests/regression/guicgalpngtest/color-tests-expected.png Binary files differnew file mode 100644 index 0000000..c7385d2 --- /dev/null +++ b/tests/regression/guicgalpngtest/color-tests-expected.png diff --git a/tests/regression/guicgalpngtest/control-hull-dimension-expected.png b/tests/regression/guicgalpngtest/control-hull-dimension-expected.png Binary files differnew file mode 100644 index 0000000..ceeaf54 --- /dev/null +++ b/tests/regression/guicgalpngtest/control-hull-dimension-expected.png diff --git a/tests/regression/guicgalpngtest/cube-tests-expected.png b/tests/regression/guicgalpngtest/cube-tests-expected.png Binary files differnew file mode 100644 index 0000000..536f220 --- /dev/null +++ b/tests/regression/guicgalpngtest/cube-tests-expected.png diff --git a/tests/regression/guicgalpngtest/cylinder-tests-expected.png b/tests/regression/guicgalpngtest/cylinder-tests-expected.png Binary files differnew file mode 100644 index 0000000..843d70f --- /dev/null +++ b/tests/regression/guicgalpngtest/cylinder-tests-expected.png diff --git a/tests/regression/guicgalpngtest/difference-tests-expected.png b/tests/regression/guicgalpngtest/difference-tests-expected.png Binary files differnew file mode 100644 index 0000000..e672c48 --- /dev/null +++ b/tests/regression/guicgalpngtest/difference-tests-expected.png diff --git a/tests/regression/guicgalpngtest/disable-modifier-expected.png b/tests/regression/guicgalpngtest/disable-modifier-expected.png Binary files differnew file mode 100644 index 0000000..550a71d --- /dev/null +++ b/tests/regression/guicgalpngtest/disable-modifier-expected.png diff --git a/tests/regression/guicgalpngtest/ellipse-arc-expected.png b/tests/regression/guicgalpngtest/ellipse-arc-expected.png Binary files differnew file mode 100644 index 0000000..561619b --- /dev/null +++ b/tests/regression/guicgalpngtest/ellipse-arc-expected.png diff --git a/tests/regression/guicgalpngtest/ellipse-arc-rot-expected.png b/tests/regression/guicgalpngtest/ellipse-arc-rot-expected.png Binary files differnew file mode 100644 index 0000000..7a2ef89 --- /dev/null +++ b/tests/regression/guicgalpngtest/ellipse-arc-rot-expected.png diff --git a/tests/regression/guicgalpngtest/ellipse-expected.png b/tests/regression/guicgalpngtest/ellipse-expected.png Binary files differnew file mode 100644 index 0000000..384cb6b --- /dev/null +++ b/tests/regression/guicgalpngtest/ellipse-expected.png diff --git a/tests/regression/guicgalpngtest/ellipse-reverse-expected.png b/tests/regression/guicgalpngtest/ellipse-reverse-expected.png Binary files differnew file mode 100644 index 0000000..e5a7b10 --- /dev/null +++ b/tests/regression/guicgalpngtest/ellipse-reverse-expected.png diff --git a/tests/regression/guicgalpngtest/ellipse-rot-expected.png b/tests/regression/guicgalpngtest/ellipse-rot-expected.png Binary files differnew file mode 100644 index 0000000..2c68ae2 --- /dev/null +++ b/tests/regression/guicgalpngtest/ellipse-rot-expected.png diff --git a/tests/regression/guicgalpngtest/example001-expected.png b/tests/regression/guicgalpngtest/example001-expected.png Binary files differnew file mode 100644 index 0000000..12b3dea --- /dev/null +++ b/tests/regression/guicgalpngtest/example001-expected.png diff --git a/tests/regression/guicgalpngtest/example002-expected.png b/tests/regression/guicgalpngtest/example002-expected.png Binary files differnew file mode 100644 index 0000000..491477d --- /dev/null +++ b/tests/regression/guicgalpngtest/example002-expected.png diff --git a/tests/regression/guicgalpngtest/example003-expected.png b/tests/regression/guicgalpngtest/example003-expected.png Binary files differnew file mode 100644 index 0000000..429b64b --- /dev/null +++ b/tests/regression/guicgalpngtest/example003-expected.png diff --git a/tests/regression/guicgalpngtest/example004-expected.png b/tests/regression/guicgalpngtest/example004-expected.png Binary files differnew file mode 100644 index 0000000..b0a91fd --- /dev/null +++ b/tests/regression/guicgalpngtest/example004-expected.png diff --git a/tests/regression/guicgalpngtest/example005-expected.png b/tests/regression/guicgalpngtest/example005-expected.png Binary files differnew file mode 100644 index 0000000..8727800 --- /dev/null +++ b/tests/regression/guicgalpngtest/example005-expected.png diff --git a/tests/regression/guicgalpngtest/example006-expected.png b/tests/regression/guicgalpngtest/example006-expected.png Binary files differnew file mode 100644 index 0000000..c2fd5c1 --- /dev/null +++ b/tests/regression/guicgalpngtest/example006-expected.png diff --git a/tests/regression/guicgalpngtest/example007-expected.png b/tests/regression/guicgalpngtest/example007-expected.png Binary files differnew file mode 100644 index 0000000..0ec829f --- /dev/null +++ b/tests/regression/guicgalpngtest/example007-expected.png diff --git a/tests/regression/guicgalpngtest/example008-expected.png b/tests/regression/guicgalpngtest/example008-expected.png Binary files differnew file mode 100644 index 0000000..54cd35d --- /dev/null +++ b/tests/regression/guicgalpngtest/example008-expected.png diff --git a/tests/regression/guicgalpngtest/example009-expected.png b/tests/regression/guicgalpngtest/example009-expected.png Binary files differnew file mode 100644 index 0000000..bbdc192 --- /dev/null +++ b/tests/regression/guicgalpngtest/example009-expected.png diff --git a/tests/regression/guicgalpngtest/example010-expected.png b/tests/regression/guicgalpngtest/example010-expected.png Binary files differnew file mode 100644 index 0000000..68ecc9e --- /dev/null +++ b/tests/regression/guicgalpngtest/example010-expected.png diff --git a/tests/regression/guicgalpngtest/example011-expected.png b/tests/regression/guicgalpngtest/example011-expected.png Binary files differnew file mode 100644 index 0000000..88c8299 --- /dev/null +++ b/tests/regression/guicgalpngtest/example011-expected.png diff --git a/tests/regression/guicgalpngtest/example012-expected.png b/tests/regression/guicgalpngtest/example012-expected.png Binary files differnew file mode 100644 index 0000000..8065e9c --- /dev/null +++ b/tests/regression/guicgalpngtest/example012-expected.png diff --git a/tests/regression/guicgalpngtest/example013-expected.png b/tests/regression/guicgalpngtest/example013-expected.png Binary files differnew file mode 100644 index 0000000..331fa17 --- /dev/null +++ b/tests/regression/guicgalpngtest/example013-expected.png diff --git a/tests/regression/guicgalpngtest/example014-expected.png b/tests/regression/guicgalpngtest/example014-expected.png Binary files differnew file mode 100644 index 0000000..73453a2 --- /dev/null +++ b/tests/regression/guicgalpngtest/example014-expected.png diff --git a/tests/regression/guicgalpngtest/example015-expected.png b/tests/regression/guicgalpngtest/example015-expected.png Binary files differnew file mode 100644 index 0000000..98d0e78 --- /dev/null +++ b/tests/regression/guicgalpngtest/example015-expected.png diff --git a/tests/regression/guicgalpngtest/example016-expected.png b/tests/regression/guicgalpngtest/example016-expected.png Binary files differnew file mode 100644 index 0000000..70bd10d --- /dev/null +++ b/tests/regression/guicgalpngtest/example016-expected.png diff --git a/tests/regression/guicgalpngtest/example017-expected.png b/tests/regression/guicgalpngtest/example017-expected.png Binary files differnew file mode 100644 index 0000000..05f429b --- /dev/null +++ b/tests/regression/guicgalpngtest/example017-expected.png diff --git a/tests/regression/guicgalpngtest/example018-expected.png b/tests/regression/guicgalpngtest/example018-expected.png Binary files differnew file mode 100644 index 0000000..5ea05af --- /dev/null +++ b/tests/regression/guicgalpngtest/example018-expected.png diff --git a/tests/regression/guicgalpngtest/example019-expected.png b/tests/regression/guicgalpngtest/example019-expected.png Binary files differnew file mode 100644 index 0000000..42a356a --- /dev/null +++ b/tests/regression/guicgalpngtest/example019-expected.png diff --git a/tests/regression/guicgalpngtest/example020-expected.png b/tests/regression/guicgalpngtest/example020-expected.png Binary files differnew file mode 100644 index 0000000..e6afb94 --- /dev/null +++ b/tests/regression/guicgalpngtest/example020-expected.png diff --git a/tests/regression/guicgalpngtest/example021-expected.png b/tests/regression/guicgalpngtest/example021-expected.png Binary files differnew file mode 100644 index 0000000..d657b0d --- /dev/null +++ b/tests/regression/guicgalpngtest/example021-expected.png diff --git a/tests/regression/guicgalpngtest/example022-expected.png b/tests/regression/guicgalpngtest/example022-expected.png Binary files differnew file mode 100644 index 0000000..b8b8fbd --- /dev/null +++ b/tests/regression/guicgalpngtest/example022-expected.png diff --git a/tests/regression/guicgalpngtest/example023-expected.png b/tests/regression/guicgalpngtest/example023-expected.png Binary files differnew file mode 100644 index 0000000..c528b90 --- /dev/null +++ b/tests/regression/guicgalpngtest/example023-expected.png diff --git a/tests/regression/guicgalpngtest/for-nested-tests-expected.png b/tests/regression/guicgalpngtest/for-nested-tests-expected.png Binary files differnew file mode 100644 index 0000000..e7178c2 --- /dev/null +++ b/tests/regression/guicgalpngtest/for-nested-tests-expected.png diff --git a/tests/regression/guicgalpngtest/for-tests-expected.png b/tests/regression/guicgalpngtest/for-tests-expected.png Binary files differnew file mode 100644 index 0000000..bf1970a --- /dev/null +++ b/tests/regression/guicgalpngtest/for-tests-expected.png diff --git a/tests/regression/guicgalpngtest/highlight-modifier-expected.png b/tests/regression/guicgalpngtest/highlight-modifier-expected.png Binary files differnew file mode 100644 index 0000000..e220aa1 --- /dev/null +++ b/tests/regression/guicgalpngtest/highlight-modifier-expected.png diff --git a/tests/regression/guicgalpngtest/hull2-tests-expected.png b/tests/regression/guicgalpngtest/hull2-tests-expected.png Binary files differnew file mode 100644 index 0000000..508974f --- /dev/null +++ b/tests/regression/guicgalpngtest/hull2-tests-expected.png diff --git a/tests/regression/guicgalpngtest/hull3-tests-expected.png b/tests/regression/guicgalpngtest/hull3-tests-expected.png Binary files differnew file mode 100644 index 0000000..e34ae89 --- /dev/null +++ b/tests/regression/guicgalpngtest/hull3-tests-expected.png diff --git a/tests/regression/guicgalpngtest/ifelse-tests-expected.png b/tests/regression/guicgalpngtest/ifelse-tests-expected.png Binary files differnew file mode 100644 index 0000000..fcda7bc --- /dev/null +++ b/tests/regression/guicgalpngtest/ifelse-tests-expected.png diff --git a/tests/regression/guicgalpngtest/import_dxf-tests-expected.png b/tests/regression/guicgalpngtest/import_dxf-tests-expected.png Binary files differnew file mode 100644 index 0000000..f885b09 --- /dev/null +++ b/tests/regression/guicgalpngtest/import_dxf-tests-expected.png diff --git a/tests/regression/guicgalpngtest/import_stl-tests-expected.png b/tests/regression/guicgalpngtest/import_stl-tests-expected.png Binary files differnew file mode 100644 index 0000000..de7638a --- /dev/null +++ b/tests/regression/guicgalpngtest/import_stl-tests-expected.png diff --git a/tests/regression/guicgalpngtest/include-tests-expected.png b/tests/regression/guicgalpngtest/include-tests-expected.png Binary files differnew file mode 100644 index 0000000..8598bf8 --- /dev/null +++ b/tests/regression/guicgalpngtest/include-tests-expected.png diff --git a/tests/regression/guicgalpngtest/intersection-tests-expected.png b/tests/regression/guicgalpngtest/intersection-tests-expected.png Binary files differnew file mode 100644 index 0000000..d287e5f --- /dev/null +++ b/tests/regression/guicgalpngtest/intersection-tests-expected.png diff --git a/tests/regression/guicgalpngtest/intersection_for-tests-expected.png b/tests/regression/guicgalpngtest/intersection_for-tests-expected.png Binary files differnew file mode 100644 index 0000000..dc4c56a --- /dev/null +++ b/tests/regression/guicgalpngtest/intersection_for-tests-expected.png diff --git a/tests/regression/guicgalpngtest/linear_extrude-tests-expected.png b/tests/regression/guicgalpngtest/linear_extrude-tests-expected.png Binary files differnew file mode 100644 index 0000000..1486743 --- /dev/null +++ b/tests/regression/guicgalpngtest/linear_extrude-tests-expected.png diff --git a/tests/regression/guicgalpngtest/lwpolyline-closed-expected.png b/tests/regression/guicgalpngtest/lwpolyline-closed-expected.png Binary files differnew file mode 100644 index 0000000..d0376c9 --- /dev/null +++ b/tests/regression/guicgalpngtest/lwpolyline-closed-expected.png diff --git a/tests/regression/guicgalpngtest/lwpolyline-expected.png b/tests/regression/guicgalpngtest/lwpolyline-expected.png Binary files differnew file mode 100644 index 0000000..d0376c9 --- /dev/null +++ b/tests/regression/guicgalpngtest/lwpolyline-expected.png diff --git a/tests/regression/guicgalpngtest/lwpolyline2-expected.png b/tests/regression/guicgalpngtest/lwpolyline2-expected.png Binary files differnew file mode 100644 index 0000000..f01f339 --- /dev/null +++ b/tests/regression/guicgalpngtest/lwpolyline2-expected.png diff --git a/tests/regression/guicgalpngtest/minkowski2-tests-expected.png b/tests/regression/guicgalpngtest/minkowski2-tests-expected.png Binary files differnew file mode 100644 index 0000000..ebdbc74 --- /dev/null +++ b/tests/regression/guicgalpngtest/minkowski2-tests-expected.png diff --git a/tests/regression/guicgalpngtest/minkowski3-tests-expected.png b/tests/regression/guicgalpngtest/minkowski3-tests-expected.png Binary files differnew file mode 100644 index 0000000..6d74961 --- /dev/null +++ b/tests/regression/guicgalpngtest/minkowski3-tests-expected.png diff --git a/tests/regression/guicgalpngtest/multiple-layers-expected.png b/tests/regression/guicgalpngtest/multiple-layers-expected.png Binary files differnew file mode 100644 index 0000000..680729b --- /dev/null +++ b/tests/regression/guicgalpngtest/multiple-layers-expected.png diff --git a/tests/regression/guicgalpngtest/null-polygons-expected.png b/tests/regression/guicgalpngtest/null-polygons-expected.png Binary files differnew file mode 100644 index 0000000..3368f13 --- /dev/null +++ b/tests/regression/guicgalpngtest/null-polygons-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-concave-expected.png b/tests/regression/guicgalpngtest/polygon-concave-expected.png Binary files differnew file mode 100644 index 0000000..e1c68ef --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-concave-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-concave-hole-expected.png b/tests/regression/guicgalpngtest/polygon-concave-hole-expected.png Binary files differnew file mode 100644 index 0000000..eb11557 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-concave-hole-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-concave-simple-expected.png b/tests/regression/guicgalpngtest/polygon-concave-simple-expected.png Binary files differnew file mode 100644 index 0000000..14808ca --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-concave-simple-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-holes-touch-expected.png b/tests/regression/guicgalpngtest/polygon-holes-touch-expected.png Binary files differnew file mode 100644 index 0000000..ef2507c --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-holes-touch-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-intersect-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-many-holes-expected.png b/tests/regression/guicgalpngtest/polygon-many-holes-expected.png Binary files differnew file mode 100644 index 0000000..2527af9 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-many-holes-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-mesh-expected.png b/tests/regression/guicgalpngtest/polygon-mesh-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-mesh-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-overlap-expected.png b/tests/regression/guicgalpngtest/polygon-overlap-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-overlap-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-riser-expected.png b/tests/regression/guicgalpngtest/polygon-riser-expected.png Binary files differnew file mode 100644 index 0000000..ce9ca69 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-riser-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png Binary files differnew file mode 100644 index 0000000..6f4f437 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-self-intersect-expected.png diff --git a/tests/regression/guicgalpngtest/polygon-tests-expected.png b/tests/regression/guicgalpngtest/polygon-tests-expected.png Binary files differnew file mode 100644 index 0000000..5ceabe8 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon-tests-expected.png diff --git a/tests/regression/guicgalpngtest/polygon8-expected.png b/tests/regression/guicgalpngtest/polygon8-expected.png Binary files differnew file mode 100644 index 0000000..8b480c0 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygon8-expected.png diff --git a/tests/regression/guicgalpngtest/polygons-expected.png b/tests/regression/guicgalpngtest/polygons-expected.png Binary files differnew file mode 100644 index 0000000..a30fcb6 --- /dev/null +++ b/tests/regression/guicgalpngtest/polygons-expected.png diff --git a/tests/regression/guicgalpngtest/polyhedron-tests-expected.png b/tests/regression/guicgalpngtest/polyhedron-tests-expected.png Binary files differnew file mode 100644 index 0000000..c80990f --- /dev/null +++ b/tests/regression/guicgalpngtest/polyhedron-tests-expected.png diff --git a/tests/regression/guicgalpngtest/projection-tests-expected.png b/tests/regression/guicgalpngtest/projection-tests-expected.png Binary files differnew file mode 100644 index 0000000..2610507 --- /dev/null +++ b/tests/regression/guicgalpngtest/projection-tests-expected.png diff --git a/tests/regression/guicgalpngtest/render-2d-tests-expected.png b/tests/regression/guicgalpngtest/render-2d-tests-expected.png Binary files differnew file mode 100644 index 0000000..19ea16a --- /dev/null +++ b/tests/regression/guicgalpngtest/render-2d-tests-expected.png diff --git a/tests/regression/guicgalpngtest/render-tests-expected.png b/tests/regression/guicgalpngtest/render-tests-expected.png Binary files differnew file mode 100644 index 0000000..e506972 --- /dev/null +++ b/tests/regression/guicgalpngtest/render-tests-expected.png diff --git a/tests/regression/guicgalpngtest/root-modifier-expected.png b/tests/regression/guicgalpngtest/root-modifier-expected.png Binary files differnew file mode 100644 index 0000000..550a71d --- /dev/null +++ b/tests/regression/guicgalpngtest/root-modifier-expected.png diff --git a/tests/regression/guicgalpngtest/root-modifier-if-expected.png b/tests/regression/guicgalpngtest/root-modifier-if-expected.png Binary files differnew file mode 100644 index 0000000..1fe2aa5 --- /dev/null +++ b/tests/regression/guicgalpngtest/root-modifier-if-expected.png diff --git a/tests/regression/guicgalpngtest/rotate_extrude-tests-expected.png b/tests/regression/guicgalpngtest/rotate_extrude-tests-expected.png Binary files differnew file mode 100644 index 0000000..ee60a72 --- /dev/null +++ b/tests/regression/guicgalpngtest/rotate_extrude-tests-expected.png diff --git a/tests/regression/guicgalpngtest/rotate_extrude_dxf-tests-expected.png b/tests/regression/guicgalpngtest/rotate_extrude_dxf-tests-expected.png Binary files differnew file mode 100644 index 0000000..894362f --- /dev/null +++ b/tests/regression/guicgalpngtest/rotate_extrude_dxf-tests-expected.png diff --git a/tests/regression/guicgalpngtest/scale2D-tests-expected.png b/tests/regression/guicgalpngtest/scale2D-tests-expected.png Binary files differnew file mode 100644 index 0000000..c23b7a0 --- /dev/null +++ b/tests/regression/guicgalpngtest/scale2D-tests-expected.png diff --git a/tests/regression/guicgalpngtest/scale3D-tests-expected.png b/tests/regression/guicgalpngtest/scale3D-tests-expected.png Binary files differnew file mode 100644 index 0000000..cbd8227 --- /dev/null +++ b/tests/regression/guicgalpngtest/scale3D-tests-expected.png diff --git a/tests/regression/guicgalpngtest/sphere-tests-expected.png b/tests/regression/guicgalpngtest/sphere-tests-expected.png Binary files differnew file mode 100644 index 0000000..f2a11f3 --- /dev/null +++ b/tests/regression/guicgalpngtest/sphere-tests-expected.png diff --git a/tests/regression/guicgalpngtest/square-tests-expected.png b/tests/regression/guicgalpngtest/square-tests-expected.png Binary files differnew file mode 100644 index 0000000..8c9bc60 --- /dev/null +++ b/tests/regression/guicgalpngtest/square-tests-expected.png diff --git a/tests/regression/guicgalpngtest/surface-simple-expected.png b/tests/regression/guicgalpngtest/surface-simple-expected.png Binary files differnew file mode 100644 index 0000000..4152c38 --- /dev/null +++ b/tests/regression/guicgalpngtest/surface-simple-expected.png diff --git a/tests/regression/guicgalpngtest/surface-tests-expected.png b/tests/regression/guicgalpngtest/surface-tests-expected.png Binary files differnew file mode 100644 index 0000000..cc29f66 --- /dev/null +++ b/tests/regression/guicgalpngtest/surface-tests-expected.png diff --git a/tests/regression/guicgalpngtest/text-search-test-expected.png b/tests/regression/guicgalpngtest/text-search-test-expected.png Binary files differnew file mode 100644 index 0000000..76e7087 --- /dev/null +++ b/tests/regression/guicgalpngtest/text-search-test-expected.png diff --git a/tests/regression/guicgalpngtest/transform-insert-expected.png b/tests/regression/guicgalpngtest/transform-insert-expected.png Binary files differnew file mode 100644 index 0000000..12867cc --- /dev/null +++ b/tests/regression/guicgalpngtest/transform-insert-expected.png diff --git a/tests/regression/guicgalpngtest/transform-nan-inf-tests-expected.png b/tests/regression/guicgalpngtest/transform-nan-inf-tests-expected.png Binary files differnew file mode 100644 index 0000000..2d9c3ba --- /dev/null +++ b/tests/regression/guicgalpngtest/transform-nan-inf-tests-expected.png diff --git a/tests/regression/guicgalpngtest/transform-tests-expected.png b/tests/regression/guicgalpngtest/transform-tests-expected.png Binary files differnew file mode 100644 index 0000000..77c52e7 --- /dev/null +++ b/tests/regression/guicgalpngtest/transform-tests-expected.png diff --git a/tests/regression/guicgalpngtest/triangle-with-duplicate-vertex-expected.png b/tests/regression/guicgalpngtest/triangle-with-duplicate-vertex-expected.png Binary files differnew file mode 100644 index 0000000..8dd4de0 --- /dev/null +++ b/tests/regression/guicgalpngtest/triangle-with-duplicate-vertex-expected.png diff --git a/tests/regression/guicgalpngtest/union-tests-expected.png b/tests/regression/guicgalpngtest/union-tests-expected.png Binary files differnew file mode 100644 index 0000000..c390f42 --- /dev/null +++ b/tests/regression/guicgalpngtest/union-tests-expected.png diff --git a/tests/regression/guicgalpngtest/use-tests-expected.png b/tests/regression/guicgalpngtest/use-tests-expected.png Binary files differnew file mode 100644 index 0000000..a188f08 --- /dev/null +++ b/tests/regression/guicgalpngtest/use-tests-expected.png diff --git a/tests/system-gl.h b/tests/system-gl.h deleted file mode 100644 index 4a8ccac..0000000 --- a/tests/system-gl.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef SYSTEMGL_H_ -#define SYSTEMGL_H_ - -#include <GL/glew.h> -#include <string> - -std::string glew_dump(bool dumpall=false); -bool report_glerror(const char *task); - -#endif |
