Merge branch '58-add-rotz-roty-and-dist-reflect-lua-to-3dcamera-of-a-scene' into 'main/gingo-test'

Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene"

See merge request ryzom/ryzom-core!48

CMakeLists.txt

@@ -41,8 +41,8 @@ OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF)
 IF(HUNTER_ENABLED)
   INCLUDE("CMakeModules/HunterGate.cmake")
   HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/v0.23.317.tar.gz"
-    SHA1 "fbdd94b1966d351384e27b02c8d134915b1131d6"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
+    SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
     FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
   )
 

nel/include/nel/misc/debug.h

@@ -380,7 +380,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime);
 #define nlassume(exp) do { } while (0)
 #endif
 
-#ifdef NL_NO_DEBUG
+#ifdef NL_NO_ASSERT
 #	define nlassert(exp) nlassume(exp)
 #	define nlassertonce(exp) nlassume(exp)
 #	define nlassertex(exp, str) nlassume(exp)

nel/include/nel/misc/types_nl.h

@@ -274,7 +274,7 @@
 
 //#define NL_NO_DEBUG
 #undef NL_NO_DEBUG
-
+#define NL_NO_ASSERT
 
 // Standard types
 

ryzom/client/src/character_cl.cpp

@@ -6274,6 +6274,11 @@ void CCharacterCL::updateVisiblePostPos(const NLMISC::TTime &currentTimeInMs, CE
 					pos = (box().getMin() + box().getMax())/2;
 					pos.z = box().getMax().z;
 				}
+
+				CRaceStatsSheet *sheet = const_cast<CRaceStatsSheet*>(UserEntity->playerSheet());
+				float namePosZ = sheet->GenderInfos[UserEntity->getGender()].NamePosZNormal;
+				if (pos.z > box().getMin().z + namePosZ)
+					pos.z = box().getMin().z + namePosZ;
 				nlassert(isValidDouble(pos.x) && isValidDouble(pos.y) && isValidDouble(pos.z));
 				_CurrentBubble->Position = pos;
 			}
@@ -6679,7 +6684,7 @@ ADD_METHOD(void CCharacterCL::updatePos(const TTime &currentTimeInMs, CEntityCL
 			updatePosCombatFloat(frameTimeRemaining, target);
 		}
 		// Compute the average speed to the destination.
-		// double spd = 
+		// double spd =
 		computeSpeed();
 
 
@@ -8233,14 +8238,14 @@ float CCharacterCL::getSheetScale() const	// virtual
 // getColRadius :
 // Return the entity collision radius. (return 0.5 if there is any problem).
 //---------------------------------------------------
-float CCharacterCL::getSheetColRadius() const 
+float CCharacterCL::getSheetColRadius() const
 {
-	if(!_Sheet) 
+	if(!_Sheet)
 		return 0.5f;
 	else
 		return _Sheet->ColRadius;
 }
-	
+
 
 //---------------------------------------------------
 // getScale :
@@ -8359,7 +8364,7 @@ std::string CCharacterCL::shapeFromItem(const CItemSheet &itemSheet) const
 		sheet = itemSheet.getShape();
 
 	return sheet;
-		
+
 }// shapeFromItem //
 
 
@@ -9147,7 +9152,7 @@ void CCharacterCL::setAuraFX(uint index, const CAnimationFX *sheet)
 			bi.DelayBeforeStart = 11.5f;
 			_AttachedFXListToStart.push_front(bi);
 		}
-		else 
+		else
 		{
 			CAttachedFX::TSmartPtr fx = new CAttachedFX;
 			fx->create(*this, bi, CAttachedFX::CTargeterInfo());

ryzom/client/src/interface_v3/action_handler_item.cpp

@@ -747,6 +747,10 @@ public:
 		CInterfaceElement *pElt = CWidgetManager::getInstance()->getElementFromId(src);
 		CDBCtrlSheet *pCSSrc = dynamic_cast<CDBCtrlSheet*>(pElt);
 		CDBCtrlSheet *pCSDst = dynamic_cast<CDBCtrlSheet*>(pCaller);
+
+		// end drag
+		getInventory().endDrag();
+
 		if ((pCSSrc == NULL) || (pCSDst == NULL)) return;
 
 		if (pCSSrc->getType() == CCtrlSheetInfo::SheetType_Item)
@@ -1881,7 +1885,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			}
 			if (pItemTextDisplay && pIS->Family == ITEMFAMILY::SCROLL)
 			{
-				if (pCS->getInventoryIndex()==INVENTORIES::bag)
+				if (pCS->getInventoryIndex()==INVENTORIES::bag && pIS->Scroll.Label.empty())
 					pItemTextDisplay->setActive(true);
 				pItemInfos->setActive(false);
 			}

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -309,7 +309,6 @@ CCtrlSheetInfo::CCtrlSheetInfo()
 	_InterfaceColor= true;
 	_SheetSelectionGroup = -1;
 	_UseQuality = true;
