X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest.cpp;h=07ef772eff7755c2b74de152bea0091520b1d30a;hb=4a6b9a6ac1b07239474bce8d3ebf772ce75e862e;hp=f8f9547423fc2abafbfc2d32f2d409b08b58ad70;hpb=a176f9eb36033196040443991a0723c39886b8a2;p=dragonfireclient.git

diff --git a/src/test.cpp b/src/test.cpp
index f8f954742..07ef772ef 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include "player.h"
 #include "main.h"
-#include "heightmap.h"
 #include "socket.h"
 #include "connection.h"
 #include "utility.h"
@@ -193,7 +192,7 @@ struct TestMapNode
 		// Transparency
 		n.d = CONTENT_AIR;
 		assert(n.light_propagates() == true);
-		n.d = 0;
+		n.d = CONTENT_STONE;
 		assert(n.light_propagates() == false);
 	}
 };
@@ -268,6 +267,7 @@ struct TestVoxelManipulator
 		assert(v.getNode(v3s16(-1,0,-1)).d == 2);
 		EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,1,1)));
 
+#if 0
 		/*
 			Water stuff
 		*/
@@ -332,6 +332,7 @@ struct TestVoxelManipulator
 		
 		dstream<<"Final result of flowWater:"<<std::endl;
 		v.print(dstream, VOXELPRINT_WATERPRESSURE);
+#endif
 		
 		//assert(0);
 	}
