mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-03-06 19:24:15 +01:00
commit 907ac5ef7f
17 changed files with 81 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
CMakeLists.txt
View file

@ -97,43 +97,6 @@ endif()
# We probably support older versions than this.
cmake_minimum_required(VERSION 2.6)
# source directory: libs
set(LIBS_DIR ${CMAKE_SOURCE_DIR}/libs)
set(OENGINE_OGRE
${LIBS_DIR}/openengine/ogre/renderer.cpp
${LIBS_DIR}/openengine/ogre/lights.cpp
${LIBS_DIR}/openengine/ogre/selectionbuffer.cpp
${LIBS_DIR}/openengine/ogre/imagerotate.cpp
)
set(OENGINE_GUI
${LIBS_DIR}/openengine/gui/loglistener.cpp
${LIBS_DIR}/openengine/gui/manager.cpp
${LIBS_DIR}/openengine/gui/layout.cpp
)
set(OENGINE_BULLET
${LIBS_DIR}/openengine/bullet/BtOgre.cpp
${LIBS_DIR}/openengine/bullet/BtOgreExtras.h
${LIBS_DIR}/openengine/bullet/BtOgreGP.h
${LIBS_DIR}/openengine/bullet/BtOgrePG.h
${LIBS_DIR}/openengine/bullet/physic.cpp
${LIBS_DIR}/openengine/bullet/physic.hpp
${LIBS_DIR}/openengine/bullet/BulletShapeLoader.cpp
${LIBS_DIR}/openengine/bullet/BulletShapeLoader.h
${LIBS_DIR}/openengine/bullet/trace.cpp
${LIBS_DIR}/openengine/bullet/trace.h
)
set(OENGINE_ALL ${OENGINE_OGRE} ${OENGINE_GUI} ${OENGINE_BULLET})
source_group(libs\\openengine FILES ${OENGINE_ALL})
set(OPENMW_LIBS ${OENGINE_ALL})
set(OPENMW_LIBS_HEADER)
# Sound setup
set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMPLE AVRESAMPLE)
unset(FFMPEG_LIBRARIES CACHE)
@ -275,6 +238,7 @@ include_directories("."
${MYGUI_INCLUDE_DIRS}
${MYGUI_PLATFORM_INCLUDE_DIRS}
${OPENAL_INCLUDE_DIR}
${BULLET_INCLUDE_DIRS}
${LIBS_DIR}
)
@ -572,6 +536,10 @@ if(WIN32)
include(CPack)
endif(WIN32)
# Libs
include_directories(libs)
add_subdirectory(libs/openengine)
# Extern
add_subdirectory (extern/shiny)
add_subdirectory (extern/ogre-ffmpeg-videoplayer)

5
apps/opencs/CMakeLists.txt
View file

