diff options
| -rw-r--r-- | msd.h | 10 | ||||
| -rwxr-xr-x | tab/makefile | 7 |
2 files changed, 12 insertions, 5 deletions
@@ -127,7 +127,7 @@ public: inline bool getMobile() const { return invM != 0; } - inline void setMobile() { invM = M?1.f/M:1.; } + inline void setMobile() { invM = M?1/M:0.; } inline void setFixed() { invM = 0; } inline void compute(t_float limit[N][2]) @@ -1265,13 +1265,17 @@ protected: if(IsSymbol(argv[0])) { typename IDMap<t_mass *>::iterator it; //typename IDMap<t_link *>::iterator it; - for(it = massids.find(GetSymbol(argv[0])); it; ++it) + for(it = massids.find(GetSymbol(argv[0])); it; ++it) { it.data()->M = ma; + it.data()->invM = ma?1/ma:0.; + } } else { t_mass *m = mass.find(GetAInt(argv[0])); - if(m) + if(m) { m->M = ma; + m->invM = ma?1/ma:0.; + } else error("%s - %s : Index not found",thisName(),GetString(thisTag())); } diff --git a/tab/makefile b/tab/makefile index be4cc16..4b64dcf 100755 --- a/tab/makefile +++ b/tab/makefile @@ -76,7 +76,7 @@ LINUXINCLUDE = -I../../../pd/src/ # ----------------------- Mac OS X (Darwin) -----------------------
-pd_darwin: tabosc4c~.pd_darwin tabosc4i~.pd_darwin tabread4c~.pd_darwin
+pd_darwin: tabosci~.pd_darwin tabosc4c~.pd_darwin tabread4c~.pd_darwin
.SUFFIXES: .pd_darwin
@@ -85,7 +85,7 @@ DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O2 \ -Wno-unused -Wno-parentheses -Wno-switch
# where is your m_pd.h ???
-DARWININCLUDE = -I/. -I../../../pd/src -I../../../pd/obj
+DARWININCLUDE = -I/. -I../../../pd/src -I../../../pd/obj -I/Applications/Pd-0.42.5-extended-20091214.app/Contents/Resources/include
.c.pd_darwin:
cc $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c
@@ -95,3 +95,6 @@ DARWININCLUDE = -I/. -I../../../pd/src -I../../../pd/obj +
+
+
|