@@ -516,14 +517,14 @@ struct TestMapBlock
 			assert(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
 			assert(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
 			assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-			assert(b.getFaceLight(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
-			assert(b.getFaceLight(1000, p, v3s16(0,-1,0)) == 0);
-			assert(b.getFaceLight(0, p, v3s16(0,-1,0)) == 0);
+			assert(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
+			assert(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
+			assert(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
 			// According to MapBlock::getFaceLight,
 			// The face on the z+ side should have double-diminished light
 			//assert(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
 			// The face on the z+ side should have diminished light
-			assert(b.getFaceLight(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
+			assert(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
 		}
 		/*
 			Check how the block handles being in between blocks with some non-sunlight
@@ -626,9 +627,7 @@ struct TestMapSector
 		parent.position_valid = false;
 		
 		// Create one with no heightmaps
-		ServerMapSector sector(&parent, v2s16(1,1), 0);
-		//ConstantGenerator *dummyheightmap = new ConstantGenerator();
-		//sector->setHeightmap(dummyheightmap);
+		ServerMapSector sector(&parent, v2s16(1,1));
 		
 		EXCEPTION_CHECK(InvalidPositionException, sector.getBlockNoCreate(0));
 		EXCEPTION_CHECK(InvalidPositionException, sector.getBlockNoCreate(1));
@@ -652,116 +651,6 @@ struct TestMapSector
 	}
 };
 
-struct TestHeightmap
-{
-	void TestSingleFixed()
-	{
-		const s16 BS1 = 4;
-		OneChildHeightmap hm1(BS1);
-		
-		// Test that it is filled with < GROUNDHEIGHT_VALID_MINVALUE
-		for(s16 y=0; y<=BS1; y++){
-			for(s16 x=0; x<=BS1; x++){
-				v2s16 p(x,y);
-				assert(hm1.m_child.getGroundHeight(p)
-					< GROUNDHEIGHT_VALID_MINVALUE);
-			}
-		}
-
-		hm1.m_child.setGroundHeight(v2s16(1,0), 2.0);
-		//hm1.m_child.print();
-		assert(fabs(hm1.getGroundHeight(v2s16(1,0))-2.0)<0.001);
-		hm1.setGroundHeight(v2s16(0,1), 3.0);
-		assert(fabs(hm1.m_child.getGroundHeight(v2s16(0,1))-3.0)<0.001);
-		
-		// Fill with -1.0
-		for(s16 y=0; y<=BS1; y++){
-			for(s16 x=0; x<=BS1; x++){
-				v2s16 p(x,y);
-				hm1.m_child.setGroundHeight(p, -1.0);
-			}
-		}
-
-		f32 corners[] = {0.0, 0.0, 1.0, 1.0};
-		hm1.m_child.generateContinued(0.0, 0.0, corners);
-		
-		hm1.m_child.print();
-		assert(fabs(hm1.m_child.getGroundHeight(v2s16(1,0))-0.2)<0.05);
-		assert(fabs(hm1.m_child.getGroundHeight(v2s16(4,3))-0.7)<0.05);
-		assert(fabs(hm1.m_child.getGroundHeight(v2s16(4,4))-1.0)<0.05);
-	}
-
-	void TestUnlimited()
-	{
-		//g_heightmap_debugprint = true;
-		const s16 BS1 = 4;
-		UnlimitedHeightmap hm1(BS1,
-				new ConstantGenerator(0.0),
-				new ConstantGenerator(0.0),
-				new ConstantGenerator(5.0));
-		// Go through it so it generates itself
-		for(s16 y=0; y<=BS1; y++){
-			for(s16 x=0; x<=BS1; x++){
-				v2s16 p(x,y);
-				hm1.getGroundHeight(p);
-			}
-		}
-		// Print it
-		dstream<<"UnlimitedHeightmap hm1:"<<std::endl;
-		hm1.print();
-		
-		dstream<<"testing UnlimitedHeightmap set/get"<<std::endl;
-		v2s16 p1(0,3);
-		f32 v1(234.01);
-		// Get first heightmap and try setGroundHeight
-		FixedHeightmap * href = hm1.getHeightmap(v2s16(0,0));
-		href->setGroundHeight(p1, v1);
-		// Read from UnlimitedHeightmap
-		assert(fabs(hm1.getGroundHeight(p1)-v1)<0.001);
-	}
-	
-	void Random()
-	{
-		dstream<<"Running random code (get a human to check this)"<<std::endl;
-		dstream<<"myrand() values: ";
-		for(u16 i=0; i<5; i++)
-			dstream<<(u16)myrand()<<" ";
-		dstream<<std::endl;
-
-		const s16 BS1 = 8;
-		UnlimitedHeightmap hm1(BS1,
-				new ConstantGenerator(10.0),
-				new ConstantGenerator(0.3),
-				new ConstantGenerator(0.0));
-
-		// Force hm1 to generate a some heightmap
-		hm1.getGroundHeight(v2s16(0,0));
-		hm1.getGroundHeight(v2s16(0,BS1));
-		/*hm1.getGroundHeight(v2s16(BS1,-1));
-		hm1.getGroundHeight(v2s16(BS1-1,-1));*/
-		hm1.print();
-
-		// Get the (0,0) and (1,0) heightmaps
-		/*FixedHeightmap * hr00 = hm1.getHeightmap(v2s16(0,0));
-		FixedHeightmap * hr01 = hm1.getHeightmap(v2s16(1,0));
-		f32 corners[] = {1.0, 1.0, 1.0, 1.0};
-		hr00->generateContinued(0.0, 0.0, corners);
-		hm1.print();*/
-
-		//assert(0);
-	}
-
-	void Run()
-	{
-		//srand(7); // Get constant random
-		srand(time(0)); // Get better random
-
-		TestSingleFixed();
-		TestUnlimited();
-		Random();
-	}
-};
-
 struct TestSocket
 {
 	void Run()
@@ -1062,18 +951,18 @@ struct TestConnection
 			assert(got_exception);
 		}
 		{
-			//u8 data1[1100];
-			SharedBuffer<u8> data1(1100);
-			for(u16 i=0; i<1100; i++){
+			const int datasize = 30000;
+			SharedBuffer<u8> data1(datasize);
+			for(u16 i=0; i<datasize; i++){
 				data1[i] = i/4;
 			}
 
-			dstream<<"Sending data (size="<<1100<<"):";
-			for(int i=0; i<1100 && i<20; i++){
+			dstream<<"Sending data (size="<<datasize<<"):";
+			for(int i=0; i<datasize && i<20; i++){
 				if(i%2==0) DEBUGPRINT(" ");
 				DEBUGPRINT("%.2X", ((int)((const char*)*data1)[i])&0xff);
 			}
-			if(1100>20)
+			if(datasize>20)
 				dstream<<"...";
 			dstream<<std::endl;
 			
@@ -1081,10 +970,10 @@ struct TestConnection
 
 			sleep_ms(50);
 			
-			u8 recvdata[2000];
+			u8 recvdata[datasize + 1000];
 			dstream<<"** running client.Receive()"<<std::endl;
 			u16 peer_id = 132;
-			u16 size = client.Receive(peer_id, recvdata, 2000);
+			u16 size = client.Receive(peer_id, recvdata, datasize + 1000);
 			dstream<<"** Client received: peer_id="<<peer_id
 					<<", size="<<size
 					<<std::endl;
@@ -1129,7 +1018,6 @@ void run_tests()
 	TEST(TestVoxelManipulator);
 	TEST(TestMapBlock);
 	TEST(TestMapSector);
-	TEST(TestHeightmap);
 	if(INTERNET_SIMULATOR == false){
 		TEST(TestSocket);
 		dout_con<<"=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;