-	_DisplayItemQuality = true;
 	_UseQuantity = true;
 	_DuplicateOnDrag = false;
 	_ItemSlot= SLOTTYPE::UNDEFINED;
@@ -1277,6 +1276,9 @@ void CDBCtrlSheet::setupItem ()
 
 	sint32 sheet = _SheetId.getSInt32();
 
+	_DispQuality = -1;
+	_DispQuantity = -1;
+
 	// If this is the same sheet, need to resetup
 	if (_LastSheetId != sheet || _NeedSetup)
 	{
@@ -1290,13 +1292,6 @@ void CDBCtrlSheet::setupItem ()
 		{
 			_ItemSheet = (CItemSheet*)pES;
 
-			// Display the item quality?
-			_DisplayItemQuality= _UseQuality &&
-				_ItemSheet->Family != ITEMFAMILY::COSMETIC &&
-				_ItemSheet->Family != ITEMFAMILY::TELEPORT &&
-				_ItemSheet->Family != ITEMFAMILY::SERVICE
-				;
-
 			_DispSheetBmpId = rVR.getTextureIdFromName (_ItemSheet->getIconMain());
 			// if file not found or empty, replace by default icon
 			if( _DispSheetBmpId == -1)
@@ -1350,21 +1345,11 @@ void CDBCtrlSheet::setupItem ()
 						_DispQuantity = _Quantity.getSInt32();
 					}
 				}
-				else
-					// do not display any number
-					_DispQuantity = -1;
 			}
-			else _DispQuantity = -1;
 
 			// Setup quality
-			if(_DisplayItemQuality)
-			{
+			if(_UseQuality)
 				_DispQuality= _Quality.getSInt32();
-			}
-			else
-			{
-				_DispQuality= -1;
-			}
 
 			// special icon text
 			if( _NeedSetup || _ItemSheet->getIconText() != _OptString )
@@ -1403,7 +1388,7 @@ void CDBCtrlSheet::setupItem ()
 		}
 
 		// update quality. NB: if quality change, the must updateItemCharacRequirement
-		if(_DisplayItemQuality)
+		if(_UseQuality)
 		{
 			sint32	newQuality= _Quality.getSInt32();
 			if(newQuality!=_DispQuality)
@@ -1412,10 +1397,6 @@ void CDBCtrlSheet::setupItem ()
 				updateItemCharacRequirement(_LastSheetId);
 			}
 		}
-		else
-		{
-			_DispQuality= -1;
-		}
 
 		// update armour color (if USER_COLOR db change comes after SHEET change)
 		if(_ArmourColorFromDB && _UserColor)
@@ -1428,6 +1409,31 @@ void CDBCtrlSheet::setupItem ()
 		}
 	}
 
