Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client/aws psaws.cpp,1.20,1.21 pscommwindow.cpp,1.13,1.14 pscomp.cpp,1.18,1.19 psinteractwin.cpp,1.5,1.6 psmainbar.h,1.1,1.2 psplayerwindow.cpp,1.12,1.13
|
From: Matze B. <mat...@us...> - 2002-08-29 21:55:23
|
Update of /cvsroot/planeshift/planeshift/src/client/aws
In directory usw-pr-cvs1:/tmp/cvs-serv20527/src/client/aws
Modified Files:
psaws.cpp pscommwindow.cpp pscomp.cpp psinteractwin.cpp
psmainbar.h psplayerwindow.cpp
Log Message:
converted planeshift to new csPtr class, however we have lots of leaks at the moment... I'll investigate later
Index: psaws.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/psaws.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** psaws.cpp 28 Aug 2002 22:14:56 -0000 1.20
--- psaws.cpp 29 Aug 2002 21:55:20 -0000 1.21
***************
*** 53,58 ****
textBoxSink = NULL;
mousePointer = NULL;
! int mouseX = 0;
! int mouseY = 0;
mode = iPSWindowMgr::NORMAL;
--- 53,58 ----
textBoxSink = NULL;
mousePointer = NULL;
! mouseX = 0;
! mouseY = 0;
mode = iPSWindowMgr::NORMAL;
***************
*** 91,100 ****
object_reg = objectReg;
! configmanager.Take (CS_QUERY_REGISTRY(objectReg, iConfigManager));
if (!configmanager)
return false;
// Load the main AWS plugin
! aws.Take (CS_QUERY_REGISTRY (object_reg, iAws));
if (!aws)
{
--- 91,100 ----
object_reg = objectReg;
! configmanager = CS_QUERY_REGISTRY(objectReg, iConfigManager);
if (!configmanager)
return false;
// Load the main AWS plugin
! aws = CS_QUERY_REGISTRY (object_reg, iAws);
if (!aws)
{
***************
*** 103,107 ****
}
! g3d.Take (CS_QUERY_REGISTRY (object_reg, iGraphics3D));
if (!g3d)
return false;
--- 103,107 ----
}
! g3d = CS_QUERY_REGISTRY (object_reg, iGraphics3D);
if (!g3d)
return false;
***************
*** 111,115 ****
return false;
! awsCanvas.Take (aws->CreateCustomCanvas(g2d, g3d));
if (!awsCanvas)
{
--- 111,115 ----
return false;
! awsCanvas = csPtr<iAwsCanvas> (aws->CreateCustomCanvas(g2d, g3d));
if (!awsCanvas)
{
***************
*** 127,136 ****
return false;
! defaultFont.Take
! (g2d->GetFontServer()->LoadFont("/fonts/ttf/scurlock12.csf"));
if (!defaultFont)
{
! defaultFont.Take
! (g2d->GetFontServer()->LoadFont(CSFONT_COURIER));
if (!defaultFont)
return false;
--- 127,136 ----
return false;
! defaultFont =
! g2d->GetFontServer()->LoadFont("/fonts/ttf/scurlock12.csf");
if (!defaultFont)
{
! defaultFont =
! g2d->GetFontServer()->LoadFont(CSFONT_COURIER);
if (!defaultFont)
return false;
***************
*** 171,175 ****
{
csRef<iPSEngine> psengine;
! psengine.Take (CS_QUERY_REGISTRY (object_reg, iPSEngine));
MsgHandler* msg = psengine->GetMsgHandler();
CmdHandler* ch = psengine->GetCmdHandler();
--- 171,175 ----
{
csRef<iPSEngine> psengine;
! psengine = CS_QUERY_REGISTRY (object_reg, iPSEngine);
MsgHandler* msg = psengine->GetMsgHandler();
CmdHandler* ch = psengine->GetCmdHandler();
***************
*** 257,266 ****
{
csRef<iVFS> vfs;
! vfs.Take (CS_QUERY_REGISTRY(object_reg, iVFS));
if (!vfs)
return false;
! csRef<iFile> file;
! file.Take (vfs->Open("/planeshift/data/guikeys.xml", VFS_FILE_READ));
if (!file)
--- 257,266 ----
{
csRef<iVFS> vfs;
! vfs = CS_QUERY_REGISTRY(object_reg, iVFS);
if (!vfs)
return false;
! csRef<iFile> file =
! vfs->Open("/planeshift/data/guikeys.xml", VFS_FILE_READ);
if (!file)
Index: pscommwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/pscommwindow.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pscommwindow.cpp 9 Aug 2002 11:46:00 -0000 1.13
--- pscommwindow.cpp 29 Aug 2002 21:55:20 -0000 1.14
***************
*** 57,61 ****
name = "Communication Window";
! soundmanager.Take (CS_QUERY_REGISTRY(objectReg, iSoundManager));
}
--- 57,61 ----
name = "Communication Window";
! soundmanager = CS_QUERY_REGISTRY(objectReg, iSoundManager);
}
***************
*** 119,123 ****
csRef<iPSEngine> psengine;
! psengine.Take (CS_QUERY_REGISTRY(objreg, iPSEngine));
int colour = psengine->GetG3D()->GetTextureManager()->FindRGB(204,194,12);
--- 119,123 ----
csRef<iPSEngine> psengine;
! psengine = CS_QUERY_REGISTRY(objreg, iPSEngine);
int colour = psengine->GetG3D()->GetTextureManager()->FindRGB(204,194,12);
***************
*** 296,301 ****
inputLine->GetProperty("Text", (void**)&String);
! csRef<iString> newStr;
! newStr.Take (new scfString(""));
inputLine->SetProperty("Text", newStr);
--- 296,300 ----
inputLine->GetProperty("Text", (void**)&String);
! csRef<iString> newStr = csPtr<iString> (new scfString(""));
inputLine->SetProperty("Text", newStr);
Index: pscomp.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/pscomp.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pscomp.cpp 28 Aug 2002 22:14:56 -0000 1.18
--- pscomp.cpp 29 Aug 2002 21:55:20 -0000 1.19
***************
*** 126,131 ****
// Get the default font from the PS window manager
csRef<iPSEngine> psengine;
! psengine.Take
! (CS_QUERY_REGISTRY (wmgr->GetObjectRegistry(), iPSEngine));
if ( !psengine )
return false;
--- 126,130 ----
// Get the default font from the PS window manager
csRef<iPSEngine> psengine;
! psengine = CS_QUERY_REGISTRY (wmgr->GetObjectRegistry(), iPSEngine);
if ( !psengine )
return false;
***************
*** 591,596 ****
}
!
! void psComponentImage::OnDraw( csRect clip )
{
iGraphics3D *g3d = WindowManager()->G3D();
--- 590,594 ----
}
! void psComponentImage::OnDraw( csRect )
{
iGraphics3D *g3d = WindowManager()->G3D();
Index: psinteractwin.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/psinteractwin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** psinteractwin.cpp 21 Aug 2002 17:14:10 -0000 1.5
--- psinteractwin.cpp 29 Aug 2002 21:55:20 -0000 1.6
***************
*** 141,146 ****
! csRef<iMouseDriver> mouse;
! mouse.Take (CS_QUERY_REGISTRY(object_reg, iMouseDriver));
int x = mouse->GetLastX();
--- 141,146 ----
! csRef<iMouseDriver> mouse =
! CS_QUERY_REGISTRY(object_reg, iMouseDriver);
int x = mouse->GetLastX();
***************
*** 176,181 ****
else if ( !strcmp(caption->GetData(), "Pickup") )
{
! csRef<iPSEngine> psengine;
! psengine.Take (CS_QUERY_REGISTRY(window->object_reg, iPSEngine));
iPSWindow* win = psengine->GetWindowManager()->GetPSWindow("Player Window");
--- 176,181 ----
else if ( !strcmp(caption->GetData(), "Pickup") )
{
! csRef<iPSEngine> psengine =
! CS_QUERY_REGISTRY(window->object_reg, iPSEngine);
iPSWindow* win = psengine->GetWindowManager()->GetPSWindow("Player Window");
Index: psmainbar.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/psmainbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** psmainbar.h 2 Aug 2002 23:30:59 -0000 1.1
--- psmainbar.h 29 Aug 2002 21:55:20 -0000 1.2
***************
*** 18,22 ****
void CreateSink ( iAws* aws );
! bool SendCommand( const char* cmd , void* param ) { return false; }
static void ToggleBar( void* sink, iAwsSource* source );
--- 18,22 ----
void CreateSink ( iAws* aws );
! bool SendCommand( const char* , void* ) { return false; }
static void ToggleBar( void* sink, iAwsSource* source );
Index: psplayerwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/aws/psplayerwindow.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** psplayerwindow.cpp 8 Aug 2002 14:13:56 -0000 1.12
--- psplayerwindow.cpp 29 Aug 2002 21:55:20 -0000 1.13
***************
*** 44,49 ****
name = "Player Window";
! csRef<iPSEngine> psengine;
! psengine.Take (CS_QUERY_REGISTRY(object_reg, iPSEngine));
psCelClient *cel = psengine->GetCelClient();
iCelPlLayer* pl = cel->GetPlLayer();
--- 44,49 ----
name = "Player Window";
! csRef<iPSEngine> psengine =
! CS_QUERY_REGISTRY(object_reg, iPSEngine);
psCelClient *cel = psengine->GetCelClient();
iCelPlLayer* pl = cel->GetPlLayer();
***************
*** 51,60 ****
iCelPropertyClass *pc;
! guiEntity.Take (pl->CreateEntity());
guiEntity->SetName ("GUI");
pc = pl->CreatePropertyClass(guiEntity, "pcmeshselect");
! guiBehaviour.Take (new psGUIBehaviour(this));
guiBehaviour->Initialize(guiEntity, object_reg);
guiBehaviour->SetName("GUIBehaviour");
--- 51,60 ----
iCelPropertyClass *pc;
! guiEntity = pl->CreateEntity();
guiEntity->SetName ("GUI");
pc = pl->CreatePropertyClass(guiEntity, "pcmeshselect");
! guiBehaviour = csPtr<psGUIBehaviour> (new psGUIBehaviour(this));
guiBehaviour->Initialize(guiEntity, object_reg);
guiBehaviour->SetName("GUIBehaviour");
***************
*** 87,92 ****
bool psPlayerWindow::Setup()
{
! csRef<iPSEngine> psengine;
! psengine.Take (CS_QUERY_REGISTRY(object_reg, iPSEngine));
psCelClient *cel = psengine->GetCelClient();
iCelEntity* mainActor = cel->GetMainActor();
--- 87,91 ----
bool psPlayerWindow::Setup()
{
! csRef<iPSEngine> psengine = CS_QUERY_REGISTRY(object_reg, iPSEngine);
psCelClient *cel = psengine->GetCelClient();
iCelEntity* mainActor = cel->GetMainActor();
***************
*** 96,109 ****
csRef<iPcMeshSelect> pcmeshselect;
! pcmeshselect.Take (CEL_QUERY_PROPCLASS(
guiEntity->GetPropertyClassList(),
! iPcMeshSelect));
if ( pcmeshselect == NULL )
return false;
csRef<iPcCamera> pccamera;
! pccamera.Take (CEL_QUERY_PROPCLASS(
mainActor->GetPropertyClassList(),
! iPcCamera));
if ( pccamera == NULL )
return false;
--- 95,108 ----
csRef<iPcMeshSelect> pcmeshselect;
! pcmeshselect = CEL_QUERY_PROPCLASS(
guiEntity->GetPropertyClassList(),
! iPcMeshSelect);
if ( pcmeshselect == NULL )
return false;
csRef<iPcCamera> pccamera;
! pccamera = CEL_QUERY_PROPCLASS(
mainActor->GetPropertyClassList(),
! iPcCamera);
if ( pccamera == NULL )
return false;
***************
*** 217,223 ****
// Notify the server of the selection
! csRef<iPcProximityList> selectedProx;
! selectedProx.Take (CEL_QUERY_PROPCLASS
! (selent->GetPropertyClassList(), iPcProximityList));
//make sure that there is an active actor entity available
--- 216,222 ----
// Notify the server of the selection
! csRef<iPcProximityList> selectedProx =
! CEL_QUERY_PROPCLASS
! (selent->GetPropertyClassList(), iPcProximityList);
//make sure that there is an active actor entity available
|