mirror of https://github.com/OpenMW/openmw.git
resolving conflicts
greye
13 years ago
commit
38b06aee6c
@ -0,0 +1,46 @@
|
|||||||
|
#ifndef GAME_MWBASE_DIALOGUEMANAGER_H
|
||||||
|
#define GAME_MWBASE_DIALOGUEMANAGER_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace MWWorld
|
||||||
|
{
|
||||||
|
class Ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWBase
|
||||||
|
{
|
||||||
|
/// \brief Interface for dialogue manager (implemented in MWDialogue)
|
||||||
|
class DialogueManager
|
||||||
|
{
|
||||||
|
DialogueManager (const DialogueManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
DialogueManager& operator= (const DialogueManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
DialogueManager() {}
|
||||||
|
|
||||||
|
virtual ~DialogueManager() {}
|
||||||
|
|
||||||
|
virtual void startDialogue (const MWWorld::Ptr& actor) = 0;
|
||||||
|
|
||||||
|
virtual void addTopic (const std::string& topic) = 0;
|
||||||
|
|
||||||
|
virtual void askQuestion (const std::string& question,int choice) = 0;
|
||||||
|
|
||||||
|
virtual void goodbye() = 0;
|
||||||
|
|
||||||
|
///get the faction of the actor you are talking with
|
||||||
|
virtual std::string getFaction() const = 0;
|
||||||
|
|
||||||
|
//calbacks for the GUI
|
||||||
|
virtual void keywordSelected (const std::string& keyword) = 0;
|
||||||
|
virtual void goodbyeSelected() = 0;
|
||||||
|
virtual void questionAnswered (const std::string& answer) = 0;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,76 @@
|
|||||||
|
#ifndef GAME_MWBASE_JOURNAL_H
|
||||||
|
#define GAME_MWBASE_JOURNAL_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <deque>
|
||||||
|
#include <map>
|
||||||
|
|
||||||
|
namespace MWDialogue
|
||||||
|
{
|
||||||
|
class Quest;
|
||||||
|
class Topic;
|
||||||
|
struct StampedJournalEntry;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWBase
|
||||||
|
{
|
||||||
|
/// \brief Interface for the player's journal (implemented in MWDialogue)
|
||||||
|
class Journal
|
||||||
|
{
|
||||||
|
Journal (const Journal&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
Journal& operator= (const Journal&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
typedef std::deque<MWDialogue::StampedJournalEntry> TEntryContainer;
|
||||||
|
typedef TEntryContainer::const_iterator TEntryIter;
|
||||||
|
typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topc, quest
|
||||||
|
typedef TQuestContainer::const_iterator TQuestIter;
|
||||||
|
typedef std::map<std::string, MWDialogue::Topic> TTopicContainer; // topic-id, topic-content
|
||||||
|
typedef TTopicContainer::const_iterator TTopicIter;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
Journal() {}
|
||||||
|
|
||||||
|
virtual ~Journal() {}
|
||||||
|
|
||||||
|
virtual void addEntry (const std::string& id, int index) = 0;
|
||||||
|
///< Add a journal entry.
|
||||||
|
|
||||||
|
virtual void setJournalIndex (const std::string& id, int index) = 0;
|
||||||
|
///< Set the journal index without adding an entry.
|
||||||
|
|
||||||
|
virtual int getJournalIndex (const std::string& id) const = 0;
|
||||||
|
///< Get the journal index.
|
||||||
|
|
||||||
|
virtual void addTopic (const std::string& topicId, const std::string& infoId) = 0;
|
||||||
|
|
||||||
|
virtual TEntryIter begin() const = 0;
|
||||||
|
///< Iterator pointing to the begin of the main journal.
|
||||||
|
///
|
||||||
|
/// \note Iterators to main journal entries will never become invalid.
|
||||||
|
|
||||||
|
virtual TEntryIter end() const = 0;
|
||||||
|
///< Iterator pointing past the end of the main journal.
|
||||||
|
|
||||||
|
virtual TQuestIter questBegin() const = 0;
|
||||||
|
///< Iterator pointing to the first quest (sorted by topic ID)
|
||||||
|
|
||||||
|
virtual TQuestIter questEnd() const = 0;
|
||||||
|
///< Iterator pointing past the last quest.
|
||||||
|
|
||||||
|
virtual TTopicIter topicBegin() const = 0;
|
||||||
|
///< Iterator pointing to the first topic (sorted by topic ID)
|
||||||
|
///
|
||||||
|
/// \note The topic ID is identical with the user-visible topic string.
|
||||||
|
|
||||||
|
virtual TTopicIter topicEnd() const = 0;
|
||||||
|
///< Iterator pointing past the last topic.
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
#ifndef GAME_MWBASE_SCRIPTMANAGER_H
|
||||||
|
#define GAME_MWBASE_SCRIPTMANAGER_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace Interpreter
|
||||||
|
{
|
||||||
|
class Context;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Compiler
|
||||||
|
{
|
||||||
|
class Locals;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWScript
|
||||||
|
{
|
||||||
|
class GlobalScripts;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWBase
|
||||||
|
{
|
||||||
|
/// \brief Interface for script manager (implemented in MWScript)
|
||||||
|
class ScriptManager
|
||||||
|
{
|
||||||
|
ScriptManager (const ScriptManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
ScriptManager& operator= (const ScriptManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
ScriptManager() {}
|
||||||
|
|
||||||
|
virtual ~ScriptManager() {}
|
||||||
|
|
||||||
|
virtual void run (const std::string& name, Interpreter::Context& interpreterContext) = 0;
|
||||||
|
///< Run the script with the given name (compile first, if not compiled yet)
|
||||||
|
|
||||||
|
virtual bool compile (const std::string& name) = 0;
|
||||||
|
///< Compile script with the given namen
|
||||||
|
/// \return Success?
|
||||||
|
|
||||||
|
virtual std::pair<int, int> compileAll() = 0;
|
||||||
|
///< Compile all scripts
|
||||||
|
/// \return count, success
|
||||||
|
|
||||||
|
virtual Compiler::Locals& getLocals (const std::string& name) = 0;
|
||||||
|
///< Return locals for script \a name.
|
||||||
|
|
||||||
|
virtual MWScript::GlobalScripts& getGlobalScripts() = 0;
|
||||||
|
|
||||||
|
virtual int getLocalIndex (const std::string& scriptId, const std::string& variable,
|
||||||
|
char type) = 0;
|
||||||
|
///< Return index of the variable of the given name and type in the given script. Will
|
||||||
|
/// throw an exception, if there is no such script or variable or the type does not match.
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,129 @@
|
|||||||
|
#ifndef GAME_MWBASE_SOUNDMANAGER_H
|
||||||
|
#define GAME_MWBASE_SOUNDMANAGER_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
|
#include <components/settings/settings.hpp>
|
||||||
|
|
||||||
|
#include "../mwworld/ptr.hpp"
|
||||||
|
|
||||||
|
namespace Ogre
|
||||||
|
{
|
||||||
|
class Vector3;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWWorld
|
||||||
|
{
|
||||||
|
class CellStore;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWSound
|
||||||
|
{
|
||||||
|
class Sound;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWBase
|
||||||
|
{
|
||||||
|
typedef boost::shared_ptr<MWSound::Sound> SoundPtr;
|
||||||
|
|
||||||
|
/// \brief Interface for sound manager (implemented in MWSound)
|
||||||
|
class SoundManager
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
enum PlayMode {
|
||||||
|
Play_Normal = 0, /* tracked, non-looping, multi-instance, environment */
|
||||||
|
Play_Loop = 1<<0, /* Sound will continually loop until explicitly stopped */
|
||||||
|
Play_NoEnv = 1<<1, /* Do not apply environment effects (eg, underwater filters) */
|
||||||
|
Play_NoTrack = 1<<2, /* (3D only) Play the sound at the given object's position
|
||||||
|
* but do not keep it updated (the sound will not move with
|
||||||
|
* the object and will not stop when the object is deleted. */
|
||||||
|
};
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
SoundManager (const SoundManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
SoundManager& operator= (const SoundManager&);
|
||||||
|
///< not implemented
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
SoundManager() {}
|
||||||
|
|
||||||
|
virtual ~SoundManager() {}
|
||||||
|
|
||||||
|
virtual void processChangedSettings(const Settings::CategorySettingVector& settings) = 0;
|
||||||
|
|
||||||
|
virtual void stopMusic() = 0;
|
||||||
|
///< Stops music if it's playing
|
||||||
|
|
||||||
|
virtual void streamMusic(const std::string& filename) = 0;
|
||||||
|
///< Play a soundifle
|
||||||
|
/// \param filename name of a sound file in "Music/" in the data directory.
|
||||||
|
|
||||||
|
virtual void startRandomTitle() = 0;
|
||||||
|
///< Starts a random track from the current playlist
|
||||||
|
|
||||||
|
virtual bool isMusicPlaying() = 0;
|
||||||
|
///< Returns true if music is playing
|
||||||
|
|
||||||
|
virtual void playPlaylist(const std::string &playlist) = 0;
|
||||||
|
///< Start playing music from the selected folder
|
||||||
|
/// \param name of the folder that contains the playlist
|
||||||
|
|
||||||
|
virtual void say(MWWorld::Ptr reference, const std::string& filename) = 0;
|
||||||
|
///< Make an actor say some text.
|
||||||
|
/// \param filename name of a sound file in "Sound/" in the data directory.
|
||||||
|
|
||||||
|
virtual void say(const std::string& filename) = 0;
|
||||||
|
///< Say some text, without an actor ref
|
||||||
|
/// \param filename name of a sound file in "Sound/" in the data directory.
|
||||||
|
|
||||||
|
virtual bool sayDone(MWWorld::Ptr reference=MWWorld::Ptr()) const = 0;
|
||||||
|
///< Is actor not speaking?
|
||||||
|
|
||||||
|
virtual void stopSay(MWWorld::Ptr reference=MWWorld::Ptr()) = 0;
|
||||||
|
///< Stop an actor speaking
|
||||||
|
|
||||||
|
virtual SoundPtr playSound(const std::string& soundId, float volume, float pitch,
|
||||||
|
int mode=Play_Normal) = 0;
|
||||||
|
///< Play a sound, independently of 3D-position
|
||||||
|
|
||||||
|
virtual SoundPtr playSound3D(MWWorld::Ptr reference, const std::string& soundId,
|
||||||
|
float volume, float pitch, int mode=Play_Normal) = 0;
|
||||||
|
///< Play a sound from an object
|
||||||
|
|
||||||
|
virtual void stopSound3D(MWWorld::Ptr reference, const std::string& soundId) = 0;
|
||||||
|
///< Stop the given object from playing the given sound,
|
||||||
|
|
||||||
|
virtual void stopSound3D(MWWorld::Ptr reference) = 0;
|
||||||
|
///< Stop the given object from playing all sounds.
|
||||||
|
|
||||||
|
virtual void stopSound(const MWWorld::CellStore *cell) = 0;
|
||||||
|
///< Stop all sounds for the given cell.
|
||||||
|
|
||||||
|
virtual void stopSound(const std::string& soundId) = 0;
|
||||||
|
///< Stop a non-3d looping sound
|
||||||
|
|
||||||
|
virtual bool getSoundPlaying(MWWorld::Ptr reference, const std::string& soundId) const = 0;
|
||||||
|
///< Is the given sound currently playing on the given object?
|
||||||
|
|
||||||
|
virtual void updateObject(MWWorld::Ptr reference) = 0;
|
||||||
|
///< Update the position of all sounds connected to the given object.
|
||||||
|
|
||||||
|
virtual void update(float duration) = 0;
|
||||||
|
|
||||||
|
virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
inline int operator|(SoundManager::PlayMode a, SoundManager::PlayMode b)
|
||||||
|
{ return static_cast<int> (a) | static_cast<int> (b); }
|
||||||
|
inline int operator&(SoundManager::PlayMode a, SoundManager::PlayMode b)
|
||||||
|
{ return static_cast<int> (a) & static_cast<int> (b); }
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
#include "journal.hpp"
|
#include "journalimp.hpp"
|
||||||
|
|
||||||
#include "../mwbase/environment.hpp"
|
#include "../mwbase/environment.hpp"
|
||||||
#include "../mwbase/world.hpp"
|
#include "../mwbase/world.hpp"
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
#include "mouselookevent.hpp"
|
||||||
|
|
||||||
|
#include "../mwbase/environment.hpp"
|
||||||
|
#include "../mwbase/world.hpp"
|
||||||
|
|
||||||
|
#include "../mwworld/player.hpp"
|
||||||
|
|
||||||
|
#include <OIS/OIS.h>
|
||||||
|
#include <OgreCamera.h>
|
||||||
|
#include <OgreSceneNode.h>
|
||||||
|
|
||||||
|
using namespace OIS;
|
||||||
|
using namespace MWInput;
|
||||||
|
|
||||||
|
void MouseLookEvent::event(Type type, int index, const void *p)
|
||||||
|
{
|
||||||
|
if (type != EV_MouseMove || mDisabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseEvent *arg = (MouseEvent*)(p);
|
||||||
|
|
||||||
|
float x = arg->state.X.rel * sensX;
|
||||||
|
float y = arg->state.Y.rel * sensY;
|
||||||
|
|
||||||
|
MWBase::World *world = MWBase::Environment::get().getWorld();
|
||||||
|
world->rotateObject(world->getPlayer().getPlayer(), -y, 0.f, x, true);
|
||||||
|
}
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
#ifndef _MWINPUT_MOUSELOOKEVENT_H
|
||||||
|
#define _MWINPUT_MOUSELOOKEVENT_H
|
||||||
|
|
||||||
|
/*
|
||||||
|
A mouse-look class for Ogre. Accepts input events from Mangle::Input
|
||||||
|
and translates them.
|
||||||
|
|
||||||
|
You can adjust the mouse sensibility and switch to a different
|
||||||
|
camera. The mouselook class also has an optional wrap protection
|
||||||
|
that keeps the camera from flipping upside down.
|
||||||
|
|
||||||
|
You can disable the mouse looker at any time by calling
|
||||||
|
setCamera(NULL), and reenable it by setting the camera back.
|
||||||
|
|
||||||
|
NOTE: The current implementation will ONLY work for native OIS
|
||||||
|
events.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <mangle/input/event.hpp>
|
||||||
|
|
||||||
|
namespace MWInput
|
||||||
|
{
|
||||||
|
class MouseLookEvent : public Mangle::Input::Event
|
||||||
|
{
|
||||||
|
float sensX, sensY; // Mouse sensibility
|
||||||
|
bool flipProt; // Flip protection
|
||||||
|
bool mDisabled;
|
||||||
|
|
||||||
|
public:
|
||||||
|
MouseLookEvent(float sX = 0.2, float sY = 0.2, bool prot=true)
|
||||||
|
: sensX(sX), sensY(sY), flipProt(prot)
|
||||||
|
{}
|
||||||
|
|
||||||
|
void setSens(float sX, float sY) {
|
||||||
|
sensX = sX;
|
||||||
|
sensY = sY;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setProt(bool p) {
|
||||||
|
flipProt = p;
|
||||||
|
}
|
||||||
|
|
||||||
|
void disable() {
|
||||||
|
mDisabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void enable() {
|
||||||
|
mDisabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void event(Type type, int index, const void *p);
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef boost::shared_ptr<MouseLookEvent> MouseLookEventPtr;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -1,34 +1,101 @@
|
|||||||
|
|
||||||
#include "player.hpp"
|
#include "player.hpp"
|
||||||
|
|
||||||
#include <OgreSceneNode.h>
|
#include <OgreSceneNode.h>
|
||||||
|
#include <OgreCamera.h>
|
||||||
|
|
||||||
|
#include "../mwbase/environment.hpp"
|
||||||
|
#include "../mwbase/soundmanager.hpp"
|
||||||
|
|
||||||
|
#include "../mwworld/ptr.hpp"
|
||||||
|
#include "../mwworld/refdata.hpp"
|
||||||
|
|
||||||
namespace MWRender
|
namespace MWRender
|
||||||
{
|
{
|
||||||
Player::Player (Ogre::Camera *camera, Ogre::SceneNode* node)
|
Player::Player (Ogre::Camera *camera, Ogre::SceneNode* node)
|
||||||
: mCamera (camera), mNode (node)
|
: mCamera (camera),
|
||||||
|
mNode (node),
|
||||||
|
mFirstPersonView(true),
|
||||||
|
mVanityModeEnabled(false)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void Player::setRot(float x, float y, float z)
|
bool Player::setRotation(const Ogre::Vector3 &rot)
|
||||||
{
|
{
|
||||||
Ogre::SceneNode *sceneNode = mNode;
|
Ogre::SceneNode *sceneNode = mNode;
|
||||||
Ogre::Node* yawNode = sceneNode->getChildIterator().getNext();
|
Ogre::Node* yawNode = sceneNode->getChildIterator().getNext();
|
||||||
Ogre::Node* pitchNode = yawNode->getChildIterator().getNext();
|
Ogre::Node* pitchNode = yawNode->getChildIterator().getNext();
|
||||||
|
|
||||||
// we are only interested in X and Y rotation
|
// we are only interested in X and Y rotation
|
||||||
|
|
||||||
// Rotate around X axis
|
// Rotate around X axis
|
||||||
Ogre::Quaternion xr(Ogre::Radian(x), Ogre::Vector3::UNIT_X);
|
Ogre::Quaternion xr(Ogre::Degree(rot.x), Ogre::Vector3::UNIT_X);
|
||||||
|
|
||||||
// Rotate around Y axis
|
// Rotate around Y axis
|
||||||
Ogre::Quaternion yr(Ogre::Radian(-z), Ogre::Vector3::UNIT_Y);
|
Ogre::Quaternion yr(Ogre::Degree(-rot.z), Ogre::Vector3::UNIT_Y);
|
||||||
|
|
||||||
pitchNode->setOrientation(xr);
|
pitchNode->setOrientation(xr);
|
||||||
yawNode->setOrientation(yr);
|
yawNode->setOrientation(yr);
|
||||||
|
|
||||||
|
controlFlip();
|
||||||
|
updateListener();
|
||||||
|
|
||||||
|
return !mVanityModeEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Player::getHandle() const
|
std::string Player::getHandle() const
|
||||||
{
|
{
|
||||||
return mNode->getName();
|
return mNode->getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Player::attachTo(const MWWorld::Ptr &ptr)
|
||||||
|
{
|
||||||
|
ptr.getRefData().setBaseNode(mNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Player::adjustRotation(const Ogre::Vector3 &rot)
|
||||||
|
{
|
||||||
|
Ogre::SceneNode *pitchNode = mCamera->getParentSceneNode();
|
||||||
|
Ogre::SceneNode *yawNode = pitchNode->getParentSceneNode();
|
||||||
|
|
||||||
|
pitchNode->pitch(Ogre::Degree(rot.x));
|
||||||
|
yawNode->yaw(Ogre::Degree(-rot.z));
|
||||||
|
|
||||||
|
controlFlip();
|
||||||
|
updateListener();
|
||||||
|
|
||||||
|
return !mVanityModeEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Player::controlFlip()
|
||||||
|
{
|
||||||
|
Ogre::SceneNode *pitchNode = mCamera->getParentSceneNode();
|
||||||
|
Ogre::Quaternion orient = pitchNode->getOrientation();
|
||||||
|
|
||||||
|
float pitchAngle =
|
||||||
|
(2 * Ogre::Degree(Ogre::Math::ACos(orient.w)).valueDegrees());
|
||||||
|
|
||||||
|
// Limit the pitch between -90 degress and +90 degrees, Quake3-style.
|
||||||
|
if (pitchAngle > 90.0f)
|
||||||
|
{
|
||||||
|
Ogre::Real sqrt = Ogre::Math::Sqrt(0.5f);
|
||||||
|
if (orient.x > 0) {
|
||||||
|
// Set orientation to 90 degrees on X-axis.
|
||||||
|
pitchNode->setOrientation(Ogre::Quaternion(sqrt, sqrt, 0, 0));
|
||||||
|
} else if (orient.x < 0) {
|
||||||
|
// Sets orientation to -90 degrees on X-axis.
|
||||||
|
pitchNode->setOrientation(Ogre::Quaternion(sqrt, -sqrt, 0, 0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Player::updateListener()
|
||||||
|
{
|
||||||
|
Ogre::Vector3 pos = mCamera->getRealPosition();
|
||||||
|
Ogre::Vector3 dir = mCamera->getRealDirection();
|
||||||
|
|
||||||
|
Ogre::Real xch;
|
||||||
|
xch = pos.y, pos.y = -pos.z, pos.z = xch;
|
||||||
|
xch = dir.y, dir.y = -dir.z, dir.z = xch;
|
||||||
|
|
||||||
|
MWBase::Environment::get().getSoundManager()->setListenerPosDir(pos, dir);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,17 @@
|
|||||||
#ifndef _GAME_RENDERING_INTERFACE_H
|
#ifndef _GAME_RENDERING_INTERFACE_H
|
||||||
#define _GAME_RENDERING_INTERFACE_H
|
#define _GAME_RENDERING_INTERFACE_H
|
||||||
namespace MWRender{
|
|
||||||
class Objects;
|
namespace MWRender
|
||||||
class Actors;
|
{
|
||||||
class Player;
|
class Objects;
|
||||||
|
class Actors;
|
||||||
|
|
||||||
class RenderingInterface{
|
class RenderingInterface
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
virtual MWRender::Objects& getObjects() = 0;
|
virtual MWRender::Objects& getObjects() = 0;
|
||||||
virtual MWRender::Player& getPlayer() = 0;
|
|
||||||
virtual MWRender::Actors& getActors() = 0;
|
virtual MWRender::Actors& getActors() = 0;
|
||||||
virtual ~RenderingInterface(){};
|
virtual ~RenderingInterface(){};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -0,0 +1,37 @@
|
|||||||
|
#include "ogreplugin.hpp"
|
||||||
|
|
||||||
|
#include <OgrePrerequisites.h>
|
||||||
|
#include <OgreRoot.h>
|
||||||
|
|
||||||
|
namespace Files {
|
||||||
|
|
||||||
|
bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::Root &ogreRoot) {
|
||||||
|
pluginName = pluginName + OGRE_PLUGIN_DEBUG_SUFFIX;
|
||||||
|
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
|
||||||
|
std::ostringstream verStream;
|
||||||
|
verStream << "." << OGRE_VERSION_MAJOR << "." << OGRE_VERSION_MINOR << "." << OGRE_VERSION_PATCH;
|
||||||
|
pluginName = pluginName + verStream.str();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string pluginExt;
|
||||||
|
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
|
||||||
|
pluginExt = ".dll";
|
||||||
|
#endif
|
||||||
|
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
|
||||||
|
pluginExt = ".dylib";
|
||||||
|
#endif
|
||||||
|
#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
|
||||||
|
pluginExt = ".so";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string pluginPath = pluginDir + "/" + pluginName + pluginExt;
|
||||||
|
if (boost::filesystem::exists(pluginPath)) {
|
||||||
|
ogreRoot.loadPlugin(pluginPath);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
/**
|
||||||
|
* Open Morrowind - an opensource Elder Scrolls III: Morrowind
|
||||||
|
* engine implementation.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2011 Open Morrowind Team
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file components/files/ogreplugin.hpp */
|
||||||
|
|
||||||
|
#ifndef COMPONENTS_FILES_OGREPLUGIN_H
|
||||||
|
#define COMPONENTS_FILES_OGREPLUGIN_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include <boost/filesystem.hpp>
|
||||||
|
#include <boost/version.hpp>
|
||||||
|
|
||||||
|
namespace Ogre {
|
||||||
|
class Root;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if (BOOST_VERSION <= 104500)
|
||||||
|
namespace boost {
|
||||||
|
namespace filesystem {
|
||||||
|
inline path absolute(const path& p, const path& base=current_path()) {
|
||||||
|
// call obsolete version of this function on older boost
|
||||||
|
return complete(p, base);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* (BOOST_VERSION <= 104300) */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \namespace Files
|
||||||
|
*/
|
||||||
|
namespace Files {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Loads Ogre plugin with given name.
|
||||||
|
*
|
||||||
|
* \param pluginDir absolute path to plugins
|
||||||
|
* \param pluginName plugin name, for example "RenderSystem_GL"
|
||||||
|
* \param ogreRoot Ogre::Root instance
|
||||||
|
*
|
||||||
|
* \return whether plugin was located or not
|
||||||
|
*/
|
||||||
|
bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::Root &ogreRoot);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* COMPONENTS_FILES_OGREPLUGIN_H */
|
||||||
Loading…
Reference in New Issue