From d2c6ea238ee75772f4324885e64ac26c18f300b3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 9 Apr 2014 10:10:00 -0700 Subject: [PATCH] repairs to starfield headers --- interface/src/starfield/Config.h | 6 ++++-- interface/src/starfield/Controller.h | 1 + interface/src/starfield/data/GpuVertex.cpp | 1 + interface/src/starfield/data/GpuVertex.h | 1 + interface/src/starfield/data/InputVertex.cpp | 3 ++- interface/src/starfield/data/InputVertex.h | 1 + interface/src/starfield/renderer/Renderer.cpp | 1 + interface/src/starfield/renderer/Renderer.h | 1 + interface/src/starfield/renderer/VertexOrder.cpp | 1 + 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/interface/src/starfield/Config.h b/interface/src/starfield/Config.h index 6f44f24093..a44006fb17 100755 --- a/interface/src/starfield/Config.h +++ b/interface/src/starfield/Config.h @@ -9,6 +9,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#ifndef __interface__starfield__Config__ +#define __interface__starfield__Config__ + #include "InterfaceConfig.h" #include "renderer/ProgramObject.h" @@ -55,5 +58,4 @@ namespace starfield { } -#endif - +#endif \ No newline at end of file diff --git a/interface/src/starfield/Controller.h b/interface/src/starfield/Controller.h index 12963fa2e2..b994d48580 100755 --- a/interface/src/starfield/Controller.h +++ b/interface/src/starfield/Controller.h @@ -3,6 +3,7 @@ // interface/src/starfield // // Created by Tobias Schwinger on 3/29/13. +// Modified by Chris Barnard on 10/16/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/data/GpuVertex.cpp b/interface/src/starfield/data/GpuVertex.cpp index 5c1a8ea711..b7fee1f2b1 100755 --- a/interface/src/starfield/data/GpuVertex.cpp +++ b/interface/src/starfield/data/GpuVertex.cpp @@ -3,6 +3,7 @@ // interface/src/starfield/data // // Created by Chris Barnard on 10/17/13. +// Based on code by Tobias Schwinger on 3/29/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/data/GpuVertex.h b/interface/src/starfield/data/GpuVertex.h index 7c435a559f..71cef97061 100755 --- a/interface/src/starfield/data/GpuVertex.h +++ b/interface/src/starfield/data/GpuVertex.h @@ -3,6 +3,7 @@ // interface/src/starfield/data // // Created by Tobias Schwinger on 3/29/13. +// Modified by Chris Barnard on 10/17/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/data/InputVertex.cpp b/interface/src/starfield/data/InputVertex.cpp index ffb7e725fc..5dead34beb 100755 --- a/interface/src/starfield/data/InputVertex.cpp +++ b/interface/src/starfield/data/InputVertex.cpp @@ -2,7 +2,8 @@ // InputVertex.cpp // interface/src/starfield/data // -// Created by Chris Barnard on 10/17. +// Created by Chris Barnard on 10/17/13. +// Based on code by Tobias Schwinger 3/29/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/data/InputVertex.h b/interface/src/starfield/data/InputVertex.h index 01b15c297f..f78f3ea136 100755 --- a/interface/src/starfield/data/InputVertex.h +++ b/interface/src/starfield/data/InputVertex.h @@ -3,6 +3,7 @@ // interface/src/starfield/data // // Created by Tobias Schwinger on 3/29/13. +// Modified by Chris Barnard on 10/17/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/renderer/Renderer.cpp b/interface/src/starfield/renderer/Renderer.cpp index c571cb0977..034a571814 100755 --- a/interface/src/starfield/renderer/Renderer.cpp +++ b/interface/src/starfield/renderer/Renderer.cpp @@ -3,6 +3,7 @@ // interface/src/starfield/renderer // // Created by Chris Barnard on 10/17/13. +// Based on earlier work by Tobias Schwinger 3/22/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/renderer/Renderer.h b/interface/src/starfield/renderer/Renderer.h index 8b75f4e953..2494377180 100755 --- a/interface/src/starfield/renderer/Renderer.h +++ b/interface/src/starfield/renderer/Renderer.h @@ -3,6 +3,7 @@ // interface/src/starfield/renderer // // Created by Tobias Schwinger on 3/22/13. +// Modified by Chris Barnard on 10/17/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. diff --git a/interface/src/starfield/renderer/VertexOrder.cpp b/interface/src/starfield/renderer/VertexOrder.cpp index baffb81f4e..ec36f1eea2 100755 --- a/interface/src/starfield/renderer/VertexOrder.cpp +++ b/interface/src/starfield/renderer/VertexOrder.cpp @@ -3,6 +3,7 @@ // interface/src/starfield/renderer // // Created by Chris Barnard on 10/17/13. +// Based on code by Tobias Schwinger on 3/22/13. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0.