faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

changed VertexArrayObject to SharedVertexArrayObject + Bugfixes

Browse Source
This commit is contained in:
Steffen Fündgens 2014-11-07 14:06:40 +01:00
parent 2d1328b96b
commit 85c7bc8cb5
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
terrain.cc
View File

@ -1,8 +1,8 @@
#include "terrain.hh" #include "terrain.hh"
//Terrain::Terrain(std::string filePath){ Terrain::Terrain(std::string filePath){
// this->filePath = filePath; this->filePath = filePath;
//} }
Terrain::Terrain(){ Terrain::Terrain(){
} }
@ -12,17 +12,18 @@ Terrain::~Terrain() {
void Terrain::load() { void Terrain::load() {
std::ifstream terrain_png(this->filePath + "/heightmap.png"); //TODO: filepath organization std::ifstream terrain_png(this->filePath + "/heightmap.png"); //TODO: filepath organization
unsigned int rowNum, columnNum, heightmapValue; unsigned int rowNum, columnNum, heightmapValue;
terrain_png.seekg(16); //skip part of the header terrain_png.seekg(16); //skip part of the header
terrain_png.read((char *)&this->heightmapWidth, 4); //read width char temp[2];
terrain_png.read((char *)&this->heightmapHeight, 4); //read height terrain_png.read(temp, 4); //read width
this->heightmapWidth = ntohl(this->heightmapWidth); //convert from host to network byte order this->heightmapWidth = (temp[1]<<0) | (temp[0]<<8); //convert from network to host byte order
this->heightmapHeight = ntohl(this->heightmapHeight); terrain_png.read(temp, 4); //read height
this->heightmapHeight = (temp[1]<<0) | (temp[0]<<8); //convert from network to host byte order
heightmap = new float*[this->heightmapHeight]; //initialize the heightmap heightmap = new float*[this->heightmapHeight]; //initialize the heightmap
for(rowNum = 0; rowNum < this->heightmapHeight; rowNum++){ //read in the heightmap for(rowNum = 0; rowNum < this->heightmapHeight; rowNum++){ //read in the heightmap
heightmap[rowNum] = new float[this->heightmapWidth]; heightmap[rowNum] = new float[this->heightmapWidth];
for(columnNum = 0; columnNum < this->heightmapWidth; columnNum++){ for(columnNum = 0; columnNum < this->heightmapWidth; columnNum++){
terrain_png.read((char *)&heightmapValue, 1); terrain_png.read((char *)&heightmapValue, 1);
@ -80,7 +81,6 @@ void Terrain::makeTriangleMesh(){
this->triangleMesh->bind(); this->triangleMesh->bind();
this->triangleMesh->setMode(GL_TRIANGLE_STRIP); this->triangleMesh->setMode(GL_TRIANGLE_STRIP);
this->triangleMesh->attachAllAttributes(arrayBuffer); this->triangleMesh->attachAllAttributes(arrayBuffer);
//TODO unbind?
} }
void Terrain::render() { void Terrain::render() {

4
terrain.hh
View File

@ -4,9 +4,7 @@
#include <string> #include <string>
#include "texture.hh" #include "texture.hh"
#include <fstream> #include <fstream>
//#include <winsock.h> //on Windows #include "extern/bullet/src/BulletDynamics/Dynamics/btRigidBody.h"
#include <netinet/in.h> //on Unix
#include <ACGL/OpenGL/Objects/VertexArrayObject.hh>
class Terrain { class Terrain {
public: public: