Build 912

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp

@@ -133,8 +133,12 @@ void plWalkingController::RecalcVelocity(double timeNow, double timePrev, hsBool
 
 	if (fController && !fWalkingStrategy->IsOnGround())
 	{
+		// PhysX Hack
+		// LinearVelocity is always (0,0,0) outside the PhysController
 		fImpactTime = fWalkingStrategy->GetAirTime();
-		fImpactVelocity = fController->GetLinearVelocity();
+		fImpactVelocity = fController->GetAchievedLinearVelocity();
+		// convert orientation from subworld to avatar-local coordinates
+		fImpactVelocity = (hsVector3)fController->GetLocalRotation().Rotate(&fImpactVelocity);
 		fClearImpact = false;
 	}
 	else

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp

@@ -1232,24 +1232,21 @@ hsBool plClothingOutfit::MsgReceive(plMessage* msg)
 		if (fAvatar && fGroup != plClothingMgr::kClothingBaseNoOptions)
 		{
 			plDrawable *spans = fAvatar->FindDrawable();
-			const hsBounds3Ext &bnds = spans->GetWorldBounds();
-			if (bnds.GetType() == kBoundsNormal)
-			{
-				// This is a bit hacky... The drawable code has just run through and updated
-				// each span's bounds (see plDrawableSpans::IUpdateMatrixPaletteBoundsHack())
-				// but not the world bounds for the entire drawable. So we tell the space tree
-				// to refresh. However, the pageTreeMgr would then get confused because the
-				// space tree is no longer dirty (see plPageTreeMgr::IRefreshTree()), 
-				// causing the avatar to only draw if the origin is in view. 
-				// So we just force it dirty, and everyone's happy.
-				spans->GetSpaceTree()->Refresh();
-				spans->GetSpaceTree()->MakeDirty();
+			// This is a bit hacky... The drawable code has just run through and updated
+			// each span's bounds (see plDrawableSpans::IUpdateMatrixPaletteBoundsHack())
+			// but not the world bounds for the entire drawable. So we tell the space tree
+			// to refresh. However, the pageTreeMgr would then get confused because the
+			// space tree is no longer dirty (see plPageTreeMgr::IRefreshTree()), 
+			// causing the avatar to only draw if the origin is in view. 
+			// So we just force it dirty, and everyone's happy.
+			spans->GetSpaceTree()->Refresh();
+			spans->GetSpaceTree()->MakeDirty();
 
-				// Where were we? Oh yeah... if this avatar is in view it needs a texture. Tell
-				// the pipeline.
-				if (preMsg->Pipeline()->TestVisibleWorld(spans->GetSpaceTree()->GetWorldBounds()))
-					preMsg->Pipeline()->SubmitClothingOutfit(this);				
-			}
+			// Where were we? Oh yeah... if this avatar is in view it needs a texture. Tell
+			// the pipeline.
+			const hsBounds3Ext &bnds = spans->GetSpaceTree()->GetWorldBounds();
+			if ((bnds.GetType() == kBoundsNormal) && preMsg->Pipeline()->TestVisibleWorld(bnds))
+				preMsg->Pipeline()->SubmitClothingOutfit(this);
 		}
 	}
  

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.h

@@ -147,6 +147,7 @@ public:
 	virtual void CheckAndHandleAnyStateChanges();
 	virtual void UpdateSubstepNonPhysical();
 	virtual const hsPoint3& GetLocalPosition()=0;
+	const hsQuat& GetLocalRotation() { return fLocalRotation; }
 	virtual void MoveActorToSim();
 	
 	virtual void OverrideAchievedVelocity(hsVector3 newAchievedVel)

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.cpp

@@ -0,0 +1,113 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+or by snail mail at:
+Cyan Worlds, Inc.
+14617 N Newport Hwy
+Mead, WA   99021
+
+*==LICENSE==*/
+
+#include "HeadSpin.h"
+#include "plClipboard.h"
+
+plClipboard& plClipboard::GetInstance()
+{
+	static plClipboard theInstance;
+	return theInstance;
+}
+
+bool plClipboard::IsTextInClipboard() 
+{
+#ifdef HS_BUILD_FOR_WIN32
+	return ::IsClipboardFormatAvailable(CF_UNICODETEXT);
+#else
+	return false;
+#endif
+}
+
+wchar_t* plClipboard::GetClipboardText()
+{
+	if (!IsTextInClipboard()) 
+		return nil;
+
+#ifdef HS_BUILD_FOR_WIN32
+	if (!::OpenClipboard(NULL))
+		return nil;
+
+	HANDLE clipboardData = ::GetClipboardData(CF_UNICODETEXT);
+	size_t size = ::GlobalSize(clipboardData) / sizeof(wchar_t);
+	wchar_t* clipboardDataPtr = (wchar_t*)::GlobalLock(clipboardData);
+
+	wchar_t* result = new wchar_t[size];
+	wcsncpy(result, clipboardDataPtr, size);
+
+	::GlobalUnlock(clipboardData);	
+	::CloseClipboard();
+
+	return result;
+#else
+	return plString::Null;
+#endif	
+}
+
+void plClipboard::SetClipboardText(const wchar_t* text)
+{
+	if (text == nil)
+		return;
+#ifdef HS_BUILD_FOR_WIN32
+	size_t len = wcslen(text);
+
+	if (len == 0) 
+		return;
+
+	HGLOBAL copy = ::GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(wchar_t));
+	if (copy == NULL) 
+		return;
+
+	if (!::OpenClipboard(NULL))
+		return;
+
+	::EmptyClipboard();
+
+	wchar_t* target = (wchar_t*)::GlobalLock(copy);
+	wcsncpy(target, text, len + 1);
+	::GlobalUnlock(copy); 
+
+	::SetClipboardData(CF_UNICODETEXT, copy);
+	::CloseClipboard();
+#endif
+}
+

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plClipboard/plClipboard.h

@@ -0,0 +1,62 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+	  Cyan Worlds, Inc.
+	  14617 N Newport Hwy
+	  Mead, WA   99021
+
+*==LICENSE==*/
+
+#ifndef _plClipboard_h
+#define _plClipboard_h
+
+//// Class Definition /////////////////////////////////////////////////////////
+
+class plClipboard
+{
+	private:
+	
+		plClipboard() {}
+		plClipboard(const plClipboard& rhs) {}
+		
+	public:
+		bool IsTextInClipboard();
+		wchar_t* GetClipboardText();
+		void SetClipboardText(const wchar_t* text);
+		static plClipboard& GetInstance( void );
+};
+
+#endif // _Clipboard_h

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp

@@ -263,9 +263,9 @@ void plUnifiedTime::ToCurrentTime()
 	SetToUTC();
 }
 
-hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec, int dst)
+hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec)
 {
-	if( !SetTime( year, month, day, hour, minute, second, usec, dst ) )
+	if( !SetTime( year, month, day, hour, minute, second, usec, 0 ) )
 		return false;
 
 	fSecs -= IGetLocalTimeZoneOffset();

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.h

@@ -129,7 +129,7 @@ public:
 	void SetSecsDouble(double secs);
 	void SetMicros(const UInt32 micros) { fMicros = micros; }
 	hsBool SetTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
-	hsBool SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
+	hsBool SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0);
 	hsBool SetToUTC();
 	void ToCurrentTime();
 	void ToEpoch() { fSecs = 0; fMicros = 0;}