livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automated merge from mesh-development

meow-7.2.2
Loren Shih 2010-11-23 12:04:27 -05:00
parent b8a0549ac2 e3df3baff7
commit d49d1def45
9 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -170,6 +170,7 @@ Blakar Ogre
blino Nakamura
VWR-17
Boroondas Gupte
CTS-320
SNOW-278
SNOW-503
SNOW-510

12
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -295,7 +295,7 @@ copy_if_different(
${vivox_src_dir}
"${SHARED_LIB_STAGING_DIR_DEBUG}"
out_targets
${vivox_files}
${vivox_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
@ -376,7 +376,9 @@ if(NOT EXISTS ${internal_llkdu_path})
endif (NOT EXISTS ${internal_llkdu_path})
add_custom_target(stage_third_party_libs ALL
DEPENDS
${third_party_targets}
)
if(NOT STANDALONE)
add_custom_target(
stage_third_party_libs ALL
DEPENDS ${third_party_targets}
)
endif(NOT STANDALONE)

4
indra/cmake/LLAddBuildTest.cmake
View File

@ -107,7 +107,7 @@ INCLUDE(GoogleMock)
# Setup target
ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
#
# Per-codefile additional / external project dep and lib dep property extraction
@ -196,7 +196,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})")
endif(TEST_DEBUG)
ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
# Add link deps to the executable
if(TEST_DEBUG)

2
indra/llcommon/lleventtimer.h
View File

@ -33,7 +33,7 @@
#include "lltimer.h"
// class for scheduling a function to be called at a given frequency (approximate, inprecise)
class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer>
class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer>
{
public:
LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds

7
indra/llcommon/llsdserialize.cpp
View File

@ -33,7 +33,12 @@
#include <iostream>
#include "apr_base64.h"
#include "zlib/zlib.h" // for davep's dirty little zip functions
#ifdef LL_STANDALONE
# include <zlib.h>
#else
# include "zlib/zlib.h" // for davep's dirty little zip functions
#endif
#if !LL_WINDOWS
#include <netinet/in.h> // htonl & ntohl

8
indra/llprimitive/llmodel.cpp
View File

@ -34,7 +34,13 @@
#include "dae/daeErrorHandler.h"
#include "dom/domConstants.h"
#include "dom/domMesh.h"
#include "zlib/zlib.h"
#ifdef LL_STANDALONE
# include <zlib.h>
#else
# include "zlib/zlib.h"
#endif
std::string model_names[] =

34
indra/newview/llfloatermodelpreview.cpp
View File

@ -1173,21 +1173,7 @@ void LLModelLoader::run()
}
/*{
LLMatrix4 rotation;
if (up == UPAXISTYPE_X_UP)
{
rotation.initRotation(0.0f, 90.0f * DEG_TO_RAD, 0.0f);
}
else if (up == UPAXISTYPE_Z_UP)
{
rotation.initRotation(90.0f * DEG_TO_RAD, 90.0f * DEG_TO_RAD, 0.0f);
}
rotation *= model->mBindShapeMatrix;
model->mBindShapeMatrix = rotation;
}*/
//The joint transfom map that we'll populate below
std::map<std::string,LLMatrix4> jointTransforms;
jointTransforms.clear();
@ -1195,6 +1181,7 @@ void LLModelLoader::run()
//Some collada setup for accessing the skeleton
daeElement* pElement = 0;
dae.getDatabase()->getElement( &pElement, 0, 0, "skeleton" );
//Try to get at the skeletal instance controller
domInstance_controller::domSkeleton* pSkeleton = daeSafeCast<domInstance_controller::domSkeleton>( pElement );
bool missingSkeletonOrScene = false;
@ -1281,8 +1268,6 @@ void LLModelLoader::run()
//Store the joint transform w/respect to it's name.
jointTransforms[(*jointIt).second.c_str()] = workingTransform;
}
}
//If anything failed in regards to extracting the skeleton, joints or translation id,
@ -1317,17 +1302,16 @@ void LLModelLoader::run()
llwarns<<"Tried to apply joint position from .dae, but it did not exist in the avatar rig." << llendl;
}
//Reposition the avatars pelvis (avPos+offset)
if ( lookingForJoint == "mPelvis" )
{
const LLVector3& pos = gAgentAvatarp->getCharacterPosition();
gAgentAvatarp->setPelvisOffset( true, jointTransform.getTranslation() );
gAgentAvatarp->setPosition( pos + jointTransform.getTranslation() );
}
//if ( lookingForJoint == "mPelvis" )
//{
// const LLVector3& pos = gAgentAvatarp->getCharacterPosition();
// gAgentAvatarp->setPelvisOffset( true, jointTransform.getTranslation() );
// gAgentAvatarp->setPosition( pos + jointTransform.getTranslation() );
//}
}
}
} //missingSkeletonOrScene
domSkin::domJoints* joints = skin->getJoints();
domInputLocal_Array& joint_input = joints->getInput_array();

1
indra/newview/llfloatermodelpreview.h
View File

@ -97,6 +97,7 @@ public:
LLColor4 getDaeColor(daeElement* element);
daeElement* getChildFromElement( daeElement* pElement, std::string const & name );
bool isNodeAJoint( domNode* pNode );
void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );

2
install.xml
View File

@ -1100,7 +1100,7 @@ anguage Infrstructure (CLI) international standard</string>
<key>md5sum</key>
<string>349fa0e287fb275bbee43ced194a1db1</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2</uri>
</map>
<key>linux</key>
<map>