+	if (_ItemSheet != NULL)
+	{
+		switch(_ItemSheet->Family)
+		{
+			case ITEMFAMILY::ARMOR:
+			case ITEMFAMILY::MELEE_WEAPON:
+			case ITEMFAMILY::RANGE_WEAPON:
+			case ITEMFAMILY::SHIELD:
+			case ITEMFAMILY::JEWELRY:
+			case ITEMFAMILY::CRAFTING_TOOL:
+			case ITEMFAMILY::HARVEST_TOOL:
+			case ITEMFAMILY::TAMING_TOOL:
+			case ITEMFAMILY::TRAINING_TOOL:
+				// hide 'x0' and 'x1' stack count for equipable items
+				if (_DispQuantity < 2)
+					_DispQuantity = -1;
+				break;
+			default:
+				// hide 'q0'and 'q1' quality for every other item
+				if (_DispQuality < 2)
+					_DispQuality = -1;
+				break;
+		}
+	}
+
 	// at each frame, must test for grayed.
 	if(_AutoGrayed)
 	{
@@ -1893,8 +1899,6 @@ void CDBCtrlSheet::setupOutpostBuilding()
 		{
 			COutpostBuildingSheet *pOBSheet = (COutpostBuildingSheet*)pES;
 
-			_DisplayItemQuality = false;
-
 			_DispSheetBmpId = rVR.getTextureIdFromName (pOBSheet->getIconMain());
 			// if file not found or empty, replace by default icon
 			if( _DispSheetBmpId == -1)
@@ -2535,7 +2539,7 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 					sint32 hArea = (hSheet / 4);
 					sint32 xIcon = x;
 					// move buff icons up a row, quantity text is displayed on bottom-left corner
-					sint32 yIcon = y + hArea;
+					sint32 yIcon = y + (_DispQuantity > 0 ? hArea : 0);
 					for (uint i = 0; i < _BuffIcons.size(); ++i)
 					{
 						sint32 wIcon = _BuffIcons[i].IconW;

ryzom/client/src/interface_v3/dbctrl_sheet.h

@@ -164,7 +164,6 @@ public:
 	bool				_UseQuantity	       : 1; // is the quantity read and displayed ?
 	bool				_ReadQuantityFromSheet : 1; // Read quantity from sheet rather than from database
 	bool				_UseQuality            : 1; // is the quality read and displayed ?
-	bool				_DisplayItemQuality    : 1; // Do we have to display the quality for the item (false for Cosmetics and Teleport and if _UseQuality==fasle)?
 	bool                _DuplicateOnDrag       : 1; // when dragged, the item is shown twice : one version at the mouse position.
 	                                             // and another in the source slot. Useful for items to buy that are in infinite quantity.
 	bool				_AutoGrayed            : 1; // if true then gray the ctrlSheeet if: 1/ Items: Is the Item Locked. 2/ Bricks: is the brick Latent.

ryzom/client/src/interface_v3/interface_3d_scene.cpp

@@ -713,7 +713,7 @@ int CInterface3DScene::luaGetElement(CLuaState &ls)
 	}
 	return 1;
 }
-	
+
 // ----------------------------------------------------------------------------
 string CInterface3DScene::getCurrentCamera() const
 {
@@ -1288,7 +1288,7 @@ float CInterface3DShape::getBBoxSizeX () const
 {
 	CAABBox bbox;
 	_Instance.getShapeAABBox(bbox);
-		
+
 	if (bbox.getCenter() == CVector::Null)
 		return -0.5f;
 
@@ -1299,7 +1299,7 @@ float CInterface3DShape::getBBoxSizeY () const
 {
 	CAABBox bbox;
 	_Instance.getShapeAABBox(bbox);
-	
+
 	if (bbox.getCenter() == CVector::Null)
 		return -0.5f;
 
@@ -1310,7 +1310,7 @@ float CInterface3DShape::getBBoxSizeZ () const
 {
 	CAABBox bbox;
 	_Instance.getShapeAABBox(bbox);
-	
+
 	if (bbox.getCenter() == CVector::Null)
 		return -0.5f;
 
@@ -1437,6 +1437,34 @@ void CInterface3DShape::setName (const std::string &ht)
 	}
 }
 
+std::string CInterface3DShape::getTextures() const
+{
+	return _Textures;
+}
+
+
+void CInterface3DShape::setTextures(const std::string &textures)
+{
+	if (textures.empty())
+		return;
+
+	_Textures = textures;
+	vector<string> texList;
+	splitString(textures, " ", texList);
+
+	for(uint j=0;j<_Instance.getNumMaterials();j++)
+	{
+		sint numStages = _Instance.getMaterial(j).getLastTextureStage() + 1;
+		for(sint l = 0; l < numStages; l++)
+		{
+			if (_Instance.getMaterial(j).isTextureFile((uint) l))
+			{
+				_Instance.getMaterial(j).setTextureFileName(texList[std::min((int)j, (int)texList.size()-1)], (uint) l);
+			}
+		}
+	}
+}
+
 // ----------------------------------------------------------------------------
 // CInterface3DCamera
 // ----------------------------------------------------------------------------

ryzom/client/src/interface_v3/interface_3d_scene.h

@@ -87,7 +87,7 @@ public:
 	void  setDistLimitMax(float limitMax) { _DistLimitMax = limitMax;}
 
 	int luaGetElement(CLuaState &ls);
-	
+
 	REFLECT_EXPORT_START(CInterface3DScene, CInterfaceGroup)
 		REFLECT_LUA_METHOD ("getElement", luaGetElement);
 		REFLECT_STRING ("curcam", getCurrentCamera, setCurrentCamera);
@@ -265,11 +265,15 @@ public:
 	std::string getName() const;
 	void        setName (const std::string &ht);
 
+	std::string getTextures() const;
+	void        setTextures (const std::string &textures);
+
 	float getBBoxSizeX () const;
 	float getBBoxSizeY () const;
 	float getBBoxSizeZ () const;
 
 
+
 	REFLECT_EXPORT_START(CInterface3DShape, CInterfaceElement)
 		REFLECT_FLOAT("getBBoxSizeX", getBBoxSizeX, setPosX);
 		REFLECT_FLOAT("getBBoxSizeY", getBBoxSizeY, setPosX);
@@ -281,6 +285,7 @@ public:
 		REFLECT_FLOAT ("roty", getRotY, setRotY);
 		REFLECT_FLOAT ("rotz", getRotZ, setRotZ);
 		REFLECT_STRING ("name", getName, setName);
+		REFLECT_STRING("textures", getTextures, setTextures);
 	REFLECT_EXPORT_END
 
 protected:
@@ -289,6 +294,7 @@ protected:
 	NLMISC::CVector _Pos;
 	NLMISC::CVector _Rot;
 	std::string _Name;
+	std::string _Textures;
 };
 
 /**
@@ -397,6 +403,15 @@ public:
 	float getTgtY()	const	{ return _Target.y; }
 	float getTgtZ()	const	{ return _Target.z; }
 
+	float getRotZ()	const	{ return _Rot.z; }
+	void setRotZ(float f)	{ _Rot.z = f; }
+
+	float getRotY()	const	{ return _Rot.y; }
+	void setRotY(float f)	{ _Rot.y = f; }
+
+	float getDist()	const	{ return _Dist; }
+	void setDist(float f)	{ _Dist = f; }
+
 	REFLECT_EXPORT_START(CInterface3DCamera, CInterfaceElement)
 		REFLECT_FLOAT ("posx", getPosX, setPosX);
 		REFLECT_FLOAT ("posy", getPosY, setPosY);
@@ -404,19 +419,13 @@ public:
 		REFLECT_FLOAT ("tgtx", getTgtX, setTgtX);
 		REFLECT_FLOAT ("tgty", getTgtY, setTgtY);
 		REFLECT_FLOAT ("tgtz", getTgtZ, setTgtZ);
+		REFLECT_FLOAT ("rotz", getRotZ, setRotZ);
+		REFLECT_FLOAT ("roty", getRotY, setRotY);
+		REFLECT_FLOAT ("dist", getDist, setDist);
 		REFLECT_FLOAT ("fov", getFOV, setFOV);
 		REFLECT_FLOAT ("roll", getRoll, setRoll);
 	REFLECT_EXPORT_END
 
-	float getRotZ()	const	{ return _Rot.z; }
-	void setRotZ(float f)	{ _Rot.z = f; }
-
-	float getRotY()	const	{ return _Rot.y; }
-	void setRotY(float f)	{ _Rot.y = f; }
-
-	float getDist()	const	{ return _Dist; }
-	void setDist(float f)	{ _Dist = f; }
-
 	void reset(); // Reset user interaction
 
 protected:

ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -2903,32 +2903,6 @@ class CHandlerInvCanDropTo : public IActionHandler
 		if ((pListDstText != NULL) || (pListDstIcon != NULL))
 		{
 			bool bCanDrop = true;
-			// WE CANT DND if we want to dnd from other bag than BAG to guild bag
-			if (pListDstIcon != NULL)
-			{
-				if (pListDstIcon->getInvType() == CInventoryManager::InvGuild)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"LOCAL:INVENTORY:BAG", 19) != 0)
-						bCanDrop = false;
-			}
-			if (pListDstText != NULL)
-			{
-				if (pListDstText->getInvType() == CInventoryManager::InvGuild)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"LOCAL:INVENTORY:BAG", 19) != 0)
-						bCanDrop = false;
-			}
-			// WE CANT DND if we want to dnd from guild bag to other bag than BAG
-			if (pListDstIcon != NULL)
-			{
-				if (pListDstIcon->getInvType() != CInventoryManager::InvBag)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"SERVER:GUILD:INVENTORY", 19) == 0)
-						bCanDrop = false;
-			}
-			if (pListDstText != NULL)
-			{
-				if (pListDstText->getInvType() != CInventoryManager::InvBag)
-					if (strnicmp(pCSSrc->getSheet().c_str(),"SERVER:GUILD:INVENTORY", 19) == 0)
-						bCanDrop = false;
-			}
 
 			// WE CANT DND when packer/mount is too far
 			if (pListDstIcon != NULL)
@@ -3100,7 +3074,6 @@ class CHandlerInvDropTo : public IActionHandler
 					else if (((pListDstText != NULL) && (pListDstText->getInvType() == CInventoryManager::InvGuild)) ||
 							 ((pListDstIcon != NULL) && (pListDstIcon->getInvType() == CInventoryManager::InvGuild)))
 					{
-						if (strnicmp(pCSSrc->getSheet().c_str(), "LOCAL:INVENTORY:BAG", 19) == 0)
 							CAHManager::getInstance()->runActionHandler("proc", pCSSrc, "move_to_guild");
 					}
 					else if (((pListDstText != NULL) && (pListDstText->getInvType() == CInventoryManager::InvRoom)) ||

ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp

@@ -2420,15 +2420,13 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 			texture = "";
 		}
 
+		std::vector<string>texList;
+		if (!texture.empty())
+			splitString(texture, " ", texList);
+
 		for(uint j=0;j<instance.getNumMaterials();j++)
 		{
-			if (!highlight)
-			{
-				/*instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
-				instance.getMaterial(j).setEmissive(CRGBA(255,255,255,255));
-				instance.getMaterial(j).setShininess(10.0f);*/
-			}
-			else
+			if (highlight)
 			{
 				instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
 				instance.getMaterial(j).setEmissive(CRGBA(255,0,0,255));
@@ -2441,9 +2439,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 				for(sint l = 0; l < numStages; l++)
 				{
 					if (instance.getMaterial(j).isTextureFile((uint) l))
-					{
-						instance.getMaterial(j).setTextureFileName(texture, (uint) l);
-					}
+						instance.getMaterial(j).setTextureFileName(texList[std::min((int)j, (int)texList.size()-1)], (uint) l);
 				}
 			}
 		}

ryzom/client/src/string_manager_client.cpp

@@ -1630,7 +1630,7 @@ const char *CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CSheetI
 const char *CStringManagerClient::getTitleLocalizedName(const string &titleId, bool women)
 {
 	vector<string> listInfos = getTitleInfos(titleId, women);
-	
+
 	if (!listInfos.empty())
 	{
 		_TitleWords.push_back(listInfos[0]);
@@ -1681,7 +1681,19 @@ vector<string> CStringManagerClient::getTitleInfos(const string &titleId, bool w
 	{
 		if (titleId[0] != '#')
 		{
-			listInfos[0] = getSpecialWord(listInfos[0], women);
+			// Check special case like SON_OF|jane|joe (with SON_OF = "Son of {1} and {2}")
+			vector<string> titleReps;
+			splitString(listInfos[0], string("|"), titleReps);
+			if (titleReps.size() > 1)
+			{
+				listInfos[0] = getSpecialWord(titleReps[0], women);
+				for(uint i=1; i < titleReps.size(); ++i )
+				{
+					while(strFindReplace(listInfos[0], toString("{%d}", i), titleReps[i]));
+				}
+			}
+			else
+				listInfos[0] = getSpecialWord(listInfos[0], women);
 		}
 	}