Commit graph

825 commits

Author SHA1 Message Date
Chris Robinson
4054934f16 Store text keys for each animation 2013-01-09 02:51:25 -08:00
Chris Robinson
bb98542c5a Build separate animations for each group 2013-01-09 01:40:38 -08:00
Chris Robinson
e44729cd43 Make the text keys lower-case when extracting them
I think it's safe to assume all text keys are treated in a case-insensitive
manner. So far the only known NiTextKeyExtraData records are for animation
keys, which effectively are.
2013-01-09 00:17:42 -08:00
Chris Robinson
14d814d1d3 Avoid creating bones for NiTriShape nodes
The offset specified for them can be just as easilly handled by the tag point
they get connected to, and as such it's just needless extra nodes.
2013-01-07 04:21:25 -08:00
Chris Robinson
921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 2013-01-06 21:20:49 -08:00
Chris Robinson
7ba09ff025 Catch errors from buildBones 2013-01-06 20:05:50 -08:00
Marc Zinnschlag
e31cd1c805 Merge remote-tracking branch 'corristo/master' 2013-01-06 18:40:30 +01:00
Nikolay Kasyanov
1d3f3bcce3 clang build fix 2013-01-06 19:19:12 +04:00
Marc Zinnschlag
25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 2013-01-06 13:31:01 +01:00
Emanuel Guevel
0b7d11d38d to_utf8 test: fix Utf8Encoder constructor 2013-01-06 11:39:18 +01:00
Chris Robinson
8ebf49a35b Only lower-case the model name
The skeleton name will already be lower-case
2013-01-05 20:54:57 -08:00
Chris Robinson
18389c7b04 Set non-bone nodes as manually controlled 2013-01-05 17:50:22 -08:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Chris Robinson
e5ce55b6a4 Remove a hack 2013-01-05 06:20:21 -08:00
Marc Zinnschlag
043e6c09fe Merge remote-tracking branch 'chris/animation2' 2013-01-05 13:34:46 +01:00
Chris Robinson
58d35dbfcf Have createEntities' caller retrieve the text keys as needed 2013-01-05 04:01:11 -08:00
Chris Robinson
761914bdaa Use a separate method to build the animation 2013-01-05 03:31:51 -08:00
Jordan Milne
3ed77ca189 Include C++ header instead 2013-01-05 01:17:07 -04:00
Chris Robinson
8a086e3afb Cache the mesh names from the mesh/skeleton pairs 2013-01-04 20:58:35 -08:00
Chris Robinson
3131e8dae6 Don't get the text keys if they're not being requested 2013-01-04 20:33:26 -08:00
Chris Robinson
683ced54a0 Store and retrieve the node text keys in the bones' user object bindings 2013-01-04 19:41:37 -08:00
Chris Robinson
a3d33db415 Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone 2013-01-04 15:55:47 -08:00
Jordan Milne
b52904a6ea Include headers necessary for compilation under VS2010 2013-01-04 19:52:27 -04:00
Chris Robinson
1d4d67f811 Avoid underflows if the texture name doesn't include a '.' 2013-01-04 15:03:57 -08:00
Chris Robinson
3f19b13695 Merge remote-tracking branch 'zini/master' into animation2 2013-01-04 14:47:01 -08:00
Marc Zinnschlag
215b43cc7b Merge remote-tracking branch 'blunted2night/texname_fix' 2013-01-04 23:19:51 +01:00
Marc Zinnschlag
b4d63814cc post merge fix 2013-01-04 23:12:56 +01:00
Nathan Jeffords
fec9a59237 changed EMSLoader to use ConstrainedDataStream
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
2013-01-04 13:41:03 -08:00
Nathan Jeffords
278337116b increased performance of ConstrainedDataStream
Reimplemented ConstrainedDataStream to use low-level IO calls and a
custom buffering scheme to avoid using C++ iostreams.
2013-01-04 13:40:00 -08:00
Nathan Jeffords
5c7f1bd497 moved ConstrainedDataStream into its own file
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
2013-01-04 13:39:10 -08:00
Nathan Jeffords
2181393518 change texture renaming logic to increase performance
ResourceGroupManager::resourceExistsInAnyGroup is slow (at least on
windows) if the tested path does not exist, but is fast if it does (due
to finding it in the index). This change tries the '.dds' version of the
name first, and reverts to the original if the '.dds' version was not
found.
2013-01-04 11:36:22 -08:00
Emanuel Guevel
cc792da858 Fix to_utf8 test: add test data directory and remove unused include 2013-01-04 15:24:07 +01:00
Emanuel Guevel
c947d87ab9 Add a test for to_utf8 component 2013-01-04 15:10:30 +01:00
Chris Robinson
61ad8bb3dd Use a list of mesh names instead of mesh objects 2013-01-04 00:14:41 -08:00
Chris Robinson
019893b5c6 Get rid of some unnecessary case-insensitive compares 2013-01-03 23:44:58 -08:00
Emanuel Guevel
0bdf52a071 components/to_utf8: keep only Utf8Encoder 2013-01-04 01:58:30 +01:00
Emanuel Guevel
02bf02f288 ESMReader, ESMWriter: use Utf8Encoder 2013-01-04 01:52:03 +01:00
Emanuel Guevel
9906c3051d components/translation: use Utf8Encoder 2013-01-04 01:52:02 +01:00
Emanuel Guevel
740e2b5769 components/to_utf8: add class Utf8Encoder 2013-01-04 01:52:02 +01:00
Marc Zinnschlag
80a0be3264 Merge remote-tracking branch 'blunted2night/msvcbuild' 2013-01-01 21:19:27 +01:00
Nathan Jeffords
08fa9dcd3e replaced std::string concatenation with std::ostringstream
Changed a block of code that was performing a series of string
concatenations to use an ostringstream instead. This allowed the removal
of calls to std::to_string (not C++03 compliant) and fixes an compile
error in MSVC 2010 (ambigous overload when calling std::to_string).
2013-01-01 11:59:05 -08:00
Nathan Jeffords
7228f5d696 added missing reference to <cctype>
added missing reference to <cctype> that was causing Visual Studio 2010
to fail to compile stringops.hpp
2013-01-01 10:58:30 -08:00
lazydev
7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
lazydev
cd5d95ed22 1. Dialogs in Russian version now works.
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
Marc Zinnschlag
334588bf1c Merge branch 'editor2' 2012-12-28 23:31:43 +01:00
eduard
c75a5ae212 string compare and tolower 2012-12-28 18:05:52 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00