Import Geant4 10.6.0 source tree
This commit is contained in:
+10
@@ -16,6 +16,16 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
23rd October 2019 Ben Morgan (visexternalgl2ps-V10-05-03)
|
||||
- Only link to imported targets for OpenGL
|
||||
- Explicitly link to G4globman/G4global to use/propagate usage requirements.
|
||||
|
||||
17 September 2019 Laurent Garnier (visexternalgl2ps-V10-05-02)
|
||||
- gl2ps.cc: fix Continous warnings
|
||||
|
||||
17 September 2019 Laurent Garnier (visexternalgl2ps-V10-05-01)
|
||||
- gl2ps.cc gl2ps.h: Update library to 1.4.0 applying Geant4 patches
|
||||
|
||||
20 February 2019 Ben Morgan (visexternalgl2ps-V10-05-00)
|
||||
- Add include path for generated G4GlobalConfig.hh
|
||||
|
||||
|
||||
+68
-13
@@ -23,9 +23,10 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
|
||||
/*
|
||||
* GL2PS, an OpenGL to PostScript Printing Library
|
||||
* Copyright (C) 1999-2009 C. Geuzaine
|
||||
* Copyright (C) 1999-2017 C. Geuzaine
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of either:
|
||||
@@ -45,8 +46,8 @@
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library in the file named "COPYING.LGPL";
|
||||
* if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
* Cambridge, MA 02139, USA.
|
||||
* if not, write to the Free Software Foundation, Inc., 51 Franklin
|
||||
* Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* You should have received a copy of the GL2PS License with this
|
||||
* library in the file named "COPYING.GL2PS"; if not, I will be glad
|
||||
@@ -69,9 +70,12 @@
|
||||
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(disable:4115)
|
||||
# pragma warning(disable:4127)
|
||||
# pragma warning(disable:4996)
|
||||
# endif
|
||||
# define NOMINMAX
|
||||
# include <windows.h>
|
||||
# undef NOMINMAX
|
||||
# if defined(GL2PSDLL)
|
||||
# if defined(GL2PSDLL_EXPORTS)
|
||||
# define GL2PSDLL_API __declspec(dllexport)
|
||||
@@ -101,18 +105,22 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_NO_VSNPRINTF)
|
||||
# define GL2PS_HAVE_NO_VSNPRINTF
|
||||
#endif
|
||||
|
||||
/* Version number */
|
||||
|
||||
#define GL2PS_MAJOR_VERSION 1
|
||||
#define GL2PS_MINOR_VERSION 3
|
||||
#define GL2PS_PATCH_VERSION 5
|
||||
#define GL2PS_MINOR_VERSION 4
|
||||
#define GL2PS_PATCH_VERSION 0
|
||||
#define GL2PS_EXTRA_VERSION ""
|
||||
|
||||
#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
|
||||
0.01 * GL2PS_MINOR_VERSION + \
|
||||
0.0001 * GL2PS_PATCH_VERSION)
|
||||
|
||||
#define GL2PS_COPYRIGHT "(C) 1999-2009 C. Geuzaine"
|
||||
#define GL2PS_COPYRIGHT "(C) 1999-2017 C. Geuzaine"
|
||||
|
||||
/* Output file formats (the values and the ordering are important!) */
|
||||
|
||||
@@ -155,6 +163,7 @@
|
||||
#define GL2PS_COMPRESS (1<<10)
|
||||
#define GL2PS_NO_BLENDING (1<<11)
|
||||
#define GL2PS_TIGHT_BOUNDING_BOX (1<<12)
|
||||
#define GL2PS_NO_OPENGL_CONTEXT (1<<13)
|
||||
|
||||
/* Arguments for gl2psEnable/gl2psDisable */
|
||||
|
||||
@@ -163,10 +172,21 @@
|
||||
#define GL2PS_LINE_STIPPLE 3
|
||||
#define GL2PS_BLEND 4
|
||||
|
||||
|
||||
/* Arguments for gl2psLineCap/Join */
|
||||
|
||||
#define GL2PS_LINE_CAP_BUTT 0
|
||||
#define GL2PS_LINE_CAP_ROUND 1
|
||||
#define GL2PS_LINE_CAP_SQUARE 2
|
||||
|
||||
#define GL2PS_LINE_JOIN_MITER 0
|
||||
#define GL2PS_LINE_JOIN_ROUND 1
|
||||
#define GL2PS_LINE_JOIN_BEVEL 2
|
||||
|
||||
/* Text alignment (o=raster position; default mode is BL):
|
||||
+---+ +---+ +---+ +---+ +---+ +---+ +-o-+ o---+ +---o
|
||||
| o | o | | o | | | | | | | | | | | |
|
||||
+---+ +---+ +---+ +-o-+ o---+ +---o +---+ +---+ +---+
|
||||
+---+ +---+ +---+ +---+ +---+ +---+ +-o-+ o---+ +---o
|
||||
| o | o | | o | | | | | | | | | | | |
|
||||
+---+ +---+ +---+ +-o-+ o---+ +---o +---+ +---+ +---+
|
||||
C CL CR B BL BR T TL TR */
|
||||
|
||||
#define GL2PS_TEXT_C 1
|
||||
@@ -180,15 +200,34 @@
|
||||
#define GL2PS_TEXT_TR 9
|
||||
|
||||
typedef GLfloat GL2PSrgba[4];
|
||||
typedef GLfloat GL2PSxyz[3];
|
||||
|
||||
typedef struct {
|
||||
GL2PSxyz xyz;
|
||||
GL2PSrgba rgba;
|
||||
} GL2PSvertex;
|
||||
|
||||
/* Primitive types */
|
||||
#define GL2PS_NO_TYPE -1
|
||||
#define GL2PS_TEXT 1
|
||||
#define GL2PS_POINT 2
|
||||
#define GL2PS_LINE 3
|
||||
#define GL2PS_QUADRANGLE 4
|
||||
#define GL2PS_TRIANGLE 5
|
||||
#define GL2PS_PIXMAP 6
|
||||
#define GL2PS_IMAGEMAP 7
|
||||
#define GL2PS_IMAGEMAP_WRITTEN 8
|
||||
#define GL2PS_IMAGEMAP_VISIBLE 9
|
||||
#define GL2PS_SPECIAL 10
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer,
|
||||
GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer,
|
||||
GLint viewport[4], GLint format, GLint sort,
|
||||
GLint options, GLint colormode,
|
||||
GLint colorsize, GL2PSrgba *colormap,
|
||||
GLint colorsize, GL2PSrgba *colormap,
|
||||
GLint nr, GLint ng, GLint nb, GLint buffersize,
|
||||
FILE *stream, const char *filename);
|
||||
GL2PSDLL_API GLint gl2psEndPage(void);
|
||||
@@ -196,26 +235,42 @@ GL2PSDLL_API GLint gl2psSetOptions(GLint options);
|
||||
GL2PSDLL_API GLint gl2psGetOptions(GLint *options);
|
||||
GL2PSDLL_API GLint gl2psBeginViewport(GLint viewport[4]);
|
||||
GL2PSDLL_API GLint gl2psEndViewport(void);
|
||||
GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname,
|
||||
GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname,
|
||||
GLshort fontsize);
|
||||
GL2PSDLL_API GLint gl2psTextOpt(const char *str, const char *fontname,
|
||||
GL2PSDLL_API GLint gl2psTextOpt(const char *str, const char *fontname,
|
||||
GLshort fontsize, GLint align, GLfloat angle);
|
||||
GL2PSDLL_API GLint gl2psTextOptColor(const char *str, const char *fontname,
|
||||
GLshort fontsize, GLint align, GLfloat angle,
|
||||
GL2PSrgba color);
|
||||
GL2PSDLL_API GLint gl2psSpecial(GLint format, const char *str);
|
||||
GL2PSDLL_API GLint gl2psSpecialColor(GLint format, const char *str, GL2PSrgba rgba);
|
||||
GL2PSDLL_API GLint gl2psDrawPixels(GLsizei width, GLsizei height,
|
||||
GLint xorig, GLint yorig,
|
||||
GLenum format, GLenum type, const void *pixels);
|
||||
GL2PSDLL_API GLint gl2psEnable(GLint mode);
|
||||
GL2PSDLL_API GLint gl2psDisable(GLint mode);
|
||||
GL2PSDLL_API GLint gl2psPointSize(GLfloat value);
|
||||
GL2PSDLL_API GLint gl2psLineCap(GLint value);
|
||||
GL2PSDLL_API GLint gl2psLineJoin(GLint value);
|
||||
GL2PSDLL_API GLint gl2psLineWidth(GLfloat value);
|
||||
GL2PSDLL_API GLint gl2psBlendFunc(GLenum sfactor, GLenum dfactor);
|
||||
|
||||
/* referenced in the documentation, but not fully documented */
|
||||
GL2PSDLL_API GLint gl2psForceRasterPos(GL2PSvertex *vert);
|
||||
GL2PSDLL_API void gl2psAddPolyPrimitive(GLshort type, GLshort numverts,
|
||||
GL2PSvertex *verts, GLint offset,
|
||||
GLfloat ofactor, GLfloat ounits,
|
||||
GLushort pattern, GLint factor,
|
||||
GLfloat width, GLint linecap,
|
||||
GLint linejoin, char boundary);
|
||||
|
||||
/* undocumented */
|
||||
GL2PSDLL_API GLint gl2psDrawImageMap(GLsizei width, GLsizei height,
|
||||
const GLfloat position[3],
|
||||
const unsigned char *imagemap);
|
||||
GL2PSDLL_API const char *gl2psGetFileExtension(GLint format);
|
||||
GL2PSDLL_API const char *gl2psGetFormatDescription(GLint format);
|
||||
GL2PSDLL_API GLint gl2psGetFileFormat();
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
||||
+10
-4
@@ -25,9 +25,6 @@ include_directories(${PROJECT_SOURCE_DIR}/source/global/management/include)
|
||||
# is merged into the main global one!
|
||||
include_directories(${PROJECT_BINARY_DIR}/source/global/include)
|
||||
|
||||
# Must have GL headers available
|
||||
include_directories(${OPENGL_INCLUDE_DIR})
|
||||
|
||||
# We need to add definitions depending on what GL drivers are built
|
||||
#
|
||||
if(GEANT4_USE_OPENGL)
|
||||
@@ -38,6 +35,11 @@ if(GEANT4_USE_INVENTOR)
|
||||
add_definitions(-DG4VIS_BUILD_OI_DRIVER)
|
||||
endif()
|
||||
|
||||
set(G4GL2PS_GL_LIBRARIES OpenGL::GL OpenGL::GLU)
|
||||
if(APPLE AND GEANT4_USE_OPENGL_X11)
|
||||
list(APPEND G4GL2PS_GL_LIBRARIES XQuartzGL::GL XQuartzGL::GLU)
|
||||
endif()
|
||||
|
||||
# Define the Geant4 Module.
|
||||
#
|
||||
include(Geant4MacroDefineModule)
|
||||
@@ -50,10 +52,14 @@ GEANT4_DEFINE_MODULE(NAME G4gl2ps
|
||||
G4OpenGL2PSAction.cc
|
||||
gl2ps.cc
|
||||
GRANULAR_DEPENDENCIES
|
||||
G4globman
|
||||
GLOBAL_DEPENDENCIES
|
||||
G4global
|
||||
LINK_LIBRARIES
|
||||
${ZLIB_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${G4GL2PS_GL_LIBRARIES}
|
||||
SOURCES_EXCLUDE_FORMAT
|
||||
gl2ps.h
|
||||
)
|
||||
|
||||
# List any source specific properties here
|
||||
|
||||
+1108
-640
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user