www

commit b7e3683fbf8de9e6753700bb5aa1d2ae2cd1ea59
parent 10aed0d2b1aabe451a10d3e4b800437530cac1f8
Author: Georges Dupéron <georges.duperon@cortus.com>
Date:   Thu, 25 Sep 2014 01:36:57 +0200

Quickly fixed some build errors.

Diffstat:
M
Makefile
 | 
2
+-
M
lod.cpp
 | 
4
++--
M
rules/chose.hh
 | 
2
+-
M
rules/couleursDimensions.cpp
 | 
4
++--
M
rules/mur.cpp
 | 
2
+-

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ $(EXECUTABLE): $(SOURCES) all_includes.hh.gch Makefile
 	@echo "#define _ALL_CPP_">> all.cpp
 	@$(foreach FILE,$(SOURCES),echo '#include "'"$(FILE)"'"' >> all.cpp;)
 	@echo "#endif">> all.cpp
-	$(CXX) $(LIBS) $(CFLAGS) all.cpp -o $@
+	$(CXX) all.cpp $(LIBS) $(CFLAGS) -o $@
 	@rm all.cpp
 
 all_includes.hh.gch: $(HEADERS) Makefile
diff --git a/lod.cpp b/lod.cpp
@@ -60,9 +60,9 @@ void Lod::setCamera(Vertex newCamera) {
 void Lod::doSplit(Chose* c) {
 	c->split();
 	std::vector<Chose*>::iterator it;
-	bool mergeCube = false;
+	////bool mergeCube = false; // Started to work again on the project, a new warning detected this.
 	for (it = c->children.begin(); it != c->children.end(); ++it) {
-		mergeCube = true;
+		////mergeCube = true; // Started to work again on the project, a new warning detected this.
 		(*it)->triangulation();
 		(*it)->updateAABB();
 		// (*it)->drawAABB();
diff --git a/rules/chose.hh b/rules/chose.hh
@@ -30,7 +30,7 @@ protected :
 	virtual void getBoundingBoxPoints() = 0;
 	virtual float LODFactor();
 	Chose();
-	~Chose();
+	virtual ~Chose();
 	inline void addEntropy(unsigned int x1) {
 		seed = hash2(seed, x1);
 	}
diff --git a/rules/couleursDimensions.cpp b/rules/couleursDimensions.cpp
@@ -2,7 +2,7 @@
 
 const unsigned int Couleurs::fog = mix(cielHaut, cielBas, 0.5);
 
-const float Dimensions::splitFactor = 1.f;
-const float Dimensions::mergeFactor = 1.25f;
+const float Dimensions::splitFactor = 3.f;
+const float Dimensions::mergeFactor = 4.f;
 const float Dimensions::frontFrustum = 1.f;
 const float Dimensions::backFrustum = 4000 * 100; // 4km
diff --git a/rules/mur.cpp b/rules/mur.cpp
@@ -45,7 +45,7 @@ void MurQuad::split() {
         Quad righth = Quad(windowPosh[NW],windowPosh[SW],ch[SW],ch[NW]);
         Quad left = Quad(c[NE],c[SE],windowPos[SE],windowPos[NE]);
         Quad lefth = Quad(ch[NE],ch[SE],windowPosh[SE],windowPosh[NE]);
-        Quad top = Quad(windowPosh[NE],windowPosh[NW],windowPosh[SW],windowPosh[SE]);
+        ////Quad top = Quad(windowPosh[NE],windowPosh[NW],windowPosh[SW],windowPosh[SE]); // Started to work again on the project, a new warning detected this.
 
         if (!door) addChild(new MurQuad(c,windowPos,false, true, false));
         addChild(new MurQuad(windowPosh,ch, false, false, true));