Skip to content
Permalink
Browse files

Core: Vmaps update 4.3 (#1021)

Vmaps update from 4.2 to 4.3
  • Loading branch information...
Nefertumm authored and BarbzYHOOL committed Jan 3, 2019
1 parent 676d5cd commit 59d4e1d3a806a4f2f48f535be366bde1b24d737e
@@ -12,8 +12,8 @@

namespace VMAP
{
const char VMAP_MAGIC[] = "VMAP_4.2";
const char RAW_VMAP_MAGIC[] = "VMAP042"; // used in extracted vmap files with raw data
const char VMAP_MAGIC[] = "VMAP_4.3";
const char RAW_VMAP_MAGIC[] = "VMAP043"; // used in extracted vmap files with raw data
const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree";

// defined in TileAssembler.cpp currently...
@@ -64,7 +64,7 @@ bool preciseVectorData = false;

//static const char * szWorkDirMaps = ".\\Maps";
const char* szWorkDirWmo = "./Buildings";
const char* szRawVMAPMagic = "VMAP042";
const char* szRawVMAPMagic = "VMAP043";

// Local testing functions

@@ -338,8 +338,9 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool precise
for (int i=0; i<nTriangles; ++i)
{
// Skip no collision triangles
if (MOPY[2*i]&WMO_MATERIAL_NO_COLLISION ||
!(MOPY[2*i]&(WMO_MATERIAL_HINT|WMO_MATERIAL_COLLIDE_HIT)) )
bool isRenderFace = (MOPY[2 * i] & WMO_MATERIAL_RENDER) && !(MOPY[2 * i] & WMO_MATERIAL_DETAIL);
bool isCollision = MOPY[2 * i] & WMO_MATERIAL_COLLISION || isRenderFace;
if (!isCollision)
continue;
// Use this triangle
for (int j=0; j<3; ++j)
@@ -15,13 +15,17 @@
#include "loadlib/loadlib.h"

// MOPY flags
#define WMO_MATERIAL_NOCAMCOLLIDE 0x01
#define WMO_MATERIAL_DETAIL 0x02
#define WMO_MATERIAL_NO_COLLISION 0x04
#define WMO_MATERIAL_HINT 0x08
#define WMO_MATERIAL_RENDER 0x10
#define WMO_MATERIAL_COLLIDE_HIT 0x20
#define WMO_MATERIAL_WALL_SURFACE 0x40
enum MopyFlags
{
WHO_MATERIAL_UNK01 = 0x01,
WMO_MATERIAL_NOCAMCOLLIDE = 0x02,
WMO_MATERIAL_DETAIL = 0x04,
WMO_MATERIAL_COLLISION = 0x08,
WMO_MATERIAL_HINT = 0x10,
WMO_MATERIAL_RENDER = 0x20,
WMO_MATERIAL_WALL_SURFACE = 0x40, // Guessed
WMO_MATERIAL_COLLIDE_HIT = 0x80,
};

class WMOInstance;
class WMOManager;

3 comments on commit 59d4e1d

@Nefertumm

This comment has been minimized.

Copy link
Contributor Author

Nefertumm replied Jan 3, 2019

You need to re-extract vmaps again. OR just download from our WIKI

@boom8866

This comment has been minimized.

Copy link

boom8866 replied Jan 4, 2019

What fixes have been made to this change?

@FrancescoBorzi

This comment has been minimized.

Copy link
Member

FrancescoBorzi replied Jan 4, 2019

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