TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove reliance on non-standard macros

Browse Source
This commit is contained in:
David Rose 2007-10-01 21:32:37 +00:00
parent 3ccb93583f
commit 2b53c7df68
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/event/Sources.pp
View File

@ -1,4 +1,4 @@
#define LOCAL_LIBS putil express pandabase pstatclient
#define LOCAL_LIBS putil express pandabase pstatclient linmath
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m prc:c

8
panda/src/event/pointerEventList.cxx
View File

@ -19,7 +19,7 @@
#include "pointerEventList.h"
#include "indent.h"
#include "clockObject.h"
#define _USE_MATH_DEFINES
#include "mathNumbers.h"
#include <math.h>
TypeHandle PointerEventList::_type_handle;
@ -82,7 +82,7 @@ add_event(bool in_win, int xpos, int ypos, int seq, double time) {
double ddy = pe._dy;
pe._length = sqrt(ddx*ddx + ddy*ddy);
if (pe._length > 0.0) {
pe._direction = atan2(-ddy,ddx) * (180.0 / M_PI);
pe._direction = atan2(-ddy,ddx) * (180.0 / MathNumbers::pi);
if (pe._direction < 0.0) pe._direction += 360.0;
} else {
pe._direction = _events.back()._direction;
@ -114,7 +114,7 @@ encircles(int x, int y) const {
}
double dx = _events[0]._xpos - x;
double dy = _events[0]._ypos - y;
double lastang = atan2(dy, dx) * (180.0/M_PI);
double lastang = atan2(dy, dx) * (180.0/MathNumbers::pi);
double total = 0.0;
for (int i=1; (i<tot_events) && (total < 360.0) && (total > -360.0); i++) {
dx = _events[i]._xpos - x;
@ -122,7 +122,7 @@ encircles(int x, int y) const {
if ((dx==0.0)&&(dy==0.0)) {
continue;
}
double angle = atan2(dy,dx) * (180.0/M_PI);
double angle = atan2(dy,dx) * (180.0/MathNumbers::pi);
double deltang = angle - lastang;
if (deltang < -180.0) deltang += 360.0;
if (deltang > 180.0) deltang -= 360.0;