forked from teamnwah/openmw-tes3coop
Merge remote-tracking branch 'upstream/master' into newlauncher
This commit is contained in:
commit
d7a3b84b3d
12 changed files with 84 additions and 75 deletions
|
@ -56,7 +56,8 @@ IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd/ogre_1_7_1")
|
|||
set(AUDIERE_LIBRARY "${PREBUILT_DIR}/audiere-1.9.4/lib/audiere.lib")
|
||||
|
||||
set(ENV{OPENALDIR} "${PREBUILT_DIR}/OpenAL 1.1 SDK")
|
||||
|
||||
|
||||
set(BULLET_ROOT "${PREBUILT_DIR}/bullet")
|
||||
ELSE()
|
||||
message (STATUS "OpenMW pre-built binaries not found. Using standard locations.")
|
||||
ENDIF()
|
||||
|
|
|
@ -76,7 +76,7 @@ void OMW::Engine::executeLocalScripts()
|
|||
}
|
||||
|
||||
|
||||
bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
|
||||
bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
|
||||
{
|
||||
if(mShowFPS)
|
||||
{
|
||||
|
|
|
@ -100,7 +100,7 @@ namespace OMW
|
|||
|
||||
void executeLocalScripts();
|
||||
|
||||
virtual bool frameStarted(const Ogre::FrameEvent& evt);
|
||||
virtual bool frameRenderingQueued (const Ogre::FrameEvent& evt);
|
||||
|
||||
/// Process pending commands
|
||||
|
||||
|
|
|
@ -223,11 +223,11 @@ namespace MWGui
|
|||
try
|
||||
{
|
||||
ConsoleInterpreterContext interpreterContext (*this, mEnvironment, MWWorld::Ptr());
|
||||
Interpreter::Interpreter interpreter (interpreterContext);
|
||||
Interpreter::Interpreter interpreter;
|
||||
MWScript::installOpcodes (interpreter);
|
||||
std::vector<Interpreter::Type_Code> code;
|
||||
output.getCode (code);
|
||||
interpreter.run (&code[0], code.size());
|
||||
interpreter.run (&code[0], code.size(), interpreterContext);
|
||||
}
|
||||
catch (const std::exception& error)
|
||||
{
|
||||
|
|
|
@ -258,7 +258,7 @@ namespace MWInput
|
|||
}
|
||||
|
||||
//NOTE: Used to check for movement keys
|
||||
bool frameStarted(const Ogre::FrameEvent &evt)
|
||||
bool frameRenderingQueued (const Ogre::FrameEvent &evt)
|
||||
{
|
||||
// Tell OIS to handle all input events
|
||||
input.capture();
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
#include <components/compiler/scanner.hpp>
|
||||
#include <components/compiler/context.hpp>
|
||||
|
||||
#include <components/interpreter/interpreter.hpp>
|
||||
|
||||
#include "extensions.hpp"
|
||||
|
||||
namespace MWScript
|
||||
|
@ -21,7 +19,8 @@ namespace MWScript
|
|||
ScriptManager::ScriptManager (const ESMS::ESMStore& store, bool verbose,
|
||||
Compiler::Context& compilerContext)
|
||||
: mErrorHandler (std::cerr), mStore (store), mVerbose (verbose),
|
||||
mCompilerContext (compilerContext), mParser (mErrorHandler, mCompilerContext)
|
||||
mCompilerContext (compilerContext), mParser (mErrorHandler, mCompilerContext),
|
||||
mOpcodesInstalled (false)
|
||||
{}
|
||||
|
||||
bool ScriptManager::compile (const std::string& name)
|
||||
|
@ -99,9 +98,13 @@ namespace MWScript
|
|||
if (!iter->second.empty())
|
||||
try
|
||||
{
|
||||
Interpreter::Interpreter interpreter (interpreterContext);
|
||||
installOpcodes (interpreter);
|
||||
interpreter.run (&iter->second[0], iter->second.size());
|
||||
if (!mOpcodesInstalled)
|
||||
{
|
||||
installOpcodes (mInterpreter);
|
||||
mOpcodesInstalled = true;
|
||||
}
|
||||
|
||||
mInterpreter.run (&iter->second[0], iter->second.size(), interpreterContext);
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <components/compiler/streamerrorhandler.hpp>
|
||||
#include <components/compiler/fileparser.hpp>
|
||||
|
||||
#include <components/interpreter/interpreter.hpp>
|
||||
#include <components/interpreter/types.hpp>
|
||||
|
||||
namespace ESMS
|
||||
|
@ -35,6 +36,8 @@ namespace MWScript
|
|||
bool mVerbose;
|
||||
Compiler::Context& mCompilerContext;
|
||||
Compiler::FileParser mParser;
|
||||
Interpreter::Interpreter mInterpreter;
|
||||
bool mOpcodesInstalled;
|
||||
|
||||
std::map<std::string, std::vector<Interpreter::Type_Code> > mScripts;
|
||||
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
#include <map>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <locale>
|
||||
#include <cctype>
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
|
||||
|
|
|
@ -134,8 +134,7 @@ namespace Interpreter
|
|||
throw std::runtime_error (error.str());
|
||||
}
|
||||
|
||||
Interpreter::Interpreter (Context& context)
|
||||
: mRuntime (context)
|
||||
Interpreter::Interpreter()
|
||||
{}
|
||||
|
||||
Interpreter::~Interpreter()
|
||||
|
@ -195,11 +194,11 @@ namespace Interpreter
|
|||
mSegment5.insert (std::make_pair (code, opcode));
|
||||
}
|
||||
|
||||
void Interpreter::run (const Type_Code *code, int codeSize)
|
||||
void Interpreter::run (const Type_Code *code, int codeSize, Context& context)
|
||||
{
|
||||
assert (codeSize>=4);
|
||||
|
||||
mRuntime.configure (code, codeSize);
|
||||
mRuntime.configure (code, codeSize, context);
|
||||
|
||||
int opcodes = static_cast<int> (code[0]);
|
||||
|
||||
|
|
|
@ -21,23 +21,23 @@ namespace Interpreter
|
|||
std::map<int, Opcode1 *> mSegment3;
|
||||
std::map<int, Opcode2 *> mSegment4;
|
||||
std::map<int, Opcode0 *> mSegment5;
|
||||
|
||||
|
||||
// not implemented
|
||||
Interpreter (const Interpreter&);
|
||||
Interpreter& operator= (const Interpreter&);
|
||||
|
||||
|
||||
void execute (Type_Code code);
|
||||
|
||||
|
||||
void abortUnknownCode (int segment, int opcode);
|
||||
|
||||
|
||||
void abortUnknownSegment (Type_Code code);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
Interpreter (Context& context);
|
||||
|
||||
|
||||
Interpreter();
|
||||
|
||||
~Interpreter();
|
||||
|
||||
|
||||
void installSegment0 (int code, Opcode1 *opcode);
|
||||
///< ownership of \a opcode is transferred to *this.
|
||||
|
||||
|
@ -55,10 +55,9 @@ namespace Interpreter
|
|||
|
||||
void installSegment5 (int code, Opcode0 *opcode);
|
||||
///< ownership of \a opcode is transferred to *this.
|
||||
|
||||
void run (const Type_Code *code, int codeSize);
|
||||
|
||||
void run (const Type_Code *code, int codeSize, Context& context);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -7,50 +7,51 @@
|
|||
|
||||
namespace Interpreter
|
||||
{
|
||||
Runtime::Runtime (Context& context) : mContext (context), mCode (0), mPC (0) {}
|
||||
|
||||
Runtime::Runtime() : mContext (0), mCode (0), mPC (0) {}
|
||||
|
||||
int Runtime::getPC() const
|
||||
{
|
||||
return mPC;
|
||||
}
|
||||
|
||||
|
||||
int Runtime::getIntegerLiteral (int index) const
|
||||
{
|
||||
assert (index>=0 && index<static_cast<int> (mCode[1]));
|
||||
|
||||
|
||||
const Type_Code *literalBlock = mCode + 4 + mCode[0];
|
||||
|
||||
|
||||
return *reinterpret_cast<const int *> (&literalBlock[index]);
|
||||
}
|
||||
|
||||
|
||||
float Runtime::getFloatLiteral (int index) const
|
||||
{
|
||||
assert (index>=0 && index<static_cast<int> (mCode[2]));
|
||||
|
||||
|
||||
const Type_Code *literalBlock = mCode + 4 + mCode[0] + mCode[1];
|
||||
|
||||
|
||||
return *reinterpret_cast<const float *> (&literalBlock[index]);
|
||||
}
|
||||
|
||||
|
||||
std::string Runtime::getStringLiteral (int index) const
|
||||
{
|
||||
assert (index>=0 && index<static_cast<int> (mCode[3]));
|
||||
|
||||
|
||||
const char *literalBlock =
|
||||
reinterpret_cast<const char *> (mCode + 4 + mCode[0] + mCode[1] + mCode[2]);
|
||||
|
||||
|
||||
for (; index; --index)
|
||||
{
|
||||
literalBlock += std::strlen (literalBlock) + 1;
|
||||
}
|
||||
|
||||
|
||||
return literalBlock;
|
||||
}
|
||||
|
||||
void Runtime::configure (const Interpreter::Type_Code *code, int codeSize)
|
||||
{
|
||||
|
||||
void Runtime::configure (const Interpreter::Type_Code *code, int codeSize, Context& context)
|
||||
{
|
||||
clear();
|
||||
|
||||
|
||||
mContext = &context;
|
||||
mCode = code;
|
||||
mCodeSize = codeSize;
|
||||
mPC = 0;
|
||||
|
@ -58,54 +59,55 @@ namespace Interpreter
|
|||
|
||||
void Runtime::clear()
|
||||
{
|
||||
mContext = 0;
|
||||
mCode = 0;
|
||||
mCodeSize = 0;
|
||||
mStack.clear();
|
||||
}
|
||||
|
||||
|
||||
void Runtime::setPC (int PC)
|
||||
{
|
||||
mPC = PC;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Runtime::push (const Data& data)
|
||||
{
|
||||
mStack.push_back (data);
|
||||
}
|
||||
|
||||
|
||||
void Runtime::push (Type_Integer value)
|
||||
{
|
||||
Data data;
|
||||
data.mInteger = value;
|
||||
push (data);
|
||||
}
|
||||
|
||||
|
||||
void Runtime::push (Type_Float value)
|
||||
{
|
||||
Data data;
|
||||
data.mFloat = value;
|
||||
push (data);
|
||||
}
|
||||
|
||||
|
||||
void Runtime::pop()
|
||||
{
|
||||
if (mStack.empty())
|
||||
throw std::runtime_error ("stack underflow");
|
||||
|
||||
|
||||
mStack.resize (mStack.size()-1);
|
||||
}
|
||||
|
||||
|
||||
Data& Runtime::operator[] (int Index)
|
||||
{
|
||||
if (Index<0 || Index>=static_cast<int> (mStack.size()))
|
||||
throw std::runtime_error ("stack index out of range");
|
||||
|
||||
|
||||
return mStack[mStack.size()-Index-1];
|
||||
}
|
||||
|
||||
|
||||
Context& Runtime::getContext()
|
||||
{
|
||||
return mContext;
|
||||
assert (mContext);
|
||||
return *mContext;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -11,52 +11,52 @@ namespace Interpreter
|
|||
class Context;
|
||||
|
||||
/// Runtime data and engine interface
|
||||
|
||||
|
||||
class Runtime
|
||||
{
|
||||
Context& mContext;
|
||||
Context *mContext;
|
||||
const Type_Code *mCode;
|
||||
int mCodeSize;
|
||||
int mPC;
|
||||
std::vector<Data> mStack;
|
||||
|
||||
|
||||
public:
|
||||
|
||||
Runtime (Context& context);
|
||||
|
||||
|
||||
Runtime ();
|
||||
|
||||
int getPC() const;
|
||||
///< return program counter.
|
||||
|
||||
|
||||
int getIntegerLiteral (int index) const;
|
||||
|
||||
|
||||
float getFloatLiteral (int index) const;
|
||||
|
||||
|
||||
std::string getStringLiteral (int index) const;
|
||||
|
||||
void configure (const Type_Code *code, int codeSize);
|
||||
|
||||
void configure (const Type_Code *code, int codeSize, Context& context);
|
||||
///< \a context and \a code must exist as least until either configure, clear or
|
||||
/// the destructor is called. \a codeSize is given in 32-bit words.
|
||||
|
||||
|
||||
void clear();
|
||||
|
||||
|
||||
void setPC (int PC);
|
||||
///< set program counter.
|
||||
|
||||
|
||||
void push (const Data& data);
|
||||
///< push data on stack
|
||||
|
||||
|
||||
void push (Type_Integer value);
|
||||
///< push integer data on stack.
|
||||
|
||||
|
||||
void push (Type_Float value);
|
||||
///< push float data on stack.
|
||||
|
||||
|
||||
void pop();
|
||||
///< pop stack
|
||||
|
||||
|
||||
Data& operator[] (int Index);
|
||||
///< Access stack member, counted from the top.
|
||||
|
||||
|
||||
Context& getContext();
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue