GRIM: Clean up unneeded includes and fix some trailing whitespace

This commit is contained in:
Joel Teichroeb 2012-03-26 20:12:00 -07:00
parent 2d84f987ba
commit 63938ba499
26 changed files with 50 additions and 24 deletions

View File

@ -27,6 +27,7 @@
#include "graphics/colormasks.h"
#include "graphics/pixelbuffer.h"
#include "engines/grim/savegame.h"
#include "engines/grim/debug.h"
#include "engines/grim/grim.h"
#include "engines/grim/bitmap.h"

View File

@ -25,12 +25,18 @@
#include "graphics/pixelformat.h"
#include "common/endian.h"
#include "engines/grim/pool.h"
namespace Graphics {
class PixelBuffer;
}
namespace Common {
class SeekableReadStream;
}
namespace Grim {
/**

View File

@ -23,7 +23,7 @@
#ifndef GRIM_COLOR_H
#define GRIM_COLOR_H
#include "engines/grim/pool.h"
#include "common/endian.h"
namespace Grim {

View File

@ -20,6 +20,8 @@
*
*/
#include "common/stream.h"
#include "engines/grim/colormap.h"
#include "engines/grim/resource.h"

View File

@ -23,6 +23,8 @@
#ifndef GRIM_COLORMAP_H
#define GRIM_COLORMAP_H
#include "common/str.h"
#include "engines/grim/object.h"
namespace Common {

View File

@ -29,6 +29,7 @@
#include "engines/grim/grim.h"
#include "engines/grim/resource.h"
#include "engines/grim/model.h"
#include "engines/grim/savegame.h"
#include "engines/grim/emi/modelemi.h"
#include "engines/grim/costume/chore.h"
#include "engines/grim/costume/head.h"

View File

@ -23,7 +23,7 @@
#ifndef GRIM_COSTUME_H
#define GRIM_COSTUME_H
#include "common/memstream.h"
#include "common/str.h"
#include "math/matrix4.h"

View File

@ -21,8 +21,10 @@
*/
#include "engines/grim/costume.h"
#include "engines/grim/textsplit.h"
#include "engines/grim/costume/chore.h"
#include "engines/grim/costume/component.h"
#include "engines/grim/costume/keyframe_component.h"
namespace Grim {

View File

@ -23,7 +23,6 @@
#ifndef GRIM_CHORE_H
#define GRIM_CHORE_H
#include "engines/grim/textsplit.h"
#include "engines/grim/animation.h"
#include "engines/grim/pool.h"
@ -33,6 +32,7 @@ namespace Grim {
class Costume;
class Animation;
class Component;
class TextSplitter;
struct TrackKey {
int time, value;

View File

@ -22,6 +22,7 @@
#include "engines/grim/model.h"
#include "engines/grim/grim.h"
#include "engines/grim/savegame.h"
#include "engines/grim/costume/head.h"
namespace Grim {
@ -101,7 +102,7 @@ void Head::lookAt(bool entering, const Math::Vector3d &point, float rate, const
else
lookAtTM.buildFromTargetDir(modelFront, targetDir, modelUp, worldUp);
// The above specifies the world space orientation of this bone, but we need to output
// the orientation in parent space (as yaw/pitch/roll).
// the orientation in parent space (as yaw/pitch/roll).
// Get the coordinate frame in which we need to produce the character head yaw/pitch/roll values.
Math::Matrix4 parentWorldTM = _joint3Node->_parent->_matrix;
@ -109,8 +110,8 @@ void Head::lookAt(bool entering, const Math::Vector3d &point, float rate, const
// While we could compute the desired lookat direction directly in the above coordinate frame,
// it is preferrable to compute the lookat direction with respect to the head orientation in
// the keyframe animation. This is because the LUA scripts specify the maximum head yaw, pitch and
// roll values with respect to those keyframe animations. If the lookat was simply computed
// directly in the space of the parent, we couldn't apply the head maxYaw/Pitch/Roll constraints
// roll values with respect to those keyframe animations. If the lookat was simply computed
// directly in the space of the parent, we couldn't apply the head maxYaw/Pitch/Roll constraints
// properly. So, compute the coordinate frame of this bone in the keyframe animation.
Math::Matrix4 animFrame;
animFrame.buildFromPitchYawRoll(_joint3Node->_pitch, _joint3Node->_yaw, _joint3Node->_roll);
@ -129,7 +130,7 @@ void Head::lookAt(bool entering, const Math::Vector3d &point, float rate, const
// Constrain the maximum head movement, as desired by the game LUA scripts.
y.clampDegrees(_maxYaw);
pt.clampDegrees(_maxPitch);
// NOTE: By default, the _head.maxRoll for Manny's head is constrained to 165 degrees, which
// NOTE: By default, the _head.maxRoll for Manny's head is constrained to 165 degrees, which
// comes in from the orignal Lua data scripts. (also, maxYaw == 80, maxPitch == 28).
// The very small maxPitch angle, and a very large maxRoll angle causes problems when Manny
// is trying to look straight up to an object, in which case the euler roll angles vary
@ -173,9 +174,9 @@ void Head::lookAt(bool entering, const Math::Vector3d &point, float rate, const
// What follows is a hack: Since translateObject(ModelNode *node, bool reset) in this file,
// and GfxOpenGL/GfxTinyGL::drawHierachyNode concatenate transforms incorrectly, by summing up
// euler angles, do a hack here where we do the proper transform here already, and *subtract off*
// the YPR scalars from the animYPR scalars to cancel out the values that those pieces of code
// the YPR scalars from the animYPR scalars to cancel out the values that those pieces of code
// will later accumulate. After those pieces of code have been fixed, the following lines can
// be deleted, and this function can simply output the contents of pt, y and r variables above.
// be deleted, and this function can simply output the contents of pt, y and r variables above.
lookAtTM = animFrame * lookAtTM;
lookAtTM.getPitchYawRoll(&pt, &y, &r);

View File

@ -8,12 +8,12 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
@ -24,6 +24,7 @@
#include "math/vector3d.h"
#include "math/quat.h"
#include "engines/grim/emi/animationemi.h"
#include "common/textconsole.h"
namespace Grim {

View File

@ -40,6 +40,7 @@
#include "common/archive.h"
#include "common/debug-channels.h"
#include "common/file.h"
#include "common/foreach.h"
#include "common/fs.h"
#include "common/config-manager.h"

View File

@ -21,6 +21,7 @@
*/
#include "common/endian.h"
#include "common/stream.h"
#include "engines/grim/resource.h"
#include "engines/grim/colormap.h"

View File

@ -25,6 +25,10 @@
#include "common/archive.h"
namespace Common {
class File;
}
namespace Grim {
class Lab;

View File

@ -21,6 +21,7 @@
*/
#include "common/endian.h"
#include "common/stream.h"
#include "engines/grim/lipsync.h"
#include "engines/grim/resource.h"

View File

@ -23,6 +23,8 @@
#ifndef GRIM_LIPSYNC_H
#define GRIM_LIPSYNC_H
#include "common/str.h"
#include "engines/grim/object.h"
namespace Common {

View File

@ -21,6 +21,7 @@
*/
#include "common/endian.h"
#include "common/foreach.h"
#include "common/system.h"
#include "common/events.h"

View File

@ -20,6 +20,8 @@
*
*/
#include "common/foreach.h"
#include "engines/grim/grim.h"
#include "engines/grim/lua_v1.h"
#include "engines/grim/actor.h"

View File

@ -25,6 +25,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
#include "common/foreach.h"
#include "engines/grim/grim.h"
#include "engines/grim/lua_v1.h"
#include "engines/grim/localize.h"

View File

@ -23,14 +23,7 @@
#ifndef GRIM_OBJECT_H
#define GRIM_OBJECT_H
#include "common/str.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/func.h"
#include "common/list.h"
#include "common/debug.h"
#include "common/singleton.h"
#include "common/textconsole.h"
namespace Grim {

View File

@ -23,6 +23,8 @@
#ifndef GRIM_OSTATE_H
#define GRIM_OSTATE_H
#include "common/endian.h"
#include "engines/grim/pool.h"
#include "engines/grim/bitmap.h"

View File

@ -4,12 +4,11 @@
#include "common/hashmap.h"
#include "common/list.h"
#include "common/foreach.h"
#include "engines/grim/savegame.h"
namespace Grim {
class SaveGame;
template<class T> class Pool;
class PoolObjectBase {

View File

@ -26,7 +26,6 @@
#include "common/rect.h"
#include "engines/grim/pool.h"
#include "engines/grim/bitmap.h"
#include "engines/grim/color.h"
namespace Grim {

View File

@ -42,6 +42,8 @@
#include "engines/grim/update/update.h"
#include "common/algorithm.h"
#include "common/zlib.h"
#include "common/memstream.h"
#include "common/file.h"
#include "gui/message.h"
namespace Grim {

View File

@ -24,10 +24,9 @@
#define GRIM_RESOURCE_H
#include "common/archive.h"
#include "common/file.h"
#include "common/array.h"
#include "engines/grim/object.h"
#include "engines/grim/lua/lua.h"
namespace Grim {

View File

@ -26,6 +26,8 @@
#include "engines/grim/pool.h"
#include "engines/grim/color.h"
#include "common/endian.h"
namespace Grim {
class SaveGame;