mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
2ccfaadef3
* Substantial re-work of object model. Moved many attributes out of BaseEntity class. Changed WoldRouter so it now handles objects in terms of Entity, rather than BaseEntity. * Code cleanups, including removing reduntant includes, and getting rid of C style comments. * Fixed the way attributes are handled in Set operations and when merging from an Atlas::Message::Object. This fixed problem with setting gender of characters. * rulesets/Pedestrian.*, rulesets/Movement.*: Re-named Movement variables to make them clearer. Added in separate handling for collisions from moving to target position. Modified collision handling so objects can slide next to each other. * rulesets/Thing.cpp, rulesets/Character.cpp: Cleaned up and rationalised movement code. Much shorter, faster and more compact than before. * Made better use of iterators throughout, eliminating unnecessary lookups, and copying of data. * Moved all virtual functions out of header files, making less work for the linker. * Made more use of const references to avoid the need to copy data before being able to inspect it. Al Riddoch <alriddoch@zepler.org>
48 lines
1.1 KiB
C++
48 lines
1.1 KiB
C++
// This file may be redistributed and modified only under the terms of
|
|
// the GNU General Public License (See COPYING for details).
|
|
// Copyright (C) 2000,2001 Alistair Riddoch
|
|
|
|
#include <Atlas/Objects/Root.h>
|
|
#include <Atlas/Objects/Operation/Login.h>
|
|
|
|
#include <Atlas/Message/Object.h>
|
|
|
|
#include <physics/Vector3D.h>
|
|
|
|
#include <streambuf.h> // Simplest source of NULL
|
|
|
|
#include "Location.h"
|
|
|
|
#include <rulesets/Entity.h>
|
|
|
|
using Atlas::Message::Object;
|
|
|
|
Vector3D Location::getXyz() const {
|
|
if (ref && coords) {
|
|
return coords + ref->getXyz();
|
|
} else {
|
|
return Vector3D(0,0,0);
|
|
}
|
|
}
|
|
|
|
void Location::addToObject(Object & obj) const
|
|
{
|
|
Object::MapType & omap = obj.AsMap();
|
|
if (ref!=NULL) {
|
|
omap["loc"] = Object(ref->fullid);
|
|
} else {
|
|
omap["loc"] = Object("");
|
|
}
|
|
if (coords) {
|
|
omap["pos"] = coords.asObject();
|
|
}
|
|
if (velocity) {
|
|
omap["velocity"] = velocity.asObject();
|
|
}
|
|
if (face) {
|
|
omap["face"] = face.asObject();
|
|
}
|
|
if (bbox) {
|
|
omap["bbox"] = bbox.asObject();
|
|
}
|
|
}
|