Merge 'remotes/trunk'

binaries/data/mods/public/simulation/data/technologies/pop_house_01.json

@@ -10,7 +10,7 @@
 		"pers": "Paradise"
 	},
 	"description": "Home gardens ranged from simple fenced-in areas to large manicured and colonnaded enclosures.",
-	"cost": {"food": 0, "wood": 500, "stone": 100, "metal": 0},
+	"cost": {"food": 0, "wood": 300, "stone": 100, "metal": 0},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "population.png",

source/maths/NUSpline.cpp

@@ -16,6 +16,9 @@
  */
 
 #include "precompiled.h"
+
+#include <algorithm>
+
 #include "NUSpline.h"
 #include "Matrix3D.h"
 
@@ -218,7 +221,7 @@ void TNSpline::AddNode(const CFixedVector3D& pos, const CFixedVector3D& rotation
 //Inserts node before position
 void TNSpline::InsertNode(const int index, const CFixedVector3D& pos, const CFixedVector3D& UNUSED(rotation), fixed timePeriod)
 {
-	if (NodeCount >= MAX_SPLINE_NODES || index < 0 || index > NodeCount - 1)
+	if (NodeCount >= MAX_SPLINE_NODES || index < 0 || index > NodeCount)
 		return;
 
 	if (NodeCount == 0)
@@ -230,6 +233,8 @@ void TNSpline::InsertNode(const int index, const CFixedVector3D& pos, const CFix
 	temp.Position = pos;
 	temp.Distance = timePeriod;
 	Node.insert(Node.begin() + index, temp);
+	if (index > 0)
+		std::swap(Node[index].Distance, Node[index - 1].Distance);
 	++NodeCount;
 }
 

source/renderer/WaterManager.cpp

@@ -417,12 +417,14 @@ void WaterManager::UnloadWaterTextures()
 // Calculate our binary heightmap from the terrain heightmap.
 void WaterManager::RecomputeDistanceHeightmap()
 {
+	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
+	if (!terrain || !terrain->GetHeightMap())
+		return;
+
 	size_t SideSize = m_MapSize*2;
 	if (m_DistanceHeightmap == NULL)
 		m_DistanceHeightmap = new float[SideSize*SideSize];
 
-	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
-
 	// Create a manhattan-distance heightmap.
 	// This is currently upsampled by a factor of 2 to get more precision
 	// This could be refined to only be done near the coast itself, but it's probably not necessary.
@@ -483,6 +485,8 @@ void WaterManager::CreateWaveMeshes()
 {
 	size_t SideSize = m_MapSize*2;
 	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
+	if (!terrain || !terrain->GetHeightMap())
+		return;
 
 	for (WaveObject* const& obj : m_ShoreWaves)
 	{
@@ -944,13 +948,15 @@ void WaterManager::RenderWaves(const CFrustum& frustrum)
 // Calculate The blurred normal map to get an idea of where water ought to go.
 void WaterManager::RecomputeBlurredNormalMap()
 {
+	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
+	if (!terrain || !terrain->GetHeightMap())
+		return;
+
 	// used to cache terrain normals since otherwise we'd recalculate them a lot (I'm blurring the "normal" map).
 	// this might be updated to actually cache in the terrain manager but that's not for now.
 	if (m_BlurredNormalMap == NULL)
 		m_BlurredNormalMap = new CVector3D[m_MapSize*m_MapSize];
 
-	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
-
 	// It's really slow to calculate normals so cache them first.
 	CVector3D* normals = new CVector3D[m_MapSize*m_MapSize];
 
@@ -997,6 +1003,17 @@ void WaterManager::RecomputeBlurredNormalMap()
 	delete[] normals;
 }
 
+void WaterManager::RecomputeWaterData()
+{
+	if (!m_MapSize)
+		return;
+
+	RecomputeBlurredNormalMap();
+	RecomputeDistanceHeightmap();
+	RecomputeWindStrength();
+	CreateWaveMeshes();
+}
+
 ///////////////////////////////////////////////////////////////////
 // Calculate the strength of the wind at a given point on the map.
 // This is too slow and should support limited recomputation.
@@ -1006,6 +1023,9 @@ void WaterManager::RecomputeWindStrength()
 		m_WindStrength = new float[m_MapSize*m_MapSize];
 
 	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
+	if (!terrain || !terrain->GetHeightMap())
+		return;
+
 	float waterLevel = m_WaterHeight;
 
 	CVector2D windDir = CVector2D(cos(m_WindAngle),sin(m_WindAngle));

source/renderer/WaterManager.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -154,6 +154,11 @@ class WaterManager
 	 */
 	void UnloadWaterTextures();
 
+	/**
+	 * RecomputeWaterData: calculates all derived data from the waterheight
+	 */
+	void RecomputeWaterData();
+
 	/**
 	 * RecomputeWindStrength: calculates the intensity of waves
 	 */

source/simulation2/components/CCmpTerrain.cpp

@@ -146,10 +146,7 @@ class CCmpTerrain : public ICmpTerrain
 		if (ReloadWater && CRenderer::IsInitialised())
 		{
 			g_Renderer.GetWaterManager()->SetMapSize(vertices);
-			g_Renderer.GetWaterManager()->RecomputeBlurredNormalMap();
-			g_Renderer.GetWaterManager()->RecomputeDistanceHeightmap();
-			g_Renderer.GetWaterManager()->RecomputeWindStrength();
-			g_Renderer.GetWaterManager()->CreateWaveMeshes();
+			g_Renderer.GetWaterManager()->RecomputeWaterData();
 		}
 		MakeDirty(0, 0, tiles+1, tiles+1);
 	}

source/simulation2/components/CCmpWaterManager.cpp

@@ -67,6 +67,8 @@ class CCmpWaterManager : public ICmpWaterManager
 		Init(paramNode);
 
 		deserialize.NumberFixed_Unbounded("height", m_WaterHeight);
+
+		RecomputeWaterData();
 	}
 
 	virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
@@ -97,10 +99,8 @@ class CCmpWaterManager : public ICmpWaterManager
 	{
 		if (CRenderer::IsInitialised())
 		{
-			g_Renderer.GetWaterManager()->RecomputeBlurredNormalMap();
-			g_Renderer.GetWaterManager()->RecomputeDistanceHeightmap();
-			g_Renderer.GetWaterManager()->RecomputeWindStrength();
-			g_Renderer.GetWaterManager()->CreateWaveMeshes();
+			g_Renderer.GetWaterManager()->RecomputeWaterData();
+			g_Renderer.GetWaterManager()->m_WaterHeight = m_WaterHeight.ToFloat();
 		}
 
 		// Tell the terrain it'll need to recompute its cached render data
@@ -114,11 +114,7 @@ class CCmpWaterManager : public ICmpWaterManager
 
 		m_WaterHeight = h;
 
-		// Tell the terrain it'll need to recompute its cached render data
-		GetSimContext().GetTerrain().MakeDirty(RENDERDATA_UPDATE_VERTICES);
-
-		if (CRenderer::IsInitialised())
-			g_Renderer.GetWaterManager()->m_WaterHeight = h.ToFloat();
+		RecomputeWaterData();
 
 		CMessageWaterChanged msg;
 		GetSimContext().GetComponentManager().BroadcastMessage(msg);

source/tools/atlas/GameInterface/Handlers/CinemaHandler.cpp

@@ -340,7 +340,7 @@ BEGIN_COMMAND(AddPathNode)
 			fixed::FromFloat(focus.Y),
 			fixed::FromFloat(focus.Z)
 		);
-		spline.InsertNode(index, target, CFixedVector3D(), fixed::FromInt(1));
+		spline.InsertNode(index + 1, target, CFixedVector3D(), fixed::FromInt(1));
 
 		spline.BuildSpline();
 		cmpCinemaManager->DeletePath(name);