@ -165,7 +165,8 @@ qt4_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${BULLET_INCLUDE_DIRS})
# for compiled .ui files
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(APPLE)
set (OPENCS_MAC_ICON ${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns)
@ -175,7 +176,6 @@ endif(APPLE)
add_executable(openmw-cs
MACOSX_BUNDLE
${OENGINE_BULLET}
${OPENCS_SRC}
${OPENCS_UI_HDR}
${OPENCS_MOC_SRC}
@ -199,6 +199,7 @@ if(APPLE)
endif(APPLE)
target_link_libraries(openmw-cs
${OENGINE_LIBRARY}
${OGRE_LIBRARIES}
${OGRE_Overlay_LIBRARIES}
${OGRE_STATIC_PLUGINS}

5
apps/openmw/CMakeLists.txt
View file

@ -104,7 +104,6 @@ find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
if (NOT ANDROID)
add_executable(openmw
${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
${OPENMW_FILES}
${GAME} ${GAME_HEADER}
${APPLE_BUNDLE_RESOURCES}
@ -112,7 +111,6 @@ if (NOT ANDROID)
else ()
add_library(openmw
SHARED
${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
${OPENMW_FILES}
${GAME} ${GAME_HEADER}
)
@ -120,9 +118,10 @@ endif ()
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
# when we change the backend.
include_directories(${SOUND_INPUT_INCLUDES} ${BULLET_INCLUDE_DIRS})
include_directories(${SOUND_INPUT_INCLUDES})
target_link_libraries(openmw
${OENGINE_LIBRARY}
${OGRE_LIBRARIES}
${OGRE_STATIC_PLUGINS}
${SHINY_LIBRARIES}

12
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -816,7 +816,7 @@ namespace MWInput
setPlayerControlsEnabled(!guiMode);
//esc, to leave inital movie screen
//esc, to leave initial movie screen
OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(SDLK_ESCAPE);
bool guiFocus = MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(kc), 0);
setPlayerControlsEnabled(!guiFocus);
@ -843,7 +843,7 @@ namespace MWInput
else
mInputBinder->buttonReleased(deviceID, arg);
//to escape inital movie
//to escape initial movie
OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(SDLK_ESCAPE);
setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::Enum(kc)));
}
@ -1236,11 +1236,11 @@ namespace MWInput
bool controlExists = mInputBinder->getChannel(i)->getControlsCount () != 0;
if (!controlExists)
{
int inital;
float initial;
if (defaultButtonBindings.find(i) != defaultButtonBindings.end())
inital = 0.0f;
else inital = 0.5f;
control = new ICS::Control(boost::lexical_cast<std::string>(i), false, true, inital, ICS::ICS_MAX, ICS::ICS_MAX);
initial = 0.0f;
else initial = 0.5f;
control = new ICS::Control(boost::lexical_cast<std::string>(i), false, true, initial, ICS::ICS_MAX, ICS::ICS_MAX);
mInputBinder->addControl(control);
control->attachChannel(mInputBinder->getChannel(i), ICS::Channel::DIRECT);
}

8
apps/openmw/mwmechanics/actors.cpp
View file

@ -519,8 +519,8 @@ namespace MWMechanics
effects.get(EffectKey(ESM::MagicEffect::DrainAttribute, i)).getMagnitude(),
effects.get(EffectKey(ESM::MagicEffect::AbsorbAttribute, i)).getMagnitude());
stat.damage(effects.get(EffectKey(ESM::MagicEffect::DamageAttribute, i)).getMagnitude() * duration * 1.5);
stat.restore(effects.get(EffectKey(ESM::MagicEffect::RestoreAttribute, i)).getMagnitude() * duration * 1.5);
stat.damage(effects.get(EffectKey(ESM::MagicEffect::DamageAttribute, i)).getMagnitude() * duration);
stat.restore(effects.get(EffectKey(ESM::MagicEffect::RestoreAttribute, i)).getMagnitude() * duration);
creatureStats.setAttribute(i, stat);
}
@ -786,8 +786,8 @@ namespace MWMechanics
effects.get(EffectKey(ESM::MagicEffect::DrainSkill, i)).getMagnitude(),
effects.get(EffectKey(ESM::MagicEffect::AbsorbSkill, i)).getMagnitude());
skill.damage(effects.get(EffectKey(ESM::MagicEffect::DamageSkill, i)).getMagnitude() * duration * 1.5);
skill.restore(effects.get(EffectKey(ESM::MagicEffect::RestoreSkill, i)).getMagnitude() * duration * 1.5);
skill.damage(effects.get(EffectKey(ESM::MagicEffect::DamageSkill, i)).getMagnitude() * duration);
skill.restore(effects.get(EffectKey(ESM::MagicEffect::RestoreSkill, i)).getMagnitude() * duration);
}
}

5
apps/openmw/mwscript/aiextensions.cpp
View file

@ -466,12 +466,9 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context
= static_cast<InterpreterContext&> (runtime.getContext());
bool enabled = MWBase::Environment::get().getMechanicsManager()->toggleAI();
context.report (enabled ? "AI -> On" : "AI -> Off");
runtime.getContext().report (enabled ? "AI -> On" : "AI -> Off");
}
};

5
apps/openmw/mwscript/controlextensions.cpp
View file

@ -65,12 +65,9 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context
= static_cast<InterpreterContext&> (runtime.getContext());
bool enabled = MWBase::Environment::get().getWorld()->toggleCollisionMode();
context.report (enabled ? "Collision -> On" : "Collision -> Off");
runtime.getContext().report (enabled ? "Collision -> On" : "Collision -> Off");
}
};

48
apps/openmw/mwscript/miscextensions.cpp
View file

