From ef6116465d516de9d8f0dfa98a81bcdc98e96b1c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 19 Aug 2015 19:15:36 -0700 Subject: [PATCH] make edged-cubic be the default polyvox surface style --- examples/edit.js | 2 +- libraries/entities/src/PolyVoxEntityItem.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/edit.js b/examples/edit.js index deda035d5e..60666a54a5 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -452,7 +452,7 @@ var toolBar = (function () { type: "PolyVox", dimensions: { x: 10, y: 10, z: 10 }, voxelVolumeSize: {x:16, y:16, z:16}, - voxelSurfaceStyle: 1 + voxelSurfaceStyle: 2 }); return true; diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp index 30dded3714..bb9a63cf4c 100644 --- a/libraries/entities/src/PolyVoxEntityItem.cpp +++ b/libraries/entities/src/PolyVoxEntityItem.cpp @@ -25,7 +25,7 @@ const glm::vec3 PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE = glm::vec3(32, 32, const float PolyVoxEntityItem::MAX_VOXEL_DIMENSION = 128.0f; const QByteArray PolyVoxEntityItem::DEFAULT_VOXEL_DATA(PolyVoxEntityItem::makeEmptyVoxelData()); const PolyVoxEntityItem::PolyVoxSurfaceStyle PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE = - PolyVoxEntityItem::SURFACE_MARCHING_CUBES; + PolyVoxEntityItem::SURFACE_EDGED_CUBIC; const QString PolyVoxEntityItem::DEFAULT_X_TEXTURE_URL = QString(""); const QString PolyVoxEntityItem::DEFAULT_Y_TEXTURE_URL = QString(""); const QString PolyVoxEntityItem::DEFAULT_Z_TEXTURE_URL = QString("");