Merge pull request #463 from Hiradur/bugfixes

Fixes by Hiradur

bin/resources/skeleton/config/categories.cfg

@@ -30,10 +30,13 @@
 117, Trailers
 118, Other Loads
 
-
 ;;; terrains
 129, Addon Terrains
 
+859, Container
+
+875, Submarine
+
 ;note: these categories are NOT in the repository:
 5000, Official Terrains
 5001, Night Terrains

source/main/CMakeLists.txt

@@ -14,14 +14,14 @@ macro(add_ror_project BINNAME folder useWxWidgets)
     # warning C4244: 'initializing' : conversion from 'const float' to 'int', possible loss of data
     # warning C4305: 'initializing' : truncation from 'double' to 'const float'
     add_definitions("/wd4305 /wd4244 /wd4193 -DNOMINMAX")
-
-    # enable mumble on the windows platform for now only, has no dependencies as its only using shared memory and URLs
-    add_definitions("-DUSE_MUMBLE")	
   ELSEIF(UNIX)
     include_directories(${GTK_INCLUDE_DIRS})
-    set(OS_LIBS "X11 -l${CMAKE_DL_LIBS}")
+    set(OS_LIBS "X11 -l${CMAKE_DL_LIBS} -lrt")
   ENDIF(WIN32)
 
+  # build with support for Mumble positional audio, has no dependencies but requires linking against librt on UNIX
+  add_definitions("-DUSE_MUMBLE")
+
   include_directories(${Ogre_INCLUDE_DIRS})
   link_directories   (${Ogre_LIBRARY_DIRS})
   include_directories(${Boost_INCLUDE_DIRS})

source/main/audio/SoundScriptManager.cpp

