← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_IPO_SGController.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_IPO_SGController.cpp
1
1
/**
2
 
 * $Id: KX_IPO_SGController.cpp,v 1.4 2004/03/22 22:01:52 jesterking Exp $
 
2
 * $Id: KX_IPO_SGController.cpp,v 1.5 2005/03/25 10:33:37 kester Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
57
57
  m_modified(true),
58
58
  m_ipotime(1.0)
59
59
{
60
 
        m_sumo_object = NULL;
61
60
        m_game_object = NULL;
62
61
 
63
62
}
86
85
        )
87
86
{
88
87
        if (m_game_object) {
89
 
                m_sumo_object = 0;//m_game_object->GetSumoObject();
 
88
 
90
89
        }
91
90
}
92
91
 
113
112
                
114
113
                if (m_modify_position) {
115
114
                        if (m_ipo_as_force) {
116
 
                                /*
117
 
                                UpdateSumoReference();
118
 
                                if (m_sumo_object && ob) {
119
 
                                        m_sumo_object->applyCenterForce(m_force_ipo_acts_local ?
120
 
                                                ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
121
 
                                                m_ipo_xform.GetPosition());
122
 
                                        m_sumo_object->calcXform();
123
 
                                }
124
 
                                */
 
115
                                
125
116
                                if (m_game_object && ob) {
126
117
                                        m_game_object->GetPhysicsController()->ApplyForce(m_force_ipo_acts_local ?
127
118
                                                ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
134
125
                }
135
126
                if (m_modify_orientation) {
136
127
                        if (m_ipo_as_force) {
137
 
                                /*
138
 
                                UpdateSumoReference();
139
 
                                if (m_sumo_object && ob) {
140
 
                                        m_sumo_object->applyTorque(m_force_ipo_acts_local ?
141
 
                                                ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() :
142
 
                                                m_ipo_xform.GetEulerAngles());
143
 
                                        m_sumo_object->calcXform();
144
 
                                }
145
 
                                */
 
128
                                
146
129
                                if (m_game_object && ob) {
147
130
                                        m_game_object->ApplyTorque(m_force_ipo_acts_local ?
148
131
                                                ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() :