sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +21 -21
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9c0cf35a0 - Show all commits

40
ClientApp/Utils/EngineConnection.cs
View File

@@ -239,28 +239,28 @@ namespace ClientApp.Utils
Write("Setting environment"); Write("Setting environment");
WriteTextMessage(mainCommand.DeleteNode(groundPlaneId, "none")); WriteTextMessage(mainCommand.DeleteNode(groundPlaneId, "none"));
PlaceHouses(mainCommand); PlaceHouses();
WriteTextMessage(mainCommand.SkyboxCommand(DateTime.Now.Hour)); WriteTextMessage(mainCommand.SkyboxCommand(DateTime.Now.Hour));
} }
private void PlaceHouses(Command mainCommand) private void PlaceHouses()
{ {
PlaceHouse(mainCommand, 2, new float[] { 10f, 1f, 30f }, 1); PlaceHouse(2, new float[] { 10f, 1f, 30f }, 1);
PlaceHouse(mainCommand, 1, new float[] { 42f, 1f, 22f }, new float[] { 0f, 90f, 0f }, 2); PlaceHouse(1, new float[] { 42f, 1f, 22f }, new float[] { 0f, 90f, 0f }, 2);
PlaceHouse(mainCommand, 11, new float[] { -20f, 1f, 0f }, new float[] { 0f, -35f, 0f }, 3); PlaceHouse(11, new float[] { -20f, 1f, 0f }, new float[] { 0f, -35f, 0f }, 3);
PlaceHouse(mainCommand, 7, new float[] { -15f, 1f, 50f }, new float[] { 0f, -50f, 0f }, 4); PlaceHouse(7, new float[] { -15f, 1f, 50f }, new float[] { 0f, -50f, 0f }, 4);
PlaceHouse(mainCommand, 24, new float[] { 40f, 1f, 40f }, new float[] { 0f, 75f, 0f }, 5); PlaceHouse(24, new float[] { 40f, 1f, 40f }, new float[] { 0f, 75f, 0f }, 5);
PlaceHouse(mainCommand, 22, new float[] { 34f, 1f, -20f }, 6); PlaceHouse(22, new float[] { 34f, 1f, -20f }, 6);
PlaceHouse(mainCommand, 14, new float[] { 0f, 1f, -20f }, new float[] { 0f, 210f, 0f }, 7); PlaceHouse(14, new float[] { 0f, 1f, -20f }, new float[] { 0f, 210f, 0f }, 7);
} }
private void PlaceHouse(Command mainCommand, int numberHousemodel, float[] position, int serialNumber) private void PlaceHouse(int numberHousemodel, float[] position, int serialNumber)
{ {
PlaceHouse(mainCommand, numberHousemodel, position, new float[] { 0f, 0f, 0f }, serialNumber); PlaceHouse(numberHousemodel, position, new float[] { 0f, 0f, 0f }, serialNumber);
} }
private void PlaceHouse(Command mainCommand, int numberHousemodel, float[] position, float[] rotation, int serialNumber) private void PlaceHouse(int numberHousemodel, float[] position, float[] rotation, int serialNumber)
{ {
string folderHouses = @"data\NetworkEngine\models\houses\set1\"; string folderHouses = @"data\NetworkEngine\models\houses\set1\";
SendMessageAndOnResponse(mainCommand.AddModel("House1", "housePlacement" + serialNumber, folderHouses + "house" + numberHousemodel + ".obj", position, 4, rotation), "housePlacement" + serialNumber, (message) => Console.WriteLine(message)); SendMessageAndOnResponse(mainCommand.AddModel("House1", "housePlacement" + serialNumber, folderHouses + "house" + numberHousemodel + ".obj", position, 4, rotation), "housePlacement" + serialNumber, (message) => Console.WriteLine(message));
@@ -318,14 +318,14 @@ namespace ClientApp.Utils
{ {
height[i] = improvedPerlin.GetValue(x /10, x / 10, x * 100) / 3.5f + 1; height[i] = improvedPerlin.GetValue(x /10, x / 10, x * 100) / 3.5f + 1;
if (height[i] > 1.1f) //if (height[i] > 1.1f)
{ //{
height[i] = height[i] * 0.8f; // height[i] = height[i] * 0.8f;
} //}
else if (height[i] < 0.9f) //else if (height[i] < 0.9f)
{ //{
height[i] = height[i] * 1.2f; // height[i] = height[i] * 1.2f;
} //}
x += 0.001f; x += 0.001f;
} }