mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 11:23:52 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'zini/master' into sound

Browse source
This commit is contained in:
Chris Robinson 2012-04-16 20:06:33 -07:00
commit bd9dd93821
4 changed files with 111 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
CMakeLists.txt
View file

@ -210,16 +210,16 @@ include_directories("."
link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR} ${MYGUI_LIB_DIR}) link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR} ${MYGUI_LIB_DIR})
if(APPLE) if (APPLE)
# List used Ogre plugins # List used Ogre plugins
SET(USED_OGRE_PLUGINS "RenderSystem_GL" SET(USED_OGRE_PLUGINS ${OGRE_RenderSystem_GL_LIBRARY_REL}
"Plugin_OctreeSceneManager" ${OGRE_Plugin_OctreeSceneManager_LIBRARY_REL}
"Plugin_CgProgramManager" ${OGRE_Plugin_CgProgramManager_LIBRARY_REL}
"Plugin_ParticleFX") ${OGRE_Plugin_ParticleFX_LIBRARY_REL})
endif(APPLE) endif (APPLE)
add_subdirectory( files/) add_subdirectory(files/)
add_subdirectory( files/mygui ) add_subdirectory(files/mygui)
# Specify build paths # Specify build paths
@ -256,34 +256,36 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif() endif()
if (APPLE) if (APPLE)
if (${OGRE_PLUGIN_DIR_REL}})
set(OGRE_PLUGINS_REL_FOUND TRUE)
endif ()
if (${OGRE_PLUGIN_DIR_DBG})
set(OGRE_PLUGINS_DBG_FOUND TRUE)
endif ()
if (${OGRE_PLUGINS_REL_FOUND})
set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_REL})
else ()
set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
endif ()
set(OGRE_PLUGIN_DIR "${OGRE_PLUGIN_DIR}/")
configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
"${OpenMW_BINARY_DIR}/plugins.cfg") "${OpenMW_BINARY_DIR}/plugins.cfg")
set(OGRE_PLUGIN_DIR_2 ${OGRE_PLUGIN_DIR})
set(OGRE_PLUGIN_DIR "")
configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
"${OpenMW_BINARY_DIR}/plugins.cfg.install")
set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_2})
configure_file(${OpenMW_SOURCE_DIR}/files/mac/Info.plist configure_file(${OpenMW_SOURCE_DIR}/files/mac/Info.plist
"${APP_BUNDLE_DIR}/Contents/Info.plist") "${APP_BUNDLE_DIR}/Contents/Info.plist")
configure_file(${OpenMW_SOURCE_DIR}/files/mac/openmw.icns configure_file(${OpenMW_SOURCE_DIR}/files/mac/openmw.icns
"${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY) "${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
# prepare plugins
if (${CMAKE_BUILD_TYPE} MATCHES "Release")
set(OPENMW_RELEASE_BUILD 1)
endif()
if (${CMAKE_BUILD_TYPE} MATCHES "RelWithDebugInfo")
set(OPENMW_RELEASE_BUILD 1)
endif()
if (${OPENMW_RELEASE_BUILD})
set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_REL})
else()
set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
endif()
foreach(plugin ${USED_OGRE_PLUGINS})
configure_file("${OGRE_PLUGIN_DIR}/${plugin}.dylib"
"${APP_BUNDLE_DIR}/Contents/Plugins/${plugin}.dylib"
COPYONLY)
endforeach()
endif (APPLE) endif (APPLE)
@ -521,10 +523,12 @@ if (APPLE)
install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime) install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime) install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" RENAME "openmw.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime) install(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" RENAME "openmw.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/plugins.cfg.install" RENAME "plugins.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/plugins.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime) install(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
install(FILES "${OpenMW_BINARY_DIR}/transparency-overrides.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
set(CPACK_GENERATOR "DragNDrop") set(CPACK_GENERATOR "DragNDrop")
set(CPACK_PACKAGE_VERSION ${OPENMW_VERSION}) set(CPACK_PACKAGE_VERSION ${OPENMW_VERSION})
set(CPACK_PACKAGE_VERSION_MAJOR ${OPENMW_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${OPENMW_VERSION_MAJOR})
@ -533,22 +537,25 @@ if (APPLE)
set(APPS "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}") set(APPS "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}")
set(PLUGINS "") set(PLUGINS "")
set(ABSOLUTE_PLUGINS "")
# Scan Plugins dir for *.dylibs foreach (PLUGIN ${USED_OGRE_PLUGINS})
set(PLUGIN_SEARCH_ROOT "${APP_BUNDLE_DIR}/Contents/Plugins") get_filename_component(PLUGIN_ABS ${PLUGIN} REALPATH)
file(GLOB_RECURSE ALL_PLUGINS "${PLUGIN_SEARCH_ROOT}/*.dylib") set(ABSOLUTE_PLUGINS ${PLUGIN_ABS} ${ABSOLUTE_PLUGINS})
endforeach ()
set(PLUGIN_INSTALL_BASE "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}/Contents/Plugins") set(PLUGIN_INSTALL_BASE "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}/Contents/Plugins")
foreach(PLUGIN ${ALL_PLUGINS}) install(FILES ${ABSOLUTE_PLUGINS} DESTINATION "${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}/Contents/Plugins" COMPONENT Runtime)
string(REPLACE "${PLUGIN_SEARCH_ROOT}/" "" PLUGIN_RELATIVE "${PLUGIN}") foreach (PLUGIN ${ABSOLUTE_PLUGINS})
get_filename_component(PLUGIN_RELATIVE ${PLUGIN} NAME)
set(PLUGINS ${PLUGINS} "${PLUGIN_INSTALL_BASE}/${PLUGIN_RELATIVE}") set(PLUGINS ${PLUGINS} "${PLUGIN_INSTALL_BASE}/${PLUGIN_RELATIVE}")
endforeach() endforeach ()
#For now, search unresolved dependencies only in default system paths, so if you put unresolveable (i.e. with @executable_path in id name) lib or framework somewhere else, it would fail #For now, search unresolved dependencies only in default system paths, so if you put unresolveable (i.e. with @executable_path in id name) lib or framework somewhere else, it would fail
set(DIRS "") set(DIRS "")
# Overriding item resolving during installation, it needed if # Overriding item resolving during installation, it needed if
# some library already has be "fixed up", i.e. its id name contains @executable_path, # some library already has been "fixed up", i.e. its id name contains @executable_path,
# but library is not embedded in bundle. For example, it's Ogre.framework from Ogre SDK. # but library is not embedded in bundle. For example, it's Ogre.framework from Ogre SDK.
# Current implementation of GetPrerequsities/BundleUtilities doesn't handle that case. # Current implementation of GetPrerequsities/BundleUtilities doesn't handle that case.
# #
@ -566,17 +573,22 @@ if (APPLE)
if (item MATCHES \"Frameworks\") # if it is a framework if (item MATCHES \"Frameworks\") # if it is a framework
# get last segment of path # get last segment of path
get_filename_component(fname \"\${item}\" NAME_WE) get_filename_component(fname \"\${item}\" NAME_WE)
find_library(ri NAMES \${fname} PATHS \${exepath} \${dirs} /Library/Frameworks) find_library(ri NAMES \${fname} PATHS \${exepath} \${dirs} \${CMAKE_SYSTEM_FRAMEWORK_PATH})
if (ri) if (ri)
message(STATUS \"found \${ri} for \${item}\")
string(REGEX REPLACE \"^.*/Frameworks/.*\\\\.framework\" \"\" item_part \${item}) string(REGEX REPLACE \"^.*/Frameworks/.*\\\\.framework\" \"\" item_part \${item})
set(ri \"\${ri}\${item_part}\") set(ri \"\${ri}\${item_part}\")
set(\${resolved_item_var} \${ri} PARENT_SCOPE) set(\${resolved_item_var} \${ri} PARENT_SCOPE)
set(\${resolved_var} 1 PARENT_SCOPE) set(\${resolved_var} 1 PARENT_SCOPE)
set(OPENMW_RESOLVED_ITEMS \${_OPENMW_RESOLVED_ITEMS} \${ri})
endif() endif()
else() else()
# code path for standard (non-framework) libs (ogre & qt pugins) # code path for standard (non-framework) libs (ogre & qt pugins)
get_filename_component(fname \"\${item}\" NAME_WE)
string(REGEX REPLACE \"^lib\" \"\" fname \${fname})
find_library(ri NAMES \${fname} PATHS \${exepath} \${dirs} /usr/lib /usr/local/lib)
if (ri)
set(\${resolved_item_var} \${ri} PARENT_SCOPE)
set(\${resolved_var} 1 PARENT_SCOPE)
endif ()
endif() endif()
endif() endif()
endfunction(gp_resolve_item_override) endfunction(gp_resolve_item_override)
@ -586,10 +598,5 @@ if (APPLE)
include(BundleUtilities) include(BundleUtilities)
fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\") fixup_bundle(\"${APPS}\" \"${PLUGINS}\" \"${DIRS}\")
" COMPONENT Runtime) " COMPONENT Runtime)
include(CPack)
include(CPack)
set(CMAKE_EXE_LINKER_FLAGS "-arch i386")
set(CMAKE_CXX_FLAGS "-arch i386")
endif (APPLE) endif (APPLE)

78
apps/openmw/mwrender/npcanimation.cpp
View file

@ -45,8 +45,8 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,O
zero = std::make_pair(blank, blankshape); zero = std::make_pair(blank, blankshape);
chest = std::make_pair(blank, blankshape); chest = std::make_pair(blank, blankshape);
tail = std::make_pair(blank, blankshape); tail = std::make_pair(blank, blankshape);
lBeastFoot = std::make_pair(blank, blankshape); lFreeFoot = std::make_pair(blank, blankshape);
rBeastFoot = std::make_pair(blank, blankshape); rFreeFoot = std::make_pair(blank, blankshape);
rhand = std::make_pair(blank, blankshape); rhand = std::make_pair(blank, blankshape);
lhand = std::make_pair(blank, blankshape); lhand = std::make_pair(blank, blankshape);
skirt = std::make_pair(blank, blankshape); skirt = std::make_pair(blank, blankshape);
@ -82,6 +82,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,O
hairModel = "meshes\\" + hairModel = "meshes\\" +
mEnvironment.mWorld->getStore().bodyParts.find(hairID)->model; mEnvironment.mWorld->getStore().bodyParts.find(hairID)->model;
npcName = ref->base->name; npcName = ref->base->name;
//ESMStore::Races r = //ESMStore::Races r =
const ESM::Race* race = mEnvironment.mWorld->getStore().races.find(ref->base->race); const ESM::Race* race = mEnvironment.mWorld->getStore().races.find(ref->base->race);
@ -242,6 +243,7 @@ void NpcAnimation::updateParts(){
} }
if(apparelChanged){ if(apparelChanged){
if(robe != inv.end()) if(robe != inv.end())
{ {
MWWorld::Ptr ptr = *robe; MWWorld::Ptr ptr = *robe;
@ -307,7 +309,6 @@ void NpcAnimation::updateParts(){
} }
if(!isBeast && boots != inv.end()){ if(!isBeast && boots != inv.end()){
if(boots->getTypeName() == typeid(ESM::Clothing).name()){ if(boots->getTypeName() == typeid(ESM::Clothing).name()){
const ESM::Clothing *clothes = (boots->get<ESM::Clothing>())->base; const ESM::Clothing *clothes = (boots->get<ESM::Clothing>())->base;
std::vector<ESM::PartReference> parts = clothes->parts.parts; std::vector<ESM::PartReference> parts = clothes->parts.parts;
@ -322,7 +323,6 @@ void NpcAnimation::updateParts(){
} }
if(leftglove != inv.end()){ if(leftglove != inv.end()){
if(leftglove->getTypeName() == typeid(ESM::Clothing).name()){ if(leftglove->getTypeName() == typeid(ESM::Clothing).name()){
const ESM::Clothing *clothes = (leftglove->get<ESM::Clothing>())->base; const ESM::Clothing *clothes = (leftglove->get<ESM::Clothing>())->base;
std::vector<ESM::PartReference> parts = clothes->parts.parts; std::vector<ESM::PartReference> parts = clothes->parts.parts;
@ -337,7 +337,6 @@ void NpcAnimation::updateParts(){
} }
if(rightglove != inv.end()){ if(rightglove != inv.end()){
if(rightglove->getTypeName() == typeid(ESM::Clothing).name()){ if(rightglove->getTypeName() == typeid(ESM::Clothing).name()){
const ESM::Clothing *clothes = (rightglove->get<ESM::Clothing>())->base; const ESM::Clothing *clothes = (rightglove->get<ESM::Clothing>())->base;
std::vector<ESM::PartReference> parts = clothes->parts.parts; std::vector<ESM::PartReference> parts = clothes->parts.parts;
@ -437,14 +436,14 @@ void NpcAnimation::updateParts(){
} }
if(partpriorities[ESM::PRT_RFoot] < 1){ if(partpriorities[ESM::PRT_RFoot] < 1){
const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot"); const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot");
if(isBeast) if(isBeast && !footPart)
footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet"); footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet");
if(footPart) if(footPart)
addOrReplaceIndividualPart(ESM::PRT_RFoot, -1,1,"meshes\\" + footPart->model); addOrReplaceIndividualPart(ESM::PRT_RFoot, -1,1,"meshes\\" + footPart->model);
} }
if(partpriorities[ESM::PRT_LFoot] < 1){ if(partpriorities[ESM::PRT_LFoot] < 1){
const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot"); const ESM::BodyPart *footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "foot");
if(isBeast) if(isBeast && !footPart)
footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet"); footPart = mEnvironment.mWorld->getStore().bodyParts.search (bodyRaceID + "feet");
if(footPart) if(footPart)
addOrReplaceIndividualPart(ESM::PRT_LFoot, -1,1,"meshes\\" + footPart->model); addOrReplaceIndividualPart(ESM::PRT_LFoot, -1,1,"meshes\\" + footPart->model);
@ -502,6 +501,33 @@ Ogre::Entity* NpcAnimation::insertBoundedPart(const std::string &mesh, std::stri
base->attachObjectToBone(bonename, part); base->attachObjectToBone(bonename, part);
return part; return part;
}
void NpcAnimation::insertFootPart(int type, const std::string &mesh){
std::string meshAndSuffix = mesh;
if(type == ESM::PRT_LFoot)
meshAndSuffix += "*|";
NIFLoader::load(meshAndSuffix);
Ogre::Entity* part = mRend.getScene()->createEntity(meshAndSuffix);
std::vector<Nif::NiTriShapeCopy>* shape = ((NIFLoader::getSingletonPtr())->getShapes(meshAndSuffix));
if(shape == 0){
if(type == ESM::PRT_LFoot){
base->attachObjectToBone("Left Foot", part);
lfoot = part;
}
else if (type == ESM::PRT_RFoot){
base->attachObjectToBone("Right Foot", part);
rfoot = part;
}
}
else{
if(type == ESM::PRT_LFoot)
lFreeFoot = insertFreePart(mesh, "::");
else if (type == ESM::PRT_RFoot)
rFreeFoot = insertFreePart(mesh, ":<");
}
} }
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> NpcAnimation::insertFreePart(const std::string &mesh, const std::string suffix){ std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> NpcAnimation::insertFreePart(const std::string &mesh, const std::string suffix){
@ -558,10 +584,11 @@ void NpcAnimation::runAnimation(float timepassed){
vecRotPos.clear(); vecRotPos.clear();
if(lBeastFoot.first) if(lFreeFoot.first)
handleShapes(lBeastFoot.second, lBeastFoot.first, base->getSkeleton()); handleShapes(lFreeFoot.second, lFreeFoot.first, base->getSkeleton());
if(rBeastFoot.first) if(rFreeFoot.first)
handleShapes(rBeastFoot.second, rBeastFoot.first, base->getSkeleton()); handleShapes(rFreeFoot.second, rFreeFoot.first, base->getSkeleton());
if(chest.first) if(chest.first)
handleShapes(chest.second, chest.first, base->getSkeleton()); handleShapes(chest.second, chest.first, base->getSkeleton());
if(tail.first) if(tail.first)
@ -645,9 +672,9 @@ void NpcAnimation::removeIndividualPart(int type){
base->detachObjectFromBone(rfoot); base->detachObjectFromBone(rfoot);
rfoot = 0; rfoot = 0;
} }
else if(rBeastFoot.first){ else if(rFreeFoot.first){
insert->detachObject(rBeastFoot.first); insert->detachObject(rFreeFoot.first);
rBeastFoot = zero; rFreeFoot = zero;
} }
} }
else if(type == ESM::PRT_LFoot){ //16 else if(type == ESM::PRT_LFoot){ //16
@ -655,9 +682,9 @@ void NpcAnimation::removeIndividualPart(int type){
base->detachObjectFromBone(lfoot); base->detachObjectFromBone(lfoot);
lfoot = 0; lfoot = 0;
} }
else if(lBeastFoot.first){ else if(lFreeFoot.first){
insert->detachObject(lBeastFoot.first); insert->detachObject(lFreeFoot.first);
lBeastFoot = zero; lFreeFoot = zero;
} }
} }
else if(type == ESM::PRT_RAnkle && rAnkle){ //17 else if(type == ESM::PRT_RAnkle && rAnkle){ //17
@ -771,18 +798,11 @@ void NpcAnimation::removeIndividualPart(int type){
lupperArm = insertBoundedPart(mesh + "*|", "Left Upper Arm"); lupperArm = insertBoundedPart(mesh + "*|", "Left Upper Arm");
break; break;
case ESM::PRT_RFoot: //15 case ESM::PRT_RFoot: //15
if(isBeast) insertFootPart(type, mesh);
rBeastFoot = insertFreePart(mesh, ":<");
else
rfoot = insertBoundedPart(mesh, "Right Foot");
break; break;
case ESM::PRT_LFoot: //16 case ESM::PRT_LFoot: //16
if(isBeast) insertFootPart(type, mesh);
lBeastFoot = insertFreePart(mesh, "::");
else
lfoot = insertBoundedPart(mesh + "*|", "Left Foot");
break; break;
case ESM::PRT_RAnkle: //17 case ESM::PRT_RAnkle: //17
rAnkle = insertBoundedPart(mesh , "Right Ankle"); rAnkle = insertBoundedPart(mesh , "Right Ankle");
break; break;
@ -826,13 +846,15 @@ void NpcAnimation::removeIndividualPart(int type){
ESM::PartReference part = parts[i]; ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = 0; const ESM::BodyPart *bodypart = 0;
if(isFemale) if(isFemale)
bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.female); bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.female);
if(!bodypart) if(!bodypart)
bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male); bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart) if(bodypart){
addOrReplaceIndividualPart(part.part, group,priority,"meshes\\" + bodypart->model); addOrReplaceIndividualPart(part.part, group,priority,"meshes\\" + bodypart->model);
else }
else
reserveIndividualPart(part.part, group, priority); reserveIndividualPart(part.part, group, priority);
} }

5
apps/openmw/mwrender/npcanimation.hpp
View file

@ -29,8 +29,8 @@ private:
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> lhand; std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> lhand;
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> rhand; std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> rhand;
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> tail; std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> tail;
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> lBeastFoot; std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> lFreeFoot;
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> rBeastFoot; std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> rFreeFoot;
int partslots[27]; //Each part slot is taken by clothing, armor, or is empty int partslots[27]; //Each part slot is taken by clothing, armor, or is empty
int partpriorities[27]; int partpriorities[27];
@ -86,6 +86,7 @@ private:
virtual ~NpcAnimation(); virtual ~NpcAnimation();
Ogre::Entity* insertBoundedPart(const std::string &mesh, std::string bonename); Ogre::Entity* insertBoundedPart(const std::string &mesh, std::string bonename);
std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> insertFreePart(const std::string &mesh, const std::string suffix); std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> insertFreePart(const std::string &mesh, const std::string suffix);
void insertFootPart(int type, const std::string &mesh);
virtual void runAnimation(float timepassed); virtual void runAnimation(float timepassed);
void updateParts(); void updateParts();
void removeIndividualPart(int type); void removeIndividualPart(int type);

10
files/plugins.cfg.mac
View file

@ -1,12 +1,12 @@
# Defines plugins to load # Defines plugins to load
# Define plugin folder # Define plugin folder
PluginFolder= PluginFolder=${OGRE_PLUGIN_DIR}
# Define plugins # Define plugins
Plugin=RenderSystem_GL.dylib Plugin=RenderSystem_GL.1.8.0
Plugin=Plugin_ParticleFX.dylib Plugin=Plugin_ParticleFX.1.8.0
Plugin=Plugin_OctreeSceneManager.dylib Plugin=Plugin_OctreeSceneManager.1.8.0
Plugin=Plugin_CgProgramManager Plugin=Plugin_CgProgramManager.1.8.0