From e71070fe1b484db1cb91920d96d81b4046387f07 Mon Sep 17 00:00:00 2001 From: decimad Date: Fri, 23 Dec 2016 17:06:33 +0100 Subject: [PATCH] final touch-ups (license information, includes) --- common/gal/gal_display_options.cpp | 28 +++++++++++++++++- common/gal/opengl/antialiasing.cpp | 27 +++++++++++++++++ common/gal/opengl/antialiasing.h | 27 +++++++++++++++++ common/gal/opengl/gl_builtin_shaders.cpp | 27 +++++++++++++++++ common/gal/opengl/gl_builtin_shaders.h | 27 +++++++++++++++++ common/gal/opengl/gl_resources.cpp | 27 +++++++++++++++++ common/gal/opengl/gl_resources.h | 27 +++++++++++++++++ common/observable.cpp | 28 ++++++++++++++++++ include/gal/gal_display_options.h | 27 +++++++++++++++++ include/observable.h | 37 ++++++++++++++++++++++-- 10 files changed, 278 insertions(+), 4 deletions(-) diff --git a/common/gal/gal_display_options.cpp b/common/gal/gal_display_options.cpp index 5e897f5252..83a5ee669b 100644 --- a/common/gal/gal_display_options.cpp +++ b/common/gal/gal_display_options.cpp @@ -1,7 +1,33 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #include #include - namespace KIGFX { static const wxString GalGLAntialiasingKeyword( wxT( "OpenGLAntialiasingMode" ) ); diff --git a/common/gal/opengl/antialiasing.cpp b/common/gal/opengl/antialiasing.cpp index 9da14303be..46126b7679 100644 --- a/common/gal/opengl/antialiasing.cpp +++ b/common/gal/opengl/antialiasing.cpp @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #include #include #include diff --git a/common/gal/opengl/antialiasing.h b/common/gal/opengl/antialiasing.h index 2555220932..9d25540ae9 100644 --- a/common/gal/opengl/antialiasing.h +++ b/common/gal/opengl/antialiasing.h @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #ifndef OPENGL_ANTIALIASING_H__ #define OPENGL_ANTIALIASING_H__ diff --git a/common/gal/opengl/gl_builtin_shaders.cpp b/common/gal/opengl/gl_builtin_shaders.cpp index 316632c13c..947684141e 100644 --- a/common/gal/opengl/gl_builtin_shaders.cpp +++ b/common/gal/opengl/gl_builtin_shaders.cpp @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #include "gl_builtin_shaders.h" namespace KIGFX { diff --git a/common/gal/opengl/gl_builtin_shaders.h b/common/gal/opengl/gl_builtin_shaders.h index d2e01055fd..7442e5d61f 100644 --- a/common/gal/opengl/gl_builtin_shaders.h +++ b/common/gal/opengl/gl_builtin_shaders.h @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #ifndef GAL_GL_BUILTIN_SHADERS_H__ #define GAL_GL_BUILTIN_SHADERS_H__ diff --git a/common/gal/opengl/gl_resources.cpp b/common/gal/opengl/gl_resources.cpp index 42a0646abe..e6d186f1b0 100644 --- a/common/gal/opengl/gl_resources.cpp +++ b/common/gal/opengl/gl_resources.cpp @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + // The current font is "Ubuntu Mono" available under Ubuntu Font Licence 1.0 // (see ubuntu-font-licence-1.0.txt for details) #include diff --git a/common/gal/opengl/gl_resources.h b/common/gal/opengl/gl_resources.h index 1f219d3b5c..e25a00ed27 100644 --- a/common/gal/opengl/gl_resources.h +++ b/common/gal/opengl/gl_resources.h @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #ifndef GAL_OPENGL_RESOURCES_H___ #define GAL_OPENGL_RESOURCES_H___ diff --git a/common/observable.cpp b/common/observable.cpp index b4b844fbfc..0f2f42b393 100644 --- a/common/observable.cpp +++ b/common/observable.cpp @@ -1,4 +1,32 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #include "observable.h" +#include namespace UTIL { diff --git a/include/gal/gal_display_options.h b/include/gal/gal_display_options.h index 2e12d80aaf..ae901a6aa9 100644 --- a/include/gal/gal_display_options.h +++ b/include/gal/gal_display_options.h @@ -1,3 +1,30 @@ +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + #ifndef GAL_DISPLAY_OPTIONS_H__ #define GAL_DISPLAY_OPTIONS_H__ diff --git a/include/observable.h b/include/observable.h index c86fb48a26..03ec94d900 100644 --- a/include/observable.h +++ b/include/observable.h @@ -1,9 +1,38 @@ -#pragma once + +/* +* This program source code file is part of KICAD, a free EDA CAD application. +* +* Copyright (C) 2016 Kicad Developers, see change_log.txt for contributors. +* +* Graphics Abstraction Layer (GAL) for OpenGL +* +* Shader class +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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, you may find one here: +* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +* or you may search the http://www.gnu.org website for the version 2 license, +* or you may write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#ifndef COMMON_OBSERVABLE_H__ +#define COMMON_OBSERVABLE_H__ + #include #include #include -#include -#include +#include /* model subscriber implementation using links to represent connections. @@ -206,3 +235,5 @@ namespace UTIL { }; } + +#endif