@ -212,13 +212,10 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
bool enabled =
MWBase::Environment::get().getWorld()->toggleRenderMode (MWBase::World::Render_CollisionDebug);
context.report (enabled ?
runtime.getContext().report (enabled ?
"Collision Mesh Rendering -> On" : "Collision Mesh Rendering -> Off");
}
};
@ -230,13 +227,10 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
bool enabled =
MWBase::Environment::get().getWorld()->toggleRenderMode (MWBase::World::Render_BoundingBoxes);
context.report (enabled ?
runtime.getContext().report (enabled ?
"Bounding Box Rendering -> On" : "Bounding Box Rendering -> Off");
}
};
@ -247,13 +241,10 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
bool enabled =
MWBase::Environment::get().getWorld()->toggleRenderMode (MWBase::World::Render_Wireframe);
context.report (enabled ?
runtime.getContext().report (enabled ?
"Wireframe Rendering -> On" : "Wireframe Rendering -> Off");
}
};
@ -263,13 +254,10 @@ namespace MWScript
public:
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
bool enabled =
MWBase::Environment::get().getWorld()->toggleRenderMode (MWBase::World::Render_Pathgrid);
context.report (enabled ?
runtime.getContext().report (enabled ?
"Path Grid rendering -> On" : "Path Grid Rendering -> Off");
}
};
@ -386,17 +374,14 @@ namespace MWScript
virtual void execute(Interpreter::Runtime &runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
MWBase::World *world =
MWBase::Environment::get().getWorld();
if (world->toggleVanityMode(sActivate)) {
context.report(sActivate ? "Vanity Mode -> On" : "Vanity Mode -> Off");
runtime.getContext().report(sActivate ? "Vanity Mode -> On" : "Vanity Mode -> Off");
sActivate = !sActivate;
} else {
context.report("Vanity Mode -> No");
runtime.getContext().report("Vanity Mode -> No");
}
}
};
@ -862,14 +847,11 @@ namespace MWScript
void printGlobalVars(Interpreter::Runtime &runtime)
{
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
std::stringstream str;
str<< "Global variables:";
MWBase::World *world = MWBase::Environment::get().getWorld();
std::vector<std::string> names = context.getGlobals();
std::vector<std::string> names = runtime.getContext().getGlobals();
for(size_t i = 0;i < names.size();++i)
{
char type = world->getGlobalVariableType (names[i]);
@ -879,17 +861,17 @@ namespace MWScript
{
case 's':
str << context.getGlobalShort (names[i]) << " (short)";
str << runtime.getContext().getGlobalShort (names[i]) << " (short)";
break;
case 'l':
str << context.getGlobalLong (names[i]) << " (long)";
str << runtime.getContext().getGlobalLong (names[i]) << " (long)";
break;
case 'f':
str << context.getGlobalFloat (names[i]) << " (float)";
str << runtime.getContext().getGlobalFloat (names[i]) << " (float)";
break;
default:
@ -898,7 +880,7 @@ namespace MWScript
}
}
context.report (str.str());
runtime.getContext().report (str.str());
}
public:
@ -920,11 +902,9 @@ namespace MWScript
public:
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context = static_cast<InterpreterContext&> (runtime.getContext());
bool enabled = MWBase::Environment::get().getWorld()->toggleScripts();
context.report(enabled ? "Scripts -> On" : "Scripts -> Off");
runtime.getContext().report(enabled ? "Scripts -> On" : "Scripts -> Off");
}
};
@ -933,11 +913,9 @@ namespace MWScript
public:
virtual void execute (Interpreter::Runtime& runtime)
{
InterpreterContext& context = static_cast<InterpreterContext&> (runtime.getContext());
bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode();
context.report (enabled ? "God Mode -> On" : "God Mode -> Off");
runtime.getContext().report (enabled ? "God Mode -> On" : "God Mode -> Off");
}
};

5
apps/openmw/mwscript/skyextensions.cpp
View file

@ -25,10 +25,7 @@ namespace MWScript
{
bool enabled = MWBase::Environment::get().getWorld()->toggleSky();
InterpreterContext& context =
static_cast<InterpreterContext&> (runtime.getContext());
context.report (enabled ? "Sky -> On" : "Sky -> Off");
runtime.getContext().report (enabled ? "Sky -> On" : "Sky -> Off");
}
};

