AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved things into lobby from client. Sorted out a better (but still

Browse Source 
temporary) mechanism for getting into the first lobby after we logon.
Other cleanups.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@415 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-09 18:20:08 +00:00
parent 2653f9a416
commit 9884571f6e
8 changed files with 127 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/micasa/client/ClientController.java
+9 -84
View File
@@ -1,5 +1,5 @@
//
// $Id: ClientController.java,v 1.4 2001/10/09 17:47:33 mdb Exp $
// $Id: ClientController.java,v 1.5 2001/10/09 18:20:08 mdb Exp $
package com.threerings.micasa.client;
@@ -15,21 +15,16 @@ import com.threerings.cocktail.cher.net.UsernamePasswordCreds;
import com.threerings.cocktail.party.client.*;
import com.threerings.cocktail.party.data.*;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.micasa.Log;
import com.threerings.micasa.data.MiCasaBootstrapData;
import com.threerings.micasa.util.MiCasaContext;
/**
* The client controller is responsible for top-level control of the
* client user interface. It deals with locating and displaying the proper
* panels and controllers for particular user interface modes (walking
* around the world, puzzling, etc.) and it manages the side-bar controls
* as well.
* Responsible for top-level control of the client user interface.
*/
public class ClientController
extends Controller
implements ClientObserver, LocationObserver, OccupantObserver, Subscriber
implements ClientObserver
{
/**
* Creates a new client controller. The controller will set everything
@@ -44,19 +39,10 @@ public class ClientController
// we want to know about logon/logoff
_ctx.getClient().addObserver(this);
// we want to know about location changes
_ctx.getLocationDirector().addLocationObserver(this);
// we also want to know about occupant changes
_ctx.getOccupantManager().addOccupantObserver(this);
// create the logon panel and display it
_logonPanel = new LogonPanel(_ctx);
// _frame.setPanel(_logonPanel);
// create a sprite manager
_spritemgr = new SpriteManager();
// configure the client with some credentials and logon
String username = "bob" +
((int)(Math.random() * Integer.MAX_VALUE) % 500);
@@ -80,6 +66,11 @@ public class ClientController
// keep the body object around for stuff
_body = (BodyObject)client.getClientObject();
// head to the default lobby to start things off
MiCasaBootstrapData data = (MiCasaBootstrapData)
client.getBootstrapData();
_ctx.getLocationDirector().moveTo(data.defLobbyOid);
}
// documentation inherited
@@ -111,77 +102,11 @@ public class ClientController
System.exit(0);
}
// documentation inherited
public boolean locationMayChange (int placeId)
{
return true;
}
// documentation inherited
public void locationDidChange (PlaceObject place)
{
Log.info("Moved to new location [place=" + place + "].");
// clean up after the old place
if (_place != null) {
// dispatch didLeavePlace to our views
PlaceViewUtil.dispatchDidLeavePlace(_frame, _place);
_place.removeSubscriber(this);
}
_place = place;
// and enter the new place with bells on
if (_place != null) {
_place.addSubscriber(this);
// dispatch willEnterPlace to our views
PlaceViewUtil.dispatchWillEnterPlace(_frame, _place);
}
}
// documentation inherited
public void locationChangeFailed (int placeId, String reason)
{
Log.info("Location change failed [plid=" + placeId +
", reason=" + reason + "].");
}
public void occupantEntered (OccupantInfo info)
{
Log.info("New occupant " + info + ".");
}
public void occupantLeft (OccupantInfo info)
{
}
public void occupantUpdated (OccupantInfo info)
{
}
public void objectAvailable (DObject object)
{
// don't care
}
public void requestFailed (int oid, ObjectAccessException cause)
{
// don't care
}
public boolean handleEvent (DEvent event, DObject target)
{
return true;
}
protected MiCasaContext _ctx;
protected MiCasaFrame _frame;
protected BodyObject _body;
protected PlaceObject _place;
// managers
protected SpriteManager _spritemgr;
// our panels
protected LogonPanel _logonPanel;
}
src/java/com/threerings/micasa/client/MiCasaFrame.java
+5 -27
View File
@@ -1,5 +1,5 @@
//
// $Id: MiCasaFrame.java,v 1.2 2001/10/09 17:47:33 mdb Exp $
// $Id: MiCasaFrame.java,v 1.3 2001/10/09 18:20:08 mdb Exp $
package com.threerings.micasa.client;
@@ -10,19 +10,17 @@ import com.samskivert.swing.Controller;
import com.samskivert.swing.ControllerProvider;
/**
* The micasa frame contains the user interface for the MiCasa client
* application. It divides the screen into space for the primary panel and
* the side-bar controls and allows user interface elements to be placed
* in either region.
* Contains the user interface for the MiCasa client application.
*/
public class MiCasaFrame
extends JFrame implements ControllerProvider
{
/**
* Constructs the top-level MiCasa client frame.
*/
public MiCasaFrame ()
{
super("MiCasa Client");
// for now, quit if we're closed
// setDefaultCloseOperation(EXIT_ON_CLOSE);
}
/**
@@ -38,24 +36,6 @@ public class MiCasaFrame
validate();
}
/**
* Sets the match-making panel to be used when the lobby panel is
* being displayed.
*/
public void setMatchMakingPanel (JPanel panel)
{
_lopanel.setPrimary(panel);
}
/**
* Provides a reference to the lobby panel that will be used to
* provide our lobby interfaces.
*/
protected void setLobbyPanel (LobbyPanel panel)
{
_lopanel = panel;
}
/**
* Sets the controller for the outermost scope. This controller will
* handle all actions that aren't handled by controllers of tigher
@@ -73,6 +53,4 @@ public class MiCasaFrame
}
protected Controller _controller;
protected LobbyPanel _lopanel;
}