Skip to content
Permalink
Browse files

Add copyright headers + few bits from review + fixing sip updates

  • Loading branch information
wonder-sk committed Sep 30, 2017
1 parent ae3b3ec commit 8dc70b479e0e84dcc6462590f87dd031dbb2de7f
Showing with 1,282 additions and 18 deletions.
  1. +6 −2 python/core/3d/qgs3drendererregistry.sip
  2. +3 −2 python/core/3d/qgsabstract3drenderer.sip
  3. +7 −1 scripts/sipify.pl
  4. +0 −1 src/3d/CMakeLists.txt
  5. +15 −0 src/3d/chunks/qgschunkboundsentity_p.cpp
  6. +15 −0 src/3d/chunks/qgschunkboundsentity_p.h
  7. +19 −3 src/3d/chunks/qgschunkedentity_p.cpp
  8. +15 −0 src/3d/chunks/qgschunkedentity_p.h
  9. +15 −0 src/3d/chunks/qgschunklist_p.cpp
  10. +15 −0 src/3d/chunks/qgschunklist_p.h
  11. +0 −6 src/3d/chunks/qgschunkloader_p.cpp
  12. +15 −0 src/3d/chunks/qgschunkloader_p.h
  13. +15 −0 src/3d/chunks/qgschunknode_p.cpp
  14. +15 −0 src/3d/chunks/qgschunknode_p.h
  15. +15 −0 src/3d/chunks/qgschunkqueuejob_p.cpp
  16. +15 −0 src/3d/chunks/qgschunkqueuejob_p.h
  17. +15 −0 src/3d/qgs3dmapscene.cpp
  18. +15 −0 src/3d/qgs3dmapscene.h
  19. +15 −0 src/3d/qgs3dmapsettings.cpp
  20. +15 −0 src/3d/qgs3dmapsettings.h
  21. +15 −0 src/3d/qgs3dutils.cpp
  22. +15 −0 src/3d/qgs3dutils.h
  23. +15 −0 src/3d/qgsaabb.cpp
  24. +15 −0 src/3d/qgsaabb.h
  25. +15 −0 src/3d/qgscameracontroller.cpp
  26. +15 −0 src/3d/qgscameracontroller.h
  27. +15 −0 src/3d/qgsphongmaterialsettings.cpp
  28. +15 −0 src/3d/qgsphongmaterialsettings.h
  29. +15 −0 src/3d/qgstessellatedpolygongeometry.cpp
  30. +15 −0 src/3d/qgstessellatedpolygongeometry.h
  31. +15 −0 src/3d/qgstessellator.cpp
  32. +15 −0 src/3d/qgstessellator.h
  33. +15 −0 src/3d/qgstilingscheme.cpp
  34. +15 −0 src/3d/qgstilingscheme.h
  35. +15 −0 src/3d/qgsvectorlayer3drenderer.cpp
  36. +15 −0 src/3d/qgsvectorlayer3drenderer.h
  37. +15 −0 src/3d/symbols/qgsabstract3dsymbol.cpp
  38. +15 −0 src/3d/symbols/qgsabstract3dsymbol.h
  39. +15 −0 src/3d/symbols/qgsline3dsymbol.cpp
  40. +15 −0 src/3d/symbols/qgsline3dsymbol.h
  41. +15 −0 src/3d/symbols/qgsline3dsymbol_p.cpp
  42. +15 −0 src/3d/symbols/qgsline3dsymbol_p.h
  43. +15 −0 src/3d/symbols/qgspoint3dsymbol.cpp
  44. +15 −0 src/3d/symbols/qgspoint3dsymbol.h
  45. +15 −0 src/3d/symbols/qgspoint3dsymbol_p.cpp
  46. +15 −0 src/3d/symbols/qgspoint3dsymbol_p.h
  47. +15 −0 src/3d/symbols/qgspolygon3dsymbol.cpp
  48. +15 −0 src/3d/symbols/qgspolygon3dsymbol.h
  49. +15 −0 src/3d/symbols/qgspolygon3dsymbol_p.cpp
  50. +15 −0 src/3d/symbols/qgspolygon3dsymbol_p.h
  51. +15 −0 src/3d/terrain/qgsdemterraingenerator.cpp
  52. +15 −0 src/3d/terrain/qgsdemterraingenerator.h
  53. +14 −0 src/3d/terrain/qgsdemterraintilegeometry_p.cpp
  54. +14 −0 src/3d/terrain/qgsdemterraintilegeometry_p.h
  55. +15 −0 src/3d/terrain/qgsdemterraintileloader_p.cpp
  56. +15 −0 src/3d/terrain/qgsdemterraintileloader_p.h
  57. +15 −0 src/3d/terrain/qgsflatterraingenerator.cpp
  58. +15 −0 src/3d/terrain/qgsflatterraingenerator.h
  59. +15 −0 src/3d/terrain/qgsterrainentity_p.cpp
  60. +15 −0 src/3d/terrain/qgsterrainentity_p.h
  61. +15 −0 src/3d/terrain/qgsterraingenerator.cpp
  62. +15 −0 src/3d/terrain/qgsterraingenerator.h
  63. +15 −0 src/3d/terrain/qgsterraintexturegenerator_p.cpp
  64. +15 −0 src/3d/terrain/qgsterraintexturegenerator_p.h
  65. +15 −0 src/3d/terrain/qgsterraintextureimage_p.cpp
  66. +15 −0 src/3d/terrain/qgsterraintextureimage_p.h
  67. +15 −0 src/3d/terrain/qgsterraintileentity_p.h
  68. +15 −0 src/3d/terrain/qgsterraintileloader_p.cpp
  69. +15 −0 src/3d/terrain/qgsterraintileloader_p.h
  70. +15 −0 src/app/3d/qgs3dmapcanvas.cpp
  71. +18 −3 src/app/3d/qgs3dmapcanvas.h
  72. +15 −0 src/app/3d/qgs3dmapcanvasdockwidget.cpp
  73. +15 −0 src/app/3d/qgs3dmapcanvasdockwidget.h
  74. +15 −0 src/app/3d/qgs3dmapconfigwidget.cpp
  75. +15 −0 src/app/3d/qgs3dmapconfigwidget.h
  76. +15 −0 src/app/3d/qgsline3dsymbolwidget.cpp
  77. +15 −0 src/app/3d/qgsline3dsymbolwidget.h
  78. +15 −0 src/app/3d/qgsphongmaterialwidget.cpp
  79. +15 −0 src/app/3d/qgsphongmaterialwidget.h
  80. +15 −0 src/app/3d/qgspoint3dsymbolwidget.cpp
  81. +15 −0 src/app/3d/qgspoint3dsymbolwidget.h
  82. +15 −0 src/app/3d/qgspolygon3dsymbolwidget.cpp
  83. +15 −0 src/app/3d/qgspolygon3dsymbolwidget.h
  84. +15 −0 src/app/3d/qgsvectorlayer3drendererwidget.cpp
  85. +15 −0 src/app/3d/qgsvectorlayer3drendererwidget.h
  86. +15 −0 src/core/3d/qgs3drendererregistry.cpp
  87. +16 −0 src/core/3d/qgs3drendererregistry.h
  88. +15 −0 src/core/3d/qgsabstract3drenderer.cpp
  89. +15 −0 src/core/3d/qgsabstract3drenderer.h
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/3d/qgs3drendererregistry.h *
* src/core/./3d/qgs3drendererregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -10,6 +10,7 @@




