OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Merge pull request #241 from Hoikas/camstack

Browse Source 
PtGetCameraNumber() fixes
This commit is contained in:
Branan Purvine-Riley
2012-12-26 19:35:46 -08:00
parent c17ca9f9db 8091fffa1d
commit 675493cf36
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
View File

@ -226,8 +226,11 @@ plVirtualCam1::~plVirtualCam1()
// for saving camera stack
plCameraModifier1* plVirtualCam1::GetCameraNumber(size_t camNumber)
{
return (fCameraStack[camNumber]);
{
if (fCameraStack.size() > camNumber)
return fCameraStack[camNumber];
else
return nil;
}
// for rebuilding camera stack
void plVirtualCam1::RebuildStack(const plKey& key)

10
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
View File

@ -2459,14 +2459,14 @@ int cyMisc::GetNumCameras()
return (plVirtualCam1::Instance()->GetNumCameras());
}
const char* cyMisc::GetCameraNumber(int number)
plString cyMisc::GetCameraNumber(int number)
{
plCameraModifier1* pCam = plVirtualCam1::Instance()->GetCameraNumber(number-1);
if (pCam->GetTarget())
if (pCam && pCam->GetTarget())
{
const char* ret = pCam->GetTarget()->GetKeyName().c_str();
plString str = plString::Format("saving camera named %s to chronicle\n",ret);
plVirtualCam1::Instance()->AddMsgToLog(str.c_str());
plString ret = pCam->GetTarget()->GetKeyName();
plString log = plString::Format("saving camera named %s to chronicle\n", ret.c_str());
plVirtualCam1::Instance()->AddMsgToLog(log.c_str());
return ret;
}
plVirtualCam1::Instance()->AddMsgToLog("sending empty to camera chronicle\n");

2
Sources/Plasma/FeatureLib/pfPython/cyMisc.h
View File

@ -809,7 +809,7 @@ public:
//
static int GetNumCameras();
static const char* GetCameraNumber(int number);
static plString GetCameraNumber(int number);
static void RebuildCameraStack(const plString& name, const char* ageName);
static void PyClearCameraStack();
static void RecenterCamera();

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
View File

@ -337,7 +337,7 @@ PYTHON_GLOBAL_METHOD_DEFINITION(PtGetCameraNumber, args, "Params: x\nReturns cam
PyErr_SetString(PyExc_TypeError, "PtGetCameraNumber expects an int");
PYTHON_RETURN_ERROR;
}
return PyString_FromString(cyMisc::GetCameraNumber(x));
return PyString_FromPlString(cyMisc::GetCameraNumber(x));
}
PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetNumCameras, "returns camera stack size")