Menu
▾
▴
CVS: bzflag/src/bzflag bzflag.cxx, 2.62.2.8.2.13, 2.62.2.8.2.14 playing.cxx, 2.146.2.38.2.11, 2.146.2.38.2.12 playing.h, 2.13.2.1.2.6, 2.13.2.1.2.7
|
From: Tupone A. <at...@us...> - 2007-02-26 22:36:46
|
Update of /cvsroot/bzflag/bzflag/src/bzflag In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4279 Modified Files: Tag: v2_0_cs_branch bzflag.cxx playing.cxx playing.h Log Message: Moving the camera in an empty box, like is the tank Index: bzflag.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/bzflag/bzflag.cxx,v retrieving revision 2.62.2.8.2.13 retrieving revision 2.62.2.8.2.14 diff -w -u -r2.62.2.8.2.13 -r2.62.2.8.2.14 --- bzflag.cxx 25 Feb 2007 19:15:51 -0000 2.62.2.8.2.13 +++ bzflag.cxx 26 Feb 2007 22:36:41 -0000 2.62.2.8.2.14 @@ -573,7 +573,11 @@ { if (!RequestPlugins(GetObjectRegistry(), CS_REQUEST_VFS, + CS_REQUEST_ENGINE, + CS_REQUEST_FONTSERVER, CS_REQUEST_OPENGL3D, + CS_REQUEST_IMAGELOADER, + CS_REQUEST_LEVELLOADER, CS_REQUEST_REPORTER, CS_REQUEST_REPORTERLISTENER, CS_REQUEST_END)) @@ -1209,10 +1213,6 @@ void Bzflag::ProcessFrame() { - g2d->Clear(0); - // Tell 3D driver we're going to display 3D things. - if (!g3d->BeginDraw(CSDRAW_3DGRAPHICS)) - return; playing->drawFrame(); } Index: playing.cxx =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v retrieving revision 2.146.2.38.2.11 retrieving revision 2.146.2.38.2.12 diff -w -u -r2.146.2.38.2.11 -r2.146.2.38.2.12 --- playing.cxx 25 Feb 2007 22:14:31 -0000 2.146.2.38.2.11 +++ playing.cxx 26 Feb 2007 22:36:42 -0000 2.146.2.38.2.12 @@ -4973,6 +4973,13 @@ void Playing::drawFrame() { + g2d->Clear(0); + // Tell 3D driver we're going to display 3D things. + if (!g3d->BeginDraw(CSDRAW_3DGRAPHICS)) + return; + view->Draw(); + return; + // get media object static BzfMedia* media = PlatformFactory::getMedia(); @@ -5884,6 +5891,11 @@ moveSoundReceiver(eyePoint[0], eyePoint[1], eyePoint[2], 0.0, false); } + csVector3 camera_pos(eyePoint[0], -eyePoint[1], eyePoint[2]); + csVector3 look_at_pos(targetPoint[0], -targetPoint[1], targetPoint[2]); + csVector3 up(0, 0, 1); + view->GetCamera()->GetTransform().SetOrigin(camera_pos); + view->GetCamera()->GetTransform().LookAt(look_at_pos - camera_pos, up); } @@ -6123,6 +6135,45 @@ controlPanel->render(*sceneRenderer); } +bool Playing::SetupModules() +{ + // Now get the pointer to various modules we need. We fetch them + // from the object registry. The RequestPlugins() call we did earlier + // registered all loaded plugins with the object registry. + engine = csQueryRegistry<iEngine> + (csApplicationFramework::GetObjectRegistry()); + if (!engine) + return csApplicationFramework::ReportError + ("Failed to locate 3D Engine!"); + + loader = csQueryRegistry<iLoader> + (csApplicationFramework::GetObjectRegistry()); + if (!loader) + return csApplicationFramework::ReportError + ("Failed to locate Loader!"); + + g3d = csQueryRegistry<iGraphics3D> + (csApplicationFramework::GetObjectRegistry()); + if (!g3d) + return csApplicationFramework::ReportError + ("Failed to locate 3D renderer!"); + + g2d = g3d->GetDriver2D(); + + kbd = csQueryRegistry<iKeyboardDriver> + (csApplicationFramework::GetObjectRegistry()); + if (!kbd) + return csApplicationFramework::ReportError + ("Failed to locate Keyboard Driver!"); + + vc = csQueryRegistry<iVirtualClock> + (csApplicationFramework::GetObjectRegistry()); + if (!vc) + return csApplicationFramework::ReportError + ("Failed to locate Virtual Clock!"); + + return true; +} Playing::Playing(BzfDisplay *_display, SceneRenderer &renderer) @@ -6131,14 +6182,13 @@ _hud(_display, renderer), background(renderer) { + SetupModules(); + // initalization display = _display; sceneRenderer = &renderer; mainWindow = &sceneRenderer->getWindow(); - g2d = CS_QUERY_REGISTRY(csApplicationFramework::GetObjectRegistry(), - iGraphics2D); - lastObserverUpdateTime = TimeKeeper::getCurrent().getSeconds(); // register some commands @@ -6444,6 +6494,35 @@ updateDaylight(epochOffset, *sceneRenderer); worldDownLoader = new WorldDownLoader; + + // We need a View to the virtual world. + view.AttachNew(new csView(engine, g3d)); + + // We use the full window to draw the world. + view->SetRectangle(0, 0, g2d->GetWidth(), g2d->GetHeight()); + + // First disable the lighting cache. Our app is simple enough + // not to need this. + engine->SetLightingCacheMode(0); + + // Here we create our world. + CreateRoom(); + + // Let the engine prepare all lightmaps for use and also free all images + // that were loaded for the texture manager. + engine->Prepare(); + + // Now we need to position the camera in our world. + view->GetCamera()->SetSector(room); + + // We use some other "helper" event handlers to handle + // pushing our work into the 3D engine and rendering it + // to the screen. + drawer.AttachNew(new FrameBegin3DDraw + (csApplicationFramework::GetObjectRegistry(), view)); + printer.AttachNew(new FramePrinter + (csApplicationFramework::GetObjectRegistry())); + } Playing::~Playing() @@ -6484,6 +6563,39 @@ cleanWorldCache(); } +void Playing::CreateRoom () +{ + // Load the texture from the standard library. This is located in + // CS/data/standard.zip and mounted as /lib/std using the Virtual + // File System (VFS) plugin. + if (!loader->LoadTexture("stone", "/lib/std/stone4.gif")) + csApplicationFramework::ReportError("Error loading 'stone4' texture!"); + + iMaterialWrapper* tm = engine->GetMaterialList()->FindByName("stone"); + + // We create a new sector called "room". + room = engine->CreateSector("room"); + + // Creating the walls for our room. + csRef<iMeshWrapper> walls(engine->CreateSectorWallsMesh(room, "walls")); + iMeshObject *walls_object = walls->GetMeshObject(); + iMeshObjectFactory *walls_factory = walls_object->GetFactory(); + csRef<iThingFactoryState> walls_state + = scfQueryInterface<iThingFactoryState>(walls_factory); + walls_state->AddInsideBox(csVector3(-400, -400, 0), + csVector3(400, 400, 20)); + walls_state->SetPolygonMaterial(CS_POLYRANGE_LAST, tm); + walls_state->SetPolygonTextureMapping(CS_POLYRANGE_LAST, 3); + + // Now we need light to see something. + csRef<iLight> light; + iLightList* ll = room->GetLights(); + + light = engine->CreateLight(0, csVector3(-3, 5, 0), 10, csColor(1, 0, 0)); + ll->Add(light); +} + + // Local Variables: *** // mode: C++ *** // tab-width: 8 *** Index: playing.h =================================================================== RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.h,v retrieving revision 2.13.2.1.2.6 retrieving revision 2.13.2.1.2.7 diff -w -u -r2.13.2.1.2.6 -r2.13.2.1.2.7 --- playing.h 25 Feb 2007 22:14:31 -0000 2.13.2.1.2.6 +++ playing.h 26 Feb 2007 22:36:42 -0000 2.13.2.1.2.7 @@ -125,15 +125,45 @@ float dt; private: + bool SetupModules(); + void CreateRoom(); + ControlPanel _controlPanel; RadarRenderer _radar; HUDRenderer _hud; BackgroundRenderer background; - csRef<iGraphics2D> g2d; GLfloat fov; GLfloat eyePoint[3]; GLfloat targetPoint[3]; + + /// A pointer to the 3D engine. + csRef<iEngine> engine; + + /// A pointer to the map loader plugin. + csRef<iLoader> loader; + + /// A pointer to the 3D renderer plugin. + csRef<iGraphics3D> g3d; + + /// A pointer to the 2D renderer plugin. + csRef<iGraphics2D> g2d; + + /// A pointer to the keyboard driver. + csRef<iKeyboardDriver> kbd; + + /// A pointer to the virtual clock. + csRef<iVirtualClock> vc; + + /// A pointer to the view which contains the camera. + csRef<iView> view; + + /// A pointer to the sector the camera will be in. + iSector *room; + + /// Event handlers to draw and print the 3D canvas on each frame + csRef<FrameBegin3DDraw> drawer; + csRef<FramePrinter> printer; }; #endif // BZF_PLAYING_H |
