- move mapdata to level

CMakeLists.txt

@@ -138,6 +138,7 @@ set( SOURCES
 	src/blockmapbuilder/blockmapbuilder.cpp
 	src/level/level.cpp
 	src/level/level_udmf.cpp
+	src/level/level_light.cpp
 	src/parse/sc_man.cpp
 	src/wad/wad.cpp
 	src/nodebuilder/nodebuild.cpp
@@ -148,7 +149,6 @@ set( SOURCES
 	src/nodebuilder/nodebuild_classify_nosse2.cpp
 	src/lightmap/lightmap.cpp
 	src/lightmap/lightsurface.cpp
-	src/lightmap/mapdata.cpp
 	src/lightmap/surfaces.cpp
 	src/lightmap/trace.cpp
 	src/lightmap/worker.cpp
@@ -187,7 +187,6 @@ set( HEADERS
 	src/framework/binfile.h
 	src/lightmap/lightmap.h
 	src/lightmap/lightsurface.h
-	src/lightmap/mapdata.h
 	src/lightmap/surfaces.h
 	src/lightmap/trace.h
 	src/lightmap/worker.h

src/level/level_light.cpp

@@ -31,8 +31,8 @@
 //-----------------------------------------------------------------------------
 
 #include "math/mathlib.h"
-#include "mapdata.h"
+#include "level/level.h"
-#include "lightsurface.h"
+#include "lightmap/lightsurface.h"
 #include <algorithm>
 
 #ifdef _MSC_VER

src/lightmap/lightmap.cpp

@@ -33,8 +33,9 @@
 #include "math/mathlib.h"
 #include "surfaces.h"
 #include "trace.h"
-#include "mapdata.h"
+#include "level/level.h"
 #include "lightmap.h"
+#include "lightsurface.h"
 #include "worker.h"
 #include "framework/binfile.h"
 #include "framework/templates.h"

src/lightmap/lightsurface.cpp

@@ -33,7 +33,7 @@
 //-----------------------------------------------------------------------------
 
 #include "math/mathlib.h"
-#include "mapdata.h"
+#include "level/level.h"
 #include "trace.h"
 #include "lightsurface.h"
 

src/lightmap/mapdata.h

@@ -1,33 +0,0 @@
-//-----------------------------------------------------------------------------
-// Note: this is a modified version of dlight. It is not the original software.
-//-----------------------------------------------------------------------------
-//
-// Copyright (c) 2013-2014 Samuel Villarreal
-// svkaiser@gmail.com
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-//    1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-//
-//   2. Altered source versions must be plainly marked as such, and must not be
-//   misrepresented as being the original software.
-//
-//    3. This notice may not be removed or altered from any source
-//    distribution.
-//
-
-#pragma once
-
-#include "framework/zdray.h"
-#include "level/level.h"
-#include "surfaces.h"
-#include "lightsurface.h"

src/lightmap/surfaces.cpp

@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 
 #include "math/mathlib.h"
-#include "mapdata.h"
+#include "level/level.h"
 #include "surfaces.h"
 
 #ifdef _MSC_VER

src/lightmap/trace.cpp

@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 
 #include "math/mathlib.h"
-#include "mapdata.h"
+#include "level/level.h"
 #include "trace.h"
 
 void kexTrace::Init(FLevel &doomMap)