Skip to content

Commit

Permalink
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/…
Browse files Browse the repository at this point in the history 
…deng
  • Loading branch information
@skyjake
skyjake committed Apr 13, 2012
2 parents 3ae9bbf + 2d2deed commit 40809a0
Show file tree
Hide file tree
Showing 104 changed files with 7,863 additions and 5,559 deletions.
19 changes: 9 additions & 10 deletions doomsday/engine/api/dd_maptypes.h
View file
Expand Up @@ -3,24 +3,25 @@
#ifndef __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__
#define __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__

#define DMT_VERTEX_POS DDVT_FLOAT
#define DMT_VERTEX_POS DDVT_FLOAT


#define DMT_HEDGE_SIDEDEF DDVT_PTR
#define DMT_HEDGE_SIDEDEF DDVT_PTR

#define DMT_HEDGE_V DDVT_PTR // [Start, End] of the segment.
#define DMT_HEDGE_LINEDEF DDVT_PTR
#define DMT_HEDGE_SEC DDVT_PTR
#define DMT_HEDGE_SECTOR DDVT_PTR
#define DMT_HEDGE_BSPLEAF DDVT_PTR
#define DMT_HEDGE_TWIN DDVT_PTR
#define DMT_HEDGE_ANGLE DDVT_ANGLE
#define DMT_HEDGE_SIDE DDVT_BYTE // 0=front, 1=back
#define DMT_HEDGE_FLAGS DDVT_BYTE
#define DMT_HEDGE_LENGTH DDVT_FLOAT // Accurate length of the segment (v1 -> v2).
#define DMT_HEDGE_OFFSET DDVT_FLOAT
#define DMT_HEDGE_NEXT DDVT_PTR
#define DMT_HEDGE_PREV DDVT_PTR

#define DMT_BSPLEAF_HEDGECOUNT DDVT_UINT
#define DMT_BSPLEAF_HEDGES DDVT_PTR // [hedgeCount] size.
#define DMT_BSPLEAF_HEDGE DDVT_PTR
#define DMT_BSPLEAF_POLYOBJ DDVT_PTR // NULL, if there is no polyobj.
#define DMT_BSPLEAF_SECTOR DDVT_PTR

Expand Down Expand Up @@ -57,14 +58,12 @@
#define DMT_SECTOR_PLANECOUNT DDVT_UINT
#define DMT_SECTOR_REVERB DDVT_FLOAT

#define DMT_SIDEDEF_HEDGECOUNT DDVT_UINT
#define DMT_SIDEDEF_HEDGES DDVT_PTR // [hedgeCount] size, hedges arranged left>right
#define DMT_SIDEDEF_LINE DDVT_PTR
#define DMT_SIDEDEF_SECTOR DDVT_PTR
#define DMT_SIDEDEF_FLAGS DDVT_SHORT

#define DMT_LINEDEF_SEC DDVT_PTR
#define DMT_LINEDEF_AABOX DDVT_FLOAT
#define DMT_LINEDEF_SEC DDVT_PTR
#define DMT_LINEDEF_AABOX DDVT_FLOAT

#define DMT_LINEDEF_V DDVT_PTR
#define DMT_LINEDEF_SIDEDEFS DDVT_PTR
Expand All @@ -74,7 +73,7 @@
#define DMT_LINEDEF_DX DDVT_FLOAT
#define DMT_LINEDEF_DY DDVT_FLOAT

#define DMT_BSPNODE_AABOX DDVT_FLOAT
#define DMT_BSPNODE_AABOX DDVT_FLOAT

#define DMT_BSPNODE_CHILDREN DDVT_PTR