2
components/config/launchersettings.hpp
View file

@ -17,7 +17,7 @@ namespace Config
/// \return names of all Content Lists in the launcher's .cfg file.
QStringList getContentLists();
/// Set initally selected content list to match values from openmw.cfg, creating if necessary
/// Set initially selected content list to match values from openmw.cfg, creating if necessary
void setContentList(const GameSettings& gameSettings);
/// Create a Content List (or replace if it already exists)

2
extern/ogre-ffmpeg-videoplayer/audiodecoder.cpp vendored
View file

@ -222,7 +222,7 @@ int MovieAudioDecoder::audio_decode_frame(AVFrame *frame, int &sample_skip)
}
/* if update, update the audio clock w/pts */
if((uint64_t)pkt->pts != AV_NOPTS_VALUE)
if(pkt->pts != AV_NOPTS_VALUE)
mAudioClock = av_q2d(mAVStream->time_base)*pkt->pts;
}
}

1
extern/sdl4ogre/CMakeLists.txt vendored
View file

@ -6,6 +6,7 @@ set(SDL4OGRE_SOURCE_FILES
sdlinputwrapper.cpp
sdlcursormanager.cpp
sdlwindowhelper.cpp
imagerotate.cpp
)
if (APPLE)

6
libs/openengine/ogre/imagerotate.cpp → extern/sdl4ogre/imagerotate.cpp vendored
View file

@ -17,7 +17,9 @@
#include <OgreViewport.h>
using namespace Ogre;
using namespace OEngine::Render;
namespace SFO
{
void ImageRotate::rotate(const std::string& sourceImage, const std::string& destImage, const float angle)
{
@ -93,3 +95,5 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
root->destroySceneManager(sceneMgr);
delete rect;
}
}

6
libs/openengine/ogre/imagerotate.hpp → extern/sdl4ogre/imagerotate.hpp vendored
View file

@ -3,9 +3,8 @@
#include <string>
namespace OEngine
{
namespace Render
namespace SFO
{
/// Rotate an image by certain degrees and save as file, uses the GPU
@ -22,6 +21,5 @@ namespace Render
};
}
}
#endif

4
extern/sdl4ogre/sdlcursormanager.cpp vendored
View file

@ -7,7 +7,7 @@
#include <SDL_mouse.h>
#include <SDL_endian.h>
#include <openengine/ogre/imagerotate.hpp>
#include "imagerotate.hpp"
namespace SFO
{
@ -91,7 +91,7 @@ namespace SFO
// we use a render target to uncompress the DDS texture
// just blitting doesn't seem to work on D3D9
OEngine::Render::ImageRotate::rotate(tex->getName(), tempName, -rotDegrees);
ImageRotate::rotate(tex->getName(), tempName, -rotDegrees);
Ogre::TexturePtr resultTexture = Ogre::TextureManager::getSingleton().getByName(tempName);

33
libs/openengine/CMakeLists.txt Normal file
View file

@ -0,0 +1,33 @@
set(OENGINE_OGRE
ogre/renderer.cpp
ogre/lights.cpp
ogre/selectionbuffer.cpp
)
set(OENGINE_GUI
gui/loglistener.cpp
gui/manager.cpp
gui/layout.cpp
)
set(OENGINE_BULLET
bullet/BtOgre.cpp
bullet/BtOgreExtras.h
bullet/BtOgreGP.h
bullet/BtOgrePG.h
bullet/physic.cpp
bullet/physic.hpp
bullet/BulletShapeLoader.cpp
bullet/BulletShapeLoader.h
bullet/trace.cpp
bullet/trace.h
)
set(OENGINE_ALL ${OENGINE_OGRE} ${OENGINE_GUI} ${OENGINE_BULLET})
set(OENGINE_LIBRARY "oengine")
set(OENGINE_LIBRARY ${OENGINE_LIBRARY} PARENT_SCOPE)
source_group(oengine FILES ${OENGINE_ALL})
add_library(${OENGINE_LIBRARY} STATIC ${OENGINE_ALL})

11
libs/openengine/testall.sh
View file

@ -1,11 +0,0 @@
#!/bin/bash
function run()
{
echo "TESTING $1"
cd "$1/tests/"
./test.sh
cd ../../
}
run input