Merge from Git repository

--HG--
branch : develop

code/nel/src/sound/complex_sound.cpp

@@ -171,6 +171,8 @@ CComplexSound::CComplexSound() :
 	_PatternMode(CComplexSound::MODE_UNDEFINED),
 	_TicksPerSeconds(1.0f),
 	_XFadeLength(3000),		// default to 3000 sec.
+	_DoFadeIn(true),
+	_DoFadeOut(true),
 	_MaxDistValid(false),
 	_Duration(0),
 	_DurationValid(false)
@@ -314,7 +316,8 @@ void	CComplexSound::importForm(const std::string& filename, NLGEORGES::UFormElm&
 	if (mode == "Chained" || mode == "Sparse")
 	{
 		// XFade length
-		formRoot.getValueByName(_XFadeLength, ".SoundType.XFadeLength");
+		if (!formRoot.getValueByName(_XFadeLength, ".SoundType.XFadeLength"))
+			formRoot.getValueByName(_XFadeLength, ".SoundType.XFadeLenght"); // WORKAROUND: Typo in sound assets
 		// Fade in/out flag.
 		formRoot.getValueByName(_DoFadeIn, ".SoundType.DoFadeIn");
 		formRoot.getValueByName(_DoFadeOut, ".SoundType.DoFadeOut");

code/nel/src/sound/simple_sound.cpp

@@ -38,6 +38,7 @@ CSimpleSound::CSimpleSound() :
 	_Registered(false),
 	_Buffer(NULL),
 	// _Detailed(false), // not used?
+	_Alpha(1.0),
 	_NeedContext(false)
 {
 	// init with NULL in case of unexecpted access

code/nel/src/sound/stream_file_sound.cpp

@@ -41,7 +41,7 @@ using namespace std;
 
 namespace NLSOUND {
 
-CStreamFileSound::CStreamFileSound()
+CStreamFileSound::CStreamFileSound() : m_Async(true)
 {
 	
 }

code/nel/src/sound/stream_sound.cpp

@@ -18,19 +18,19 @@
 #include "nel/sound/stream_sound.h"
 
 #if NLSOUND_SHEET_VERSION_BUILT < 2
-#	include "nel/sound/group_controller_root.h"
+#include "nel/sound/group_controller_root.h"
 #endif
 
-namespace NLSOUND {
+namespace NLSOUND
+{
 
 CStreamSound::CStreamSound()
+    : m_Alpha(1.0f)
 {
-	
 }
 
 CStreamSound::~CStreamSound()
 {
-	
 }
 
 void CStreamSound::importForm(const std::string &filename, NLGEORGES::UFormElm &root)
@@ -49,7 +49,7 @@ void CStreamSound::importForm(const std::string &filename, NLGEORGES::UFormElm &
 	CSound::importForm(filename, root);
 
 	// MaxDistance
- 	root.getValueByName(_MaxDist, ".SoundType.MaxDistance");
+	root.getValueByName(_MaxDist, ".SoundType.MaxDistance");
 
 	// MinDistance
 	root.getValueByName(_MinDist, ".SoundType.MinDistance");
@@ -60,7 +60,6 @@ void CStreamSound::importForm(const std::string &filename, NLGEORGES::UFormElm &
 #if NLSOUND_SHEET_VERSION_BUILT < 2
 	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER);
 #endif
-
 }
 
 void CStreamSound::serial(NLMISC::IStream &s)
@@ -71,9 +70,9 @@ void CStreamSound::serial(NLMISC::IStream &s)
 	s.serial(m_Alpha);
 
 #if NLSOUND_SHEET_VERSION_BUILT < 2
-	if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER);
+	if (s.isReading())
+		_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER);
 #endif
-
 }
 
 } /* namespace NLSOUND */

code/nel/tools/build_gamedata/0_setup.py

@@ -88,13 +88,9 @@ if not args.noconf:
 	except NameError:
 		SoundDirectory = "V:"
 	try:
-		SoundSheetsDirectory
+		SoundDfnDirectory
 	except NameError:
-		SoundSheetsDirectory = "V:"
+		SoundDfnDirectory = "V:/DFN"
-	try:
-		SoundSheetsDfnDirectory
-	except NameError:
-		SoundSheetsDfnDirectory = "V:/DFN"
 	try:
 		ExportBuildDirectory
 	except NameError:
@@ -231,8 +227,7 @@ if not args.noconf:
 	WorkspaceDirectory = askVar(log, "[IN] Workspace Directory", WorkspaceDirectory).replace("\\", "/")
 	DatabaseDirectory = askVar(log, "[IN] Database Directory", DatabaseDirectory).replace("\\", "/")
 	SoundDirectory = askVar(log, "[IN] Sound Directory", SoundDirectory).replace("\\", "/")
-	SoundSheetsDirectory = askVar(log, "[IN] Sound Sheets Directory", SoundSheetsDirectory).replace("\\", "/")
+	SoundDfnDirectory = askVar(log, "[IN] Sound DFN Directory", SoundDfnDirectory).replace("\\", "/")
-	SoundSheetsDfnDirectory = askVar(log, "[IN] Sound Sheets DFN Directory", SoundSheetsDfnDirectory).replace("\\", "/")
 	ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
 	InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
 	ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
@@ -317,8 +312,7 @@ if not args.noconf:
 	sf.write("# Data build directories\n")
 	sf.write("DatabaseDirectory = \"" + str(DatabaseDirectory) + "\"\n")
 	sf.write("SoundDirectory = \"" + str(SoundDirectory) + "\"\n")
-	sf.write("SoundSheetsDirectory = \"" + str(SoundSheetsDirectory) + "\"\n")
+	sf.write("SoundDfnDirectory = \"" + str(SoundDfnDirectory) + "\"\n")
-	sf.write("SoundSheetsDfnDirectory = \"" + str(SoundSheetsDfnDirectory) + "\"\n")
 	sf.write("ExportBuildDirectory = \"" + str(ExportBuildDirectory) + "\"\n")
 	sf.write("\n")
 	sf.write("# Install directories\n")

code/nel/tools/build_gamedata/processes/soundbank/0_setup.py

@@ -0,0 +1,65 @@
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief Setup soundbank
+# \date 2009-06-03 10:47GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup soundbank
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2009-2014  by authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup soundbank")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup source directories
+printLog(log, ">>> Setup source directories <<<")
+mkPath(log, SoundDirectory)
+mkPath(log, SoundDfnDirectory)
+
+# Setup export directories
+printLog(log, ">>> Setup export directories <<<")
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + SoundSheetsBuildDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup client directories <<<")
+mkPath(log, InstallDirectory + "/" + SoundInstallDirectory)
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/soundbank/1_export.py

@@ -0,0 +1,49 @@
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export soundbank
+# \date 2009-06-03 10:47GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export soundbank
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2009-2014  by authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export soundbank")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/soundbank/2_build.py

@@ -0,0 +1,64 @@
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build soundbank
+# \date 2009-06-03 10:47GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build soundbank
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2009-2014  by authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build soundbank")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+BuildSoundbank = findTool(log, ToolDirectories, BuildSoundbankTool, ToolSuffix)
+printLog(log, "")
+
+# build_soundbank  <leveldesign> <dfn> <build_packed_sheets>
+printLog(log, ">>> Build soundbank <<<")
+if BuildSoundbank == "":
+	toolLogFail(log, BuildSoundbankTool, ToolSuffix)
+else:
+	mkPath(log, SoundDirectory)
+	mkPath(log, SoundDfnDirectory)
+	mkPath(log, ExportBuildDirectory + "/" + SoundSheetsBuildDirectory)
+	subprocess.call([ BuildSoundbank, SoundDirectory, SoundDfnDirectory, ExportBuildDirectory + "/" + SoundSheetsBuildDirectory ])
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/soundbank/3_install.py

@@ -0,0 +1,55 @@
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install soundbank
+# \date 2009-06-03 10:47GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install soundbank
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2009-2014  by authors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install soundbank")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+printLog(log, ">>> Install soundbank packed_sheets <<<")
+mkPath(log, ExportBuildDirectory + "/" + SoundSheetsBuildDirectory)
+mkPath(log, InstallDirectory + "/" + SoundInstallDirectory)
+copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + SoundSheetsBuildDirectory, InstallDirectory + "/" + SoundInstallDirectory, ".packed_sheets")
+
+printLog(log, "")
+log.close()
+
+
+# end of file