refactor code a bit

This commit is contained in:
Seth Alves 2016-03-20 17:59:15 -07:00
parent 21c688390c
commit b600000307

View file

@ -231,7 +231,6 @@ function grabLowestJointY() {
} }
function addTerrainBlock() { function addTerrainBlock() {
var baseLocation = getTerrainAlignedLocation(Vec3.sum(MyAvatar.position, {x:8, y:8, z:8})); var baseLocation = getTerrainAlignedLocation(Vec3.sum(MyAvatar.position, {x:8, y:8, z:8}));
if (baseLocation.y > MyAvatar.position.y) { if (baseLocation.y > MyAvatar.position.y) {
@ -247,10 +246,26 @@ function addTerrainBlock() {
baseLocation = getTerrainAlignedLocation(facingPosition); baseLocation = getTerrainAlignedLocation(facingPosition);
alreadyThere = lookupTerrainForLocation(baseLocation); alreadyThere = lookupTerrainForLocation(baseLocation);
if (alreadyThere) { if (alreadyThere) {
return; return null;
} }
} }
var polyVoxID = addTerrainBlockNearLocation(baseLocation);
if (polyVoxID) {
var AvatarPositionInVoxelCoords = Entities.worldCoordsToVoxelCoords(polyVoxID, MyAvatar.position);
// TODO -- how to find the avatar's feet?
var topY = Math.round(AvatarPositionInVoxelCoords.y) - 4;
Entities.setVoxelsInCuboid(polyVoxID, {x:0, y:0, z:0}, {x:16, y:topY, z:16}, 255);
}
}
function addTerrainBlockNearLocation(baseLocation) {
var alreadyThere = lookupTerrainForLocation(baseLocation);
if (alreadyThere) {
return null;
}
var polyVoxID = Entities.addEntity({ var polyVoxID = Entities.addEntity({
type: "PolyVox", type: "PolyVox",
name: "terrain", name: "terrain",
@ -263,12 +278,6 @@ function addTerrainBlock() {
zTextureURL: "http://headache.hungry.com/~seth/hifi/dirt.jpeg" zTextureURL: "http://headache.hungry.com/~seth/hifi/dirt.jpeg"
}); });
var AvatarPositionInVoxelCoords = Entities.worldCoordsToVoxelCoords(polyVoxID, MyAvatar.position);
// TODO -- how to find the avatar's feet?
var topY = Math.round(AvatarPositionInVoxelCoords.y) - 4;
Entities.setVoxelsInCuboid(polyVoxID, {x:0, y:0, z:0}, {x:16, y:topY, z:16}, 255);
////////// //////////
// stitch together the terrain with x/y/z NeighorID properties // stitch together the terrain with x/y/z NeighorID properties
////////// //////////
@ -324,7 +333,7 @@ function addTerrainBlock() {
properties.zPNeighborID = lookupTerrainForLocation(Vec3.sum(baseLocation, {x:0, y:0, z:16})); properties.zPNeighborID = lookupTerrainForLocation(Vec3.sum(baseLocation, {x:0, y:0, z:16}));
Entities.editEntity(polyVoxID, properties); Entities.editEntity(polyVoxID, properties);
return true; return polyVoxID;
} }