← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

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

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_RayCast.cpp
39
39
#include "MT_Point3.h"
40
40
#include "MT_Vector3.h"
41
41
 
42
 
#include "KX_IPhysicsController.h"
43
42
#include "PHY_IPhysicsEnvironment.h"
44
43
#include "PHY_IPhysicsController.h"
45
44
 
46
 
KX_RayCast::KX_RayCast(KX_IPhysicsController* ignoreController, bool faceNormal, bool faceUV)
47
 
        :PHY_IRayCastFilterCallback(dynamic_cast<PHY_IPhysicsController*>(ignoreController), faceNormal, faceUV) 
 
45
KX_RayCast::KX_RayCast(PHY_IPhysicsController* ignoreController, bool faceNormal, bool faceUV)
 
46
        :PHY_IRayCastFilterCallback(ignoreController, faceNormal, faceUV)
48
47
{
49
48
}
50
49
 
76
75
        
77
76
        PHY_IPhysicsController* hit_controller;
78
77
 
79
 
        while ((hit_controller = physics_environment->rayTest(callback,
 
78
        while ((hit_controller = physics_environment->RayTest(callback,
80
79
                                                              frompoint.x(),frompoint.y(),frompoint.z(),
81
80
                                                              topoint.x(),topoint.y(),topoint.z())) != NULL)
82
81
        {
83
 
                KX_ClientObjectInfo *info = static_cast<KX_ClientObjectInfo*>(hit_controller->getNewClientInfo());
 
82
                KX_ClientObjectInfo *info = static_cast<KX_ClientObjectInfo*>(hit_controller->GetNewClientInfo());
84
83
                
85
84
                if (!info)
86
85
                {