@@ -369,8 +369,8 @@ SoundScriptInstance* SoundScriptManager::createInstance(Ogre::String templatenam
 	}
 
 	if (   free_trigs[templ->trigger_source]   >= MAX_INSTANCES_PER_GROUP
-		|| free_gains[templ->trigger_source]   >= MAX_INSTANCES_PER_GROUP && templ->gain_source  != SS_MOD_NONE
-		|| free_pitches[templ->trigger_source] >= MAX_INSTANCES_PER_GROUP && templ->pitch_source != SS_MOD_NONE )
+		|| (free_gains[templ->trigger_source]   >= MAX_INSTANCES_PER_GROUP && templ->gain_source  != SS_MOD_NONE)
+		|| (free_pitches[templ->trigger_source] >= MAX_INSTANCES_PER_GROUP && templ->pitch_source != SS_MOD_NONE))
 	{
 		LOG("SoundScriptManager: Reached MAX_INSTANCES_PER_GROUP limit (" + TOSTRING(MAX_INSTANCES_PER_GROUP) + ")");
 		return NULL; // reached limit!

source/main/gameplay/LandVehicleSimulation.cpp

@@ -325,18 +325,15 @@ void LandVehicleSimulation::UpdateVehicle(Beam* curr_truck, float seconds_since_
 			{
 				if (RoR::Application::GetInputEngine()->getEventBoolValueBounce(EV_TRUCK_SHIFT_UP))
 				{
-					if (shiftmode != BeamEngine::AUTOMATIC || curr_truck->engine->getAutoShift() == BeamEngine::DRIVE)
-					{
 						curr_truck->engine->shift(1);
 						gear_changed_rel = true;
-					}
 				} 
 				else if (RoR::Application::GetInputEngine()->getEventBoolValueBounce(EV_TRUCK_SHIFT_DOWN))
 				{
 					if (shiftmode  > BeamEngine::SEMIAUTO ||
 						shiftmode == BeamEngine::SEMIAUTO  && !arcadeControls ||
 						shiftmode == BeamEngine::SEMIAUTO  && curr_truck->engine->getGear() > 0 ||
-						shiftmode == BeamEngine::AUTOMATIC && curr_truck->engine->getGear() > 1)
+						shiftmode == BeamEngine::AUTOMATIC)
 					{
 						curr_truck->engine->shift(-1);
 						gear_changed_rel = true;

source/main/gameplay/RoRFrameListener.cpp

@@ -1288,7 +1288,11 @@ bool RoRFrameListener::frameStarted(const FrameEvent& evt)
 #ifdef USE_MUMBLE
 		if (gEnv->player)
 		{
-			MumbleIntegration::getSingleton().update(gEnv->mainCamera->getPosition(), gEnv->player->getPosition() + Vector3(0, 1.8f, 0));
+			// calculate orientation of avatar first
+			Ogre::Vector3 avatarDir = Ogre::Vector3(Math::Cos(gEnv->player->getRotation()), 0.0f, Math::Sin(gEnv->player->getRotation()));
+
+			MumbleIntegration::getSingleton().update(gEnv->mainCamera->getPosition(), gEnv->mainCamera->getDirection(), gEnv->mainCamera->getUp(),
+														gEnv->player->getPosition() + Vector3(0, 1.8f, 0), avatarDir, Ogre::Vector3(0.0f, 1.0f, 0.0f));
 		}
 #endif // USE_MUMBLE
 	}

source/main/gfx/Skidmark.cpp

@@ -165,8 +165,6 @@ void Skidmark::addObject(Vector3 start, String texture)
 	skid.lastPointAv=start;
 	skid.facecounter=0;
 
-	for (int i = 0; i<3; i++) skid.face[i] = Vector3::ZERO;
-
 	skid.colour = ColourValue(Math::RangeRandom(0, 100)/100.0f, Math::RangeRandom(0, 100)/100.0f, Math::RangeRandom(0, 100)/100.0f, 0.8f);
 
 
@@ -188,7 +186,7 @@ void Skidmark::addObject(Vector3 start, String texture)
 	skid.groundTexture.resize(lenght);
 	skid.obj = gEnv->sceneManager->createManualObject("skidmark" + TOSTRING(instanceCounter++));
 	skid.obj->setDynamic(true);
-	skid.obj->setRenderingDistance(2000); //2km sight range
+	skid.obj->setRenderingDistance(800); // 800m view distance
 	skid.obj->begin(bname, RenderOperation::OT_TRIANGLE_STRIP);
 	for (int i = 0; i < lenght; i++)
 	{
@@ -198,7 +196,7 @@ void Skidmark::addObject(Vector3 start, String texture)
 		skid.obj->position(start);
 		skid.obj->textureCoord(0,0);
 	}
-    skid.obj->end();
+    	skid.obj->end();
 	mNode->attachObject(skid.obj);
 
 

source/main/gfx/Skidmark.h

@@ -75,7 +75,6 @@ class Skidmark : public ZeroedMemoryAllocator
 		Ogre::Vector3 lastPointAv;
 		int pos;
 		Ogre::ColourValue colour;
-		Ogre::Vector3 face[2];
 		int facecounter;
 	} skidmark_t;
 

source/main/gui/Console.cpp

@@ -33,6 +33,7 @@
 #include "IHeightFinder.h"
 #include "HighScoreWindow.h"
 #include "Language.h"
+#include "MainThread.h"
 #include "Network.h"
 #include "OverlayWrapper.h"
 #include "RoRFrameListener.h"
@@ -385,7 +386,8 @@ void Console::eventCommandAccept(MyGUI::Edit* _sender)
 		}
 		else if (args[0] == "/quit")
 		{
-			gEnv->frameListener->shutdown_final();
+			Application::GetMainThreadLogic()->RequestExitCurrentLoop();
+			Application::GetMainThreadLogic()->RequestShutdown();
 			return;
 
 		}

source/main/gui/GUIMenu.cpp

@@ -393,7 +393,8 @@ void GUI_MainMenu::onMenuBtn(MyGUI::MenuCtrlPtr _sender, MyGUI::MenuItemPtr _ite
 		GUI_Friction::getSingleton().setVisible(true);
 	} else if (miname == _L("Exit"))
 	{
-		gEnv->frameListener->shutdown_final();
+		Application::GetMainThreadLogic()->RequestExitCurrentLoop();
+		Application::GetMainThreadLogic()->RequestShutdown();
 	} else if (miname == _L("Show Console"))
 	{
 		Console *c = RoR::Application::GetConsole();

source/main/gui/panels/GUI_GameMainMenu.cpp

@@ -112,7 +112,8 @@ void CLASS::eventMouseButtonClickAboutButton(MyGUI::WidgetPtr _sender)
 void CLASS::eventMouseButtonClickExitButton(MyGUI::WidgetPtr _sender)
 {
 	Hide();
-	gEnv->frameListener->shutdown_final();
+	Application::GetMainThreadLogic()->RequestExitCurrentLoop();
+	Application::GetMainThreadLogic()->RequestShutdown();
 }
 
 void CLASS::eventMouseButtonClickMultiPlayerButton(MyGUI::WidgetPtr _sender)

source/main/main_sim/MainThread.cpp

@@ -481,6 +481,12 @@ void MainThread::Go()
 				}
 				/* Restore wallpaper */
 				menu_wallpaper_widget->setVisible(true);
+
+				/* Set Mumble to non-positional audio */
+				#ifdef USE_MUMBLE
+					  MumbleIntegration::getSingleton().update(Vector3::ZERO, Ogre::Vector3(0.0f, 0.0f, 1.0f), Ogre::Vector3(0.0f, 1.0f, 0.0f),
+							  	  	  	  	  	  	  	  	  	  Vector3::ZERO, Ogre::Vector3(0.0f, 0.0f, 1.0f), Ogre::Vector3(0.0f, 1.0f, 0.0f));
+				#endif // USE_MUMBLE
 			}
 
 			if (BSETTING("MainMenuMusic", true))