Expand Down
1 change: 1 addition & 0 deletions doomsday/engine/api/dd_share.h
View file
Expand Up @@ -163,6 +163,7 @@ typedef enum {
DDVT_FIXED,
DDVT_ANGLE,
DDVT_FLOAT,
DDVT_DOUBLE,
DDVT_LONG,
DDVT_ULONG,
DDVT_PTR,
Expand Down
8 changes: 8 additions & 0 deletions doomsday/engine/api/dd_world.h
View file
Expand Up @@ -73,6 +73,7 @@ void P_SetInt(int type, uint index, uint prop, int param);
void P_SetFixed(int type, uint index, uint prop, fixed_t param);
void P_SetAngle(int type, uint index, uint prop, angle_t param);
void P_SetFloat(int type, uint index, uint prop, float param);
void P_SetDouble(int type, uint index, uint prop, double param);
void P_SetPtr(int type, uint index, uint prop, void* param);

void P_SetBoolv(int type, uint index, uint prop, boolean* params);
Expand All @@ -81,6 +82,7 @@ void P_SetIntv(int type, uint index, uint prop, int* params);
void P_SetFixedv(int type, uint index, uint prop, fixed_t* params);
void P_SetAnglev(int type, uint index, uint prop, angle_t* params);
void P_SetFloatv(int type, uint index, uint prop, float* params);
void P_SetDoublev(int type, uint index, uint prop, double* params);
void P_SetPtrv(int type, uint index, uint prop, void* params);

/* pointer-based write functions */
Expand All @@ -90,6 +92,7 @@ void P_SetIntp(void* ptr, uint prop, int param);
void P_SetFixedp(void* ptr, uint prop, fixed_t param);
void P_SetAnglep(void* ptr, uint prop, angle_t param);
void P_SetFloatp(void* ptr, uint prop, float param);
void P_SetDoublep(void* ptr, uint prop, double param);
void P_SetPtrp(void* ptr, uint prop, void* param);

void P_SetBoolpv(void* ptr, uint prop, boolean* params);
Expand All @@ -98,6 +101,7 @@ void P_SetIntpv(void* ptr, uint prop, int* params);
void P_SetFixedpv(void* ptr, uint prop, fixed_t* params);
void P_SetAnglepv(void* ptr, uint prop, angle_t* params);
void P_SetFloatpv(void* ptr, uint prop, float* params);
void P_SetDoublepv(void* ptr, uint prop, double* params);
void P_SetPtrpv(void* ptr, uint prop, void* params);

/* index-based read functions */
Expand All @@ -107,6 +111,7 @@ int P_GetInt(int type, uint index, uint prop);
fixed_t P_GetFixed(int type, uint index, uint prop);
angle_t P_GetAngle(int type, uint index, uint prop);
float P_GetFloat(int type, uint index, uint prop);
double P_GetDouble(int type, uint index, uint prop);
void* P_GetPtr(int type, uint index, uint prop);

void P_GetBoolv(int type, uint index, uint prop, boolean* params);
Expand All @@ -115,6 +120,7 @@ void P_GetIntv(int type, uint index, uint prop, int* params);
void P_GetFixedv(int type, uint index, uint prop, fixed_t* params);
void P_GetAnglev(int type, uint index, uint prop, angle_t* params);
void P_GetFloatv(int type, uint index, uint prop, float* params);
void P_GetDoublev(int type, uint index, uint prop, double* params);
void P_GetPtrv(int type, uint index, uint prop, void* params);

/* pointer-based read functions */
Expand All @@ -124,6 +130,7 @@ int P_GetIntp(void* ptr, uint prop);
fixed_t P_GetFixedp(void* ptr, uint prop);
angle_t P_GetAnglep(void* ptr, uint prop);
float P_GetFloatp(void* ptr, uint prop);
double P_GetDoublep(void* ptr, uint prop);
void* P_GetPtrp(void* ptr, uint prop);

void P_GetBoolpv(void* ptr, uint prop, boolean* params);
Expand All @@ -132,6 +139,7 @@ void P_GetIntpv(void* ptr, uint prop, int* params);
void P_GetFixedpv(void* ptr, uint prop, fixed_t* params);
void P_GetAnglepv(void* ptr, uint prop, angle_t* params);
void P_GetFloatpv(void* ptr, uint prop, float* params);
void P_GetDoublepv(void* ptr, uint prop, double* params);
void P_GetPtrpv(void* ptr, uint prop, void* params);

///@}
Expand Down
18 changes: 13 additions & 5 deletions doomsday/engine/api/doomsday.def
View file
@@ -1,6 +1,6 @@
; Doomsday Engine API (Routines exported from Doomsday.exe).
;
; Highest ordinal is currently: --> 829 <--
; Highest ordinal is currently: --> 837 <--
; Other free ordinals: none

NAME "DOOMSDAY"
Expand Down Expand Up @@ -499,6 +499,7 @@ EXPORTS
P_SetFixed @263 NONAME
P_SetAngle @264 NONAME
P_SetFloat @265 NONAME
P_SetDouble @830 NONAME
P_SetPtr @267 NONAME

P_SetBoolv @268 NONAME
Expand All @@ -507,6 +508,7 @@ EXPORTS
P_SetFixedv @271 NONAME
P_SetAnglev @272 NONAME
P_SetFloatv @273 NONAME
P_SetDoublev @831 NONAME
P_SetPtrv @274 NONAME

; pointer-based write functions
Expand All @@ -516,6 +518,7 @@ EXPORTS
P_SetFixedp @278 NONAME
P_SetAnglep @279 NONAME
P_SetFloatp @280 NONAME
P_SetDoublep @832 NONAME
P_SetPtrp @281 NONAME

P_SetBoolpv @282 NONAME
Expand All @@ -524,6 +527,7 @@ EXPORTS
P_SetFixedpv @285 NONAME
P_SetAnglepv @286 NONAME
P_SetFloatpv @287 NONAME
P_SetDoublepv @833 NONAME
P_SetPtrpv @288 NONAME

; index-based read functions
Expand All @@ -533,6 +537,7 @@ EXPORTS
P_GetFixed @292 NONAME
P_GetAngle @293 NONAME
P_GetFloat @294 NONAME
P_GetDouble @834 NONAME
P_GetPtr @295 NONAME

P_GetBoolv @296 NONAME
Expand All @@ -541,6 +546,7 @@ EXPORTS
P_GetFixedv @299 NONAME
P_GetAnglev @300 NONAME
P_GetFloatv @301 NONAME
P_GetDoublev @835 NONAME
P_GetPtrv @302 NONAME

; pointer-based read functions
Expand All @@ -550,6 +556,7 @@ EXPORTS
P_GetFixedp @306 NONAME
P_GetAnglep @307 NONAME
P_GetFloatp @308 NONAME
P_GetDoublep @836 NONAME
P_GetPtrp @309 NONAME

P_GetBoolpv @310 NONAME
Expand All @@ -558,6 +565,7 @@ EXPORTS
P_GetFixedpv @313 NONAME
P_GetAnglepv @314 NONAME
P_GetFloatpv @315 NONAME
P_GetDoublepv @837 NONAME
P_GetPtrpv @316 NONAME

P_CountGameMapObjs @414 NONAME
Expand Down Expand Up @@ -865,10 +873,10 @@ EXPORTS
bamsAtan2 @145 NONAME

; Vectors.
V2_Sum @54 NONAME
V2_Subtract @341 NONAME
V2_Rotate @344 NONAME
V2_Intersection @349 NONAME
V2f_Sum @54 NONAME
V2f_Subtract @341 NONAME
V2f_Rotate @344 NONAME
V2f_Intersection @349 NONAME

; Utilities.
M_PointLineDistance @442 NONAME
Expand Down
8 changes: 4 additions & 4 deletions doomsday/engine/api/doomsday.h
View file
Expand Up @@ -747,10 +747,10 @@ boolean M_IsStringValidFloat(const char* str);
float RNG_RandFloat(void);

// Miscellaneous: Math.
void V2_Sum(float dest[2], const float* srcA, const float* srcB);
void V2_Subtract(float dest[2], const float* srcA, const float* srcB);
void V2_Rotate(float vec[2], float radians);
float V2_Intersection(const float* p1, const float* delta1, const float* p2, const float* delta2, float point[2]);
void V2f_Sum(float dest[2], const float* srcA, const float* srcB);
void V2f_Subtract(float dest[2], const float* srcA, const float* srcB);
void V2f_Rotate(float vec[2], float radians);
float V2f_Intersection(const float* p1, const float* delta1, const float* p2, const float* delta2, float point[2]);

int P_PointOnLineSide(float x, float y, float lX, float lY, float lDX, float lDY);
float M_PointLineDistance(const float* a, const float* b, const float* c);
Expand Down
35 changes: 22 additions & 13 deletions doomsday/engine/engine.pro
View file
Expand Up @@ -123,7 +123,12 @@ DENG_API_HEADERS = \
api/uri.h \
api/writer.h

DENG_HEADERS = \
# Convenience headers.
DENG_HEADERS += \
portable/include/BspBuilder \

# Private headers.
DENG_HEADERS += \
portable/include/abstractfile.h \
portable/include/abstractresource.h \
portable/include/audiodriver.h \
Expand All @@ -132,14 +137,20 @@ DENG_HEADERS = \
portable/include/b_device.h \
portable/include/b_main.h \
portable/include/b_util.h \
portable/include/binarytree.h \
portable/include/bitmapfont.h \
portable/include/blockmap.h \
portable/include/blockmapvisual.h \
portable/include/blockset.h \
portable/include/bspbuilder/bspbuilder.hh \
portable/include/bspbuilder/hedges.hh \
portable/include/bspbuilder/intersection.hh \
portable/include/bspbuilder/superblockmap.hh \
portable/include/map/bspbuilder.h \
portable/include/map/bsp/hedgeinfo.h \
portable/include/map/bsp/hedgeintercept.h \
portable/include/map/bsp/hedgetip.h \
portable/include/map/bsp/hplane.h \
portable/include/map/bsp/linedefinfo.h \
portable/include/map/bsp/partitioncost.h \
portable/include/map/bsp/partitioner.h \
portable/include/map/bsp/superblockmap.h \
portable/include/bspleaf.h \
portable/include/bspnode.h \
portable/include/canvas.h \
Expand Down Expand Up @@ -230,7 +241,6 @@ DENG_HEADERS = \
portable/include/lumpinfo.h \
portable/include/m_args.h \
portable/include/m_bams.h \
portable/include/m_binarytree.h \
portable/include/m_decomp64.h \
portable/include/m_linkedlist.h \
portable/include/m_md5.h \
Expand Down Expand Up @@ -425,15 +435,15 @@ SOURCES += \
portable/src/b_device.c \
portable/src/b_main.c \
portable/src/b_util.c \
portable/src/binarytree.cpp \
portable/src/bitmapfont.c \
portable/src/blockmap.c \
portable/src/blockmapvisual.c \
portable/src/blockset.c \
portable/src/bspbuilder/bspbuilder.cpp \
portable/src/bspbuilder/hedges.cpp \
portable/src/bspbuilder/intersection.cpp \
portable/src/bspbuilder/node.cpp \
portable/src/bspbuilder/superblockmap.cpp \
portable/src/map/bspbuilder.cpp \
portable/src/map/bsp/hplane.cpp \
portable/src/map/bsp/partitioner.cpp \
portable/src/map/bsp/superblockmap.cpp \
portable/src/bspleaf.c \
portable/src/bspnode.c \
portable/src/busytask.cpp \
Expand Down Expand Up @@ -473,7 +483,7 @@ SOURCES += \
portable/src/dgl_draw.c \
portable/src/displaymode.cpp \
portable/src/edit_bias.c \
portable/src/edit_bsp.c \
portable/src/edit_bsp.cpp \
portable/src/edit_map.c \
portable/src/fi_main.c \
portable/src/filedirectory.c \
Expand Down Expand Up @@ -507,7 +517,6 @@ SOURCES += \
portable/src/lumpfile.c \
portable/src/m_args.c \
portable/src/m_bams.c \
portable/src/m_binarytree.c \
portable/src/m_decomp64.c \
portable/src/m_linkedlist.c \
portable/src/m_md5.c \
Expand Down
2 changes: 2 additions & 0 deletions doomsday/engine/portable/include/BspBuilder
View file
@@ -0,0 +1,2 @@
#include "map/bspbuilder.h"
#include "map/bsp/bsptreenode.h"

0 comments on commit 40809a0

Please sign in to comment.