Merge branch 'master' of github:jsmaniac/2011-m2s3-city-builder
Conflicts: rules/chose.cpp
This commit is contained in:
commit
8044fbc971
6
main.cpp
6
main.cpp
|
@ -1,13 +1,17 @@
|
|||
#include "all_includes.hh"
|
||||
|
||||
int main() {
|
||||
int main(int argc, char* argv[]) {
|
||||
// Générer une tile de base
|
||||
if(argc > 1)
|
||||
Chose::initialSeed = (unsigned int) atoi(argv[1]);
|
||||
|
||||
std::cout << "Initial seed = " << Chose::initialSeed << std::endl;
|
||||
float size = 200 * 100;
|
||||
Vertex ne(size, size, 0);
|
||||
Vertex se(size, 0, 0);
|
||||
Vertex sw(0, 0, 0);
|
||||
Vertex nw(0, size, 0);
|
||||
|
||||
Chose* c = new QuartierQuad(Quad(ne, se, sw, nw));
|
||||
c->triangulation();
|
||||
c->updateAABB();
|
||||
|
|
Loading…
Reference in New Issue
Block a user