mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 19:59:28 +02:00
header re-arranging and changing
This commit is contained in:
parent
211204e878
commit
ca0f6a4d10
3 changed files with 17 additions and 9 deletions
|
@ -10,14 +10,16 @@
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <OctalCode.h>
|
#include <iostream>
|
||||||
|
|
||||||
|
#include <EnvironmentData.h>
|
||||||
#include <NodeList.h>
|
#include <NodeList.h>
|
||||||
#include <NodeTypes.h>
|
#include <NodeTypes.h>
|
||||||
#include <EnvironmentData.h>
|
#include <OctalCode.h>
|
||||||
#include <VoxelTree.h>
|
|
||||||
#include <SharedUtil.h>
|
|
||||||
#include <PacketHeaders.h>
|
#include <PacketHeaders.h>
|
||||||
#include <SceneUtils.h>
|
#include <SceneUtils.h>
|
||||||
|
#include <SharedUtil.h>
|
||||||
|
#include <VoxelTree.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "Syssocket.h"
|
#include "Syssocket.h"
|
||||||
|
|
|
@ -3,12 +3,15 @@
|
||||||
// hifi
|
// hifi
|
||||||
//
|
//
|
||||||
// Created by Brad Hefta-Gaub on 5/7/2013.
|
// Created by Brad Hefta-Gaub on 5/7/2013.
|
||||||
//
|
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "SceneUtils.h"
|
#include <algorithm>
|
||||||
|
|
||||||
#include <glm/gtc/noise.hpp>
|
#include <glm/gtc/noise.hpp>
|
||||||
|
|
||||||
|
#include "SceneUtils.h"
|
||||||
|
|
||||||
void addCornersAndAxisLines(VoxelTree* tree) {
|
void addCornersAndAxisLines(VoxelTree* tree) {
|
||||||
// We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...
|
// We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...
|
||||||
float voxelSize = 0.5f / TREE_SCALE;
|
float voxelSize = 0.5f / TREE_SCALE;
|
||||||
|
|
|
@ -3,12 +3,15 @@
|
||||||
// hifi
|
// hifi
|
||||||
//
|
//
|
||||||
// Created by Tomáš Horáček on 6/25/13.
|
// Created by Tomáš Horáček on 6/25/13.
|
||||||
//
|
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "SquarePixelMap.h"
|
#include <algorithm>
|
||||||
#include <string.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "SquarePixelMap.h"
|
||||||
|
|
||||||
#define CHILD_COORD_X_IS_1 0x1
|
#define CHILD_COORD_X_IS_1 0x1
|
||||||
#define CHILD_COORD_Y_IS_1 0x2
|
#define CHILD_COORD_Y_IS_1 0x2
|
||||||
|
|
Loading…
Reference in a new issue