@@ -737,6 +743,8 @@ bool MainThread::SetupGameplayLoop(bool enable_network, Ogre::String preselected
 	Application::CreateOverlayWrapper();
 	Application::GetOverlayWrapper()->SetupDirectionArrow();
 
+	gEnv->sceneManager->setAmbientLight(Ogre::ColourValue(0.3f, 0.3f, 0.3f));
+
 	if (!m_base_resource_loaded)
 	{
 		new DustManager(); // setup particle manager singleton. TODO: Move under Application
@@ -1113,14 +1121,6 @@ void MainThread::MainMenuLoopUpdate(float seconds_since_last_frame)
 			GUI_Multiplayer::getSingleton().update();
 		}
 #endif // USE_SOCKETW
-
-		// now update mumble 3d audio things
-#ifdef USE_MUMBLE
-		if (gEnv->player)
-		{
-			MumbleIntegration::getSingleton().update(gEnv->mainCamera->getPosition(), gEnv->player->getPosition() + Vector3(0, 1.8f, 0));
-		}
-#endif // USE_MUMBLE
 	}
 
 	MainMenuLoopUpdateEvents(seconds_since_last_frame);

source/main/physics/Beam.cpp

@@ -3056,7 +3056,7 @@ void Beam::updateSkidmarks()
 		// create skidmark object for wheels with data if not existing
 		if (!skidtrails[i])
 		{
-			skidtrails[i] = new Skidmark(&wheels[i], beamsRoot, 300, 200);
+			skidtrails[i] = new Skidmark(&wheels[i], beamsRoot, 300, 20);
 		}
 
 		skidtrails[i]->updatePoint();
@@ -5839,11 +5839,18 @@ void Beam::updateDashBoards(float &dt)
 
 Vector3 Beam::getGForces()
 {
-	if (cameranodecount > 0 && cameranodepos[0] >= 0 && cameranodepos[0] < MAX_NODES && cameranodedir[0] >= 0 && cameranodedir[0] < MAX_NODES && cameranoderoll[0] >= 0 && cameranoderoll[0] < MAX_NODES)
+	if (cameranodepos[0] >= 0 && cameranodepos[0] < MAX_NODES && cameranodedir[0] >= 0 && cameranodedir[0] < MAX_NODES && cameranoderoll[0] >= 0 && cameranoderoll[0] < MAX_NODES)
 	{
-		Vector3 acc      = cameranodeacc / cameranodecount;
-		cameranodeacc    = Vector3::ZERO;
-		cameranodecount  = 0;
+		static Vector3 result = Vector3::ZERO;
+
+		if (cameranodecount == 0) // multiple calls in one single frame, avoid division by 0
+		{
+			return result;
+		}
+
+		Vector3 acc = cameranodeacc / cameranodecount;
+		cameranodeacc      = Vector3::ZERO;
+		cameranodecount    = 0;
 
 		float longacc     = acc.dotProduct((nodes[cameranodepos[0]].RelPosition - nodes[cameranodedir[0]].RelPosition).normalisedCopy());
 		float latacc      = acc.dotProduct((nodes[cameranodepos[0]].RelPosition - nodes[cameranoderoll[0]].RelPosition).normalisedCopy());
@@ -5863,7 +5870,9 @@ Vector3 Beam::getGForces()
 
 		float vertacc = std::abs(gravity) - acc.dotProduct(-upv);
 
-		return Vector3(vertacc / std::abs(gravity), longacc / std::abs(gravity), latacc / std::abs(gravity));
+		result = Vector3(vertacc / std::abs(gravity), longacc / std::abs(gravity), latacc / std::abs(gravity));
+
+		return result;
 	}
 
 	return Vector3::ZERO;