suzanne.soy/2011-m2s3-city-builder
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Ajout des jardins, déplacement de quelques constantes dans CouleursDimensions.{hh,cpp} .

Browse Source
This commit is contained in:
Georges Dupéron 2012-01-19 20:32:23 +01:00
parent f8cd7a6169
commit e7a3fb6ea5
11 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry/quad.cpp
View File

@ -208,7 +208,7 @@ Vertex Quad::randomPoint(int seed, int n) const {
Triangle sw(c[SE], c[SW], c[NW]);
float surfacene = ne.surface();
float surfacesw = sw.surface();
if (proba(seed, n, surfacene, surfacene + surfacesw)) {
if (proba(seed, n, surfacene / (surfacene + surfacesw))) {
return ne.randomPoint(seed, hash2(n, 42));
} else {
return sw.randomPoint(seed, hash2(n, 42));

4
hash.cpp
View File

@ -29,8 +29,8 @@ float floatInRange(int seed, int n, float a, float b) {
return (float)(hash2(seed, n) & 0xffffff) / (float)(0x1000000) * (b-a) + a;
}
bool proba(int seed, int n, float a, float b) {
return floatInRange(seed, n, 0, b) < a;
bool proba(int seed, int n, float proba) {
return floatInRange(seed, n, 0, 1) < proba;
}
unsigned int float2uint(float f) {

2
hash.hh
View File

@ -7,7 +7,7 @@ int random_seed();
unsigned int hash2(unsigned int a, unsigned int b);
float floatInRange(int seed, int n, float a, float b); // Renvoie le n-ième nombre aléatoire dérivé de seed entre a et b (a inclus, b non inclus).
bool proba(int seed, int n, float a, float b); // Renvoie vrai avec `a` fois sur `b`.
bool proba(int seed, int n, float proba); // Renvoie vrai avec une probabilité de `proba`.
typedef union FloatUIntUnion {
float f;
unsigned int ui;

19
rules/architecture/batiment.cpp
View File

@ -17,16 +17,23 @@ bool BatimentQuad_::split() {
Vertex n = Segment(q[NW], q[NE]).randomPos(seed, 0, 1.f/3.f, 1.f/2.f);
Vertex s = Segment(q[SE], q[SW]).randomPos(seed, 1, 1.f/3.f, 1.f/2.f);
addChild(new BatimentQuad_(Quad(q[SE], s, n, q[NE]), true, QuadBool(qb[E],qb[S],false,qb[N])));
addChild(new BatimentQuad_(Quad(q[NW], n, s, q[SW]), true, QuadBool(qb[W],qb[N],false,qb[S])));
if (qb[E] && proba(seed, 2, 0.3f)) {
addChild(new TerrainQuad(Quad(q[SE], s, n, q[NE])));
addChild(new BatimentQuad_(Quad(q[NW], n, s, q[SW]), true, QuadBool(qb[W],qb[N],true,qb[S])));
} else if (qb[W] && proba(seed, 2, 0.5f)) {
addChild(new BatimentQuad_(Quad(q[SE], s, n, q[NE]), true, QuadBool(qb[E],qb[S],true,qb[N])));
addChild(new TerrainQuad(Quad(q[NW], n, s, q[SW])));
} else {
addChild(new BatimentQuad_(Quad(q[SE], s, n, q[NE]), true, QuadBool(qb[E],qb[S],false,qb[N])));
addChild(new BatimentQuad_(Quad(q[NW], n, s, q[SW]), true, QuadBool(qb[W],qb[N],false,qb[S])));
}
} else {
float randEtages = floatInRange(seed, 2, 0.f, 1.f);
float randEtages = floatInRange(seed, 0, 0.f, 1.f);
int nbEtages = 1 + (int)(randEtages * randEtages * (Dimensions::maxEtages - 1));
Quad q = c;
//ch = ch.insetNESW(30);
Quad q = c; // c.insetNESW(30)
Quad qh;
for (int i = 0; i < nbEtages; i++) {
qh = q.offsetNormal(floatInRange(seed, 3+i, Dimensions::hauteurEtage*0.9f, Dimensions::hauteurEtage*1.1f));
qh = q.offsetNormal(floatInRange(seed, 1+i, Dimensions::hauteurEtage*0.9f, Dimensions::hauteurEtage*1.1f));
addChild(new EtageQuad(q,qh));
q = qh;
}

3
rules/architecture/couleursDimensions.cpp
View File

@ -1,3 +1,6 @@
#include "all_includes.hh"
const unsigned int Couleurs::fog = mix(cielHaut, cielBas, 0.5);
const float Dimensions::frontFrustum = 1;
const float Dimensions::backFrustum = 4000 * 100; // 4km

9
rules/architecture/couleursDimensions.hh
View File

@ -43,6 +43,15 @@ public:
static const unsigned int hauteurToit = 200;
static const unsigned int hauteurTrottoir = 20;
static const unsigned int hauteurMaxBatiment = hauteurTrottoir + hauteurEtage + hauteurToit;
// Qualité
// TODO : devrait être 5.f et 6.f
static const unsigned int splitFactor = 2.f;
static const unsigned int mergeFactor = 3.f;
static const unsigned int windowWidth = 1024;
static const unsigned int windowHeight = 768;
static const float frontFrustum;
static const float backFrustum;
};
#endif

10
rules/architecture/quartier.cpp
View File

@ -20,9 +20,9 @@ bool QuartierQuad::split() {
concave();
else if (nearConcave)
angleAngle();
else if (big && anglesOk && proba(seed, -2, 1, 4))
else if (big && anglesOk && proba(seed, -2, 0.25f))
longueRue();
else if (!small && !anglesOk && proba(seed, -3, 1, 2))
else if (!small && !anglesOk && proba(seed, -3, 0.5f))
angleAngle();
else if (!small && !anglesOk)
angleCote();
@ -131,7 +131,7 @@ void QuartierQuad::batiments() {
bool anglesAcceptable = c.minAngle() > Angle::d2r(90-60) && c.maxAngle() < Angle::d2r(90+60);
if (anglesAcceptable && proba(seed, 0, 19, 20)) {
if (anglesAcceptable && proba(seed, 0, 0.95f)) {
addChild(new BatimentQuad_(qbatiments));
} else {
addChild(new TerrainQuad(qbatiments));
@ -155,7 +155,7 @@ bool QuartierTri::split() {
bool angleObtus = maxAngle > Angle::d2r(120);
bool angleAigu = minAngle < Angle::d2r(30);
bool anglesAcceptable = !angleAigu && !angleObtus;
if (!big && proba(seed, -1, 1, 20)) {
if (!big && proba(seed, -1, 0.05f)) {
batiments();
} else if (big && anglesAcceptable) {
switch (hash2(seed, -2) % 3) {
@ -228,7 +228,7 @@ void QuartierTri::batiments() {
bool big = tbatiments.maxLength() >= 5000;
bool anglesAcceptable = tbatiments.minAngle() > Angle::d2r(30) && tbatiments.maxAngle() < Angle::d2r(120);
if (!big && proba(seed, 0, 1, 20)) {
if (!big && proba(seed, 0, 0.05f)) {
addChild(new TerrainTri(tbatiments));
} else if (small && anglesAcceptable) {
addChild(new BatimentTri_(tbatiments));

2
rules/batiment/batimentquad.cpp
View File

@ -10,7 +10,7 @@ void BatimentQuad::getBoundingBoxPoints() {
}
bool BatimentQuad::split() {
if(proba(seed, 0, 1, 10)) {
if(proba(seed, 0, 0.1f)) {
addChild(new BatimentQuadMaisonPont(c,3));
} else {
addChild(new BatimentQuadJardin(c));

11
rules/chose.cpp
View File

@ -141,9 +141,8 @@ void Chose::addBBPoints(const Quad q, float height) {
}
void Chose::updateAABB() {
// TODO : Debug : devrait être 5.f, 6.f
float splitFactor = 2.f * LODFactor();
float mergeFactor = 3.f * LODFactor();
float splitFactor = Dimensions::splitFactor * LODFactor();
float mergeFactor = Dimensions::mergeFactor * LODFactor();
float nonFacingFactor = 2.f/3.f;
lod.firstBBPoint = true;
getBoundingBoxPoints();
@ -155,8 +154,8 @@ void Chose::updateAABB() {
areaFacing[i] = size[(i+1)%3]*size[(i+1)%3];
for (int i = 0; i < 3; i++) {
float pseudoLength = std::max(1.f, std::sqrt(areaFacing[i] + areaFacing[(i+1)%3] * nonFacingFactor + areaFacing[(i+1)%3] * nonFacingFactor));
float splitIncrement = std::min((float)View::backFrustum, splitFactor * pseudoLength);
float mergeIncrement = std::min(View::backFrustum * mergeFactor/splitFactor, mergeFactor * pseudoLength);
float splitIncrement = std::min(Dimensions::backFrustum, splitFactor * pseudoLength);
float mergeIncrement = std::min(Dimensions::backFrustum * mergeFactor/splitFactor, mergeFactor * pseudoLength);
lod.splitBox[2*i] = lod.aabb[2*i] - splitIncrement;
lod.splitBox[2*i+1] = lod.aabb[2*i+1] + splitIncrement;
lod.mergeBox[2*i] = lod.aabb[2*i] - mergeIncrement;
@ -183,4 +182,4 @@ void Chose::drawAABB() {
);
}
unsigned int Chose::initialSeed = 1896509207;//random_seed();
unsigned int Chose::initialSeed = random_seed();

10
view.cpp
View File

@ -26,10 +26,10 @@ void View::setColor(unsigned char r, unsigned char g, unsigned char b) {
void View::initWindow() {
SDL_Init(SDL_INIT_VIDEO);
SDL_WM_SetCaption("Sortie terrain OpenGL",NULL);
SDL_SetVideoMode(windowWidth, windowHeight, 32, SDL_OPENGL);
SDL_SetVideoMode(Dimensions::windowWidth, Dimensions::windowHeight, 32, SDL_OPENGL);
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
gluPerspective(70,(double)windowWidth/windowHeight,frontFrustum,backFrustum);
gluPerspective(70,Dimensions::windowWidth/Dimensions::windowHeight,Dimensions::frontFrustum,Dimensions::backFrustum);
glEnable(GL_DEPTH_TEST);
glewInit();
@ -49,8 +49,8 @@ void View::initWindow() {
glEnable (GL_FOG);
glFogi (GL_FOG_MODE, GL_LINEAR);
glFogfv (GL_FOG_COLOR, fogColor);
glFogf (GL_FOG_START, backFrustum / sqrt(3) / 2.f);
glFogf (GL_FOG_END, backFrustum / sqrt(3) * 0.9);
glFogf (GL_FOG_START, Dimensions::backFrustum / sqrt(3) / 2.f);
glFogf (GL_FOG_END, Dimensions::backFrustum / sqrt(3) * 0.9);
//glHint (GL_FOG_HINT, GL_NICEST);
}
@ -94,7 +94,7 @@ void View::displayAxes() {
void View::setSkybox() {
//int z = 40000;
float d = View::backFrustum / std::sqrt(3) * 0.9;
float d = Dimensions::backFrustum / std::sqrt(3) * 0.9;
glDisable(GL_FOG);
glDisable(GL_LIGHTING);
glPushMatrix();

4
view.hh
View File

@ -37,13 +37,9 @@ private :
public :
Camera camera;
static const float frontFrustum = 1;
static const float backFrustum = 400000; // 1km
private:
Lod lod;
GLfloat fogColor[4];
static const int windowWidth = 1024;
static const int windowHeight = 768;
public :
View(Chose* root);