class Qgs3DRendererAbstractMetadata
{
%Docstring
@@ -60,6 +61,9 @@ class Qgs3DRendererRegistry
%End
public:
Qgs3DRendererRegistry();
%Docstring
Creates registry of 3D renderers
%End

~Qgs3DRendererRegistry();

@@ -90,7 +94,7 @@ class Qgs3DRendererRegistry
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/3d/qgs3drendererregistry.h *
* src/core/./3d/qgs3drendererregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/3d/qgsabstract3drenderer.h *
* src/core/./3d/qgsabstract3drenderer.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -10,6 +10,7 @@




class QgsAbstract3DRenderer /Abstract/
{
%Docstring
@@ -59,7 +60,7 @@ Resolves references to other objects - second phase of loading - after readXml()
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/3d/qgsabstract3drenderer.h *
* src/core/./3d/qgsabstract3drenderer.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -101,10 +101,16 @@ sub exit_with_error {
}

sub write_header_footer {
# small hack to turn files src/core/3d/X.h to src/core/./3d/X.h
# otherwise "sip up to date" test fails. This is because the test uses %Include entries
# and over there we have to use ./3d/X.h entries because SIP parser does not allow a number
# as the first letter of a relative path
my $headerfile_x = $headerfile;
$headerfile_x =~ s/src\/core\/3d/src\/core\/.\/3d/;
push @OUTPUT, "/************************************************************************\n";
push @OUTPUT, " * This file has been generated automatically from *\n";
push @OUTPUT, " * *\n";
push @OUTPUT, sprintf " * %-*s *\n", 68, $headerfile;
push @OUTPUT, sprintf " * %-*s *\n", 68, $headerfile_x;
push @OUTPUT, " * *\n";
push @OUTPUT, " * Do not edit manually ! Edit header and run scripts/sipify.pl again *\n";
push @OUTPUT, " ************************************************************************/\n";
@@ -16,7 +16,6 @@ SET(QGIS_3D_SRCS
chunks/qgschunkboundsentity_p.cpp
chunks/qgschunkedentity_p.cpp
chunks/qgschunklist_p.cpp
chunks/qgschunkloader_p.cpp
chunks/qgschunknode_p.cpp
chunks/qgschunkqueuejob_p.cpp

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkboundsentity_p.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgschunkboundsentity_p.h"

#include <Qt3DRender/QAttribute>
@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkboundsentity_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKBOUNDSENTITY_P_H
#define QGSCHUNKBOUNDSENTITY_P_H

@@ -1,6 +1,24 @@
/***************************************************************************
qgschunkedentity_p.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgschunkedentity_p.h"

#include <QElapsedTimer>
#include <QVector4D>

#include "qgs3dutils.h"
#include "qgschunkedentity_p.h"
#include "qgschunkboundsentity_p.h"
#include "qgschunklist_p.h"
#include "qgschunkloader_p.h"
@@ -96,7 +114,6 @@ QgsChunkedEntity::~QgsChunkedEntity()
//delete chunkLoaderFactory;
}

#include <QElapsedTimer>

void QgsChunkedEntity::update( const SceneState &state )
{
@@ -216,7 +233,6 @@ void QgsChunkedEntity::update( QgsChunkNode *node, const SceneState &state )
if ( !node->entity() )
{
// this happens initially when root node is not ready yet
qDebug() << "BOOM!";
return;
}

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkedentity_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKEDENTITY_P_H
#define QGSCHUNKEDENTITY_P_H

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunklist_p.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgschunklist_p.h"

#include "qgschunknode_p.h"
@@ -1,3 +1,18 @@
/***************************************************************************
qgschunklist_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKLIST_P_H
#define QGSCHUNKLIST_P_H

This file was deleted.

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkloader_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKLOADER_P_H
#define QGSCHUNKLOADER_P_H

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunknode_p.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgschunknode_p.h"

#include "qgschunkedentity_p.h" // for ChunkLoader destructor
@@ -1,3 +1,18 @@
/***************************************************************************
qgschunknode_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKNODE_P_H
#define QGSCHUNKNODE_P_H

@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkqueuejob_p.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgschunkqueuejob_p.h"

///@cond PRIVATE
@@ -1,3 +1,18 @@
/***************************************************************************
qgschunkqueuejob_p.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGSCHUNKQUEUEJOB_P_H
#define QGSCHUNKQUEUEJOB_P_H

@@ -1,3 +1,18 @@
/***************************************************************************
qgs3dmapscene.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgs3dmapscene.h"

#include <Qt3DRender/QCamera>
@@ -1,3 +1,18 @@
/***************************************************************************
qgs3dmapscene.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#ifndef QGS3DMAPSCENE_H
#define QGS3DMAPSCENE_H

@@ -1,3 +1,18 @@
/***************************************************************************
qgs3dmapsettings.cpp
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* 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. *
* *
***************************************************************************/

#include "qgs3dmapsettings.h"

#include "qgsflatterraingenerator.h"

0 comments on commit 8dc70b4

Please sign in to comment.
You can’t perform that action at this time.