Skip to content

Commit

Permalink
BSP Builder|Cleanup: Renamed bspbuilder/hedges.hh as bspbuilder/bsphe…
Browse files Browse the repository at this point in the history
…dgeinfo.h
  • Loading branch information
danij-deng committed Apr 2, 2012
1 parent d122729 commit 91d2982
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion doomsday/engine/engine.pro
Expand Up @@ -133,7 +133,7 @@ DENG_HEADERS = \
portable/include/blockmapvisual.h \
portable/include/blockset.h \
portable/include/bspbuilder/bspbuilder.hh \
portable/include/bspbuilder/hedges.hh \
portable/include/bspbuilder/bsphedgeinfo.h \
portable/include/bspbuilder/hedgeintercept.h \
portable/include/bspbuilder/intersection.hh \
portable/include/bspbuilder/linedefinfo.h \
Expand Down
10 changes: 9 additions & 1 deletion doomsday/engine/portable/include/bspbuilder/bspbuilder.hh
Expand Up @@ -31,7 +31,7 @@
#include "dd_types.h"
#include "p_mapdata.h"

#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"
#include "bspbuilder/hedgeintercept.h"
#include "bspbuilder/intersection.hh"
#include "bspbuilder/superblockmap.hh"
Expand All @@ -46,6 +46,14 @@ namespace de {
/// Default cost factor attributed to splitting an existing half-edge.
#define BSPBUILDER_PARTITION_COST_HEDGESPLIT 7

#define IFFY_LEN 4.0

/// Smallest distance between two points before being considered equal.
#define DIST_EPSILON (1.0 / 128.0)

/// Smallest difference between two angles before being considered equal (in degrees).
#define ANG_EPSILON (1.0 / 1024.0)

/**
* @algorithm High-level description (courtesy of Raphael Quinet)
* 1 - Create one Seg for each SideDef: pick each LineDef in turn. If it
Expand Down
@@ -1,6 +1,6 @@
/**
* @file hedgeinfo.h
* BSP Builder Half-edge info. @ingroup bsp
* @file bsphedgeinfo.h
* BSP Builder half-edge info. @ingroup bsp
*
* Based on glBSP 2.24 (in turn, based on BSP 2.3), which is hosted on
* SourceForge: http://sourceforge.net/projects/glbsp/
Expand All @@ -25,8 +25,8 @@
* 02110-1301 USA</small>
*/

#ifndef LIBDENG_BSPBUILDER_HEDGEINFO_H
#define LIBDENG_BSPBUILDER_HEDGEINFO_H
#ifndef LIBDENG_BSPBUILDER_HEDGEINFO
#define LIBDENG_BSPBUILDER_HEDGEINFO

#include "dd_types.h"
#include "p_mapdata.h"
Expand All @@ -35,17 +35,9 @@
extern "C" {
#endif

#define IFFY_LEN 4.0

// Smallest distance between two points before being considered equal.
#define DIST_EPSILON (1.0 / 128.0)

// Smallest degrees between two angles before being considered equal.
#define ANG_EPSILON (1.0 / 1024.0)

/**
* BspHEdgeInfo. Plain old data structure storing additional information about
* a half-edge produced by BspBuilder.
* Plain old data (POD) structure storing additional information about a
* half-edge produced by BspBuilder.
*/
typedef struct bsphedgeinfo_s {
// Precomputed data for faster calculations.
Expand Down Expand Up @@ -78,4 +70,4 @@ typedef struct bsphedgeinfo_s {
} // extern "C"
#endif

#endif /// LIBDENG_BSPBUILDER_HEDGEINFO_H
#endif /// LIBDENG_BSPBUILDER_HEDGEINFO
Expand Up @@ -30,7 +30,7 @@

#include "p_mapdata.h"

#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"

#include <list>

Expand Down
Expand Up @@ -31,7 +31,7 @@
#define LIBDENG_BSPBUILDER_SUPERBLOCKMAP

#include "dd_types.h"
#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"

#include <list>
#include <assert.h>
Expand Down
2 changes: 1 addition & 1 deletion doomsday/engine/portable/src/bspbuilder/hedges.cpp
Expand Up @@ -35,7 +35,7 @@
#include "m_misc.h"
#include "hedge.h"

#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"
#include "bspbuilder/bspbuilder.hh"

using namespace de;
Expand Down
2 changes: 1 addition & 1 deletion doomsday/engine/portable/src/bspbuilder/superblockmap.cpp
Expand Up @@ -28,7 +28,7 @@
#include "p_mapdata.h"

#include "kdtree.h"
#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"
#include "bspbuilder/superblockmap.hh"

using namespace de;
Expand Down
2 changes: 1 addition & 1 deletion doomsday/engine/portable/src/hedge.c
Expand Up @@ -25,7 +25,7 @@
#include "de_refresh.h"
#include "de_play.h"

#include "bspbuilder/hedges.hh"
#include "bspbuilder/bsphedgeinfo.h"

HEdge* HEdge_New(void)
{
Expand Down

0 comments on commit 91d2982

Please sign in to comment.