From b6ea49d5207926a6d851fea41af4e4904ad8dbfc Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 2 Jul 2009 07:15:55 +0000 Subject: [PATCH] Fix compiler errors in UvScrollNode --- panda/src/pgraph/{uvScrollNode.i => uvScrollNode.I} | 4 ++-- panda/src/pgraph/uvScrollNode.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename panda/src/pgraph/{uvScrollNode.i => uvScrollNode.I} (97%) diff --git a/panda/src/pgraph/uvScrollNode.i b/panda/src/pgraph/uvScrollNode.I similarity index 97% rename from panda/src/pgraph/uvScrollNode.i rename to panda/src/pgraph/uvScrollNode.I index 894f360451..327fe72b44 100755 --- a/panda/src/pgraph/uvScrollNode.i +++ b/panda/src/pgraph/uvScrollNode.I @@ -31,7 +31,7 @@ UvScrollNode(const string &name, float u_speed, float v_speed) : // Access: Published // Description: //////////////////////////////////////////////////////////////////// -INLINE UvScrollNode:: +INLINE void UvScrollNode:: set_u_speed(float u_speed) { _u_speed = u_speed; } @@ -41,7 +41,7 @@ set_u_speed(float u_speed) { // Access: Published // Description: //////////////////////////////////////////////////////////////////// -INLINE UvScrollNode:: +INLINE void UvScrollNode:: set_v_speed(float v_speed) { _v_speed = v_speed; } diff --git a/panda/src/pgraph/uvScrollNode.h b/panda/src/pgraph/uvScrollNode.h index ad12c65dfe..bdaace1e75 100755 --- a/panda/src/pgraph/uvScrollNode.h +++ b/panda/src/pgraph/uvScrollNode.h @@ -29,14 +29,14 @@ PUBLISHED: INLINE UvScrollNode(const string &name, float u_speed, float v_speed); protected: - INLINE UvScrollNode(const ModelNode ©); + INLINE UvScrollNode(const UvScrollNode ©); public: virtual PandaNode *make_copy() const; PUBLISHED: - INLINE void set_scroll_u(float u_speed); - INLINE void set_scroll_v(float v_speed); + INLINE void set_u_speed(float u_speed); + INLINE void set_v_speed(float v_speed); private: float _u_speed;