Skip to content

Commit

Permalink
rename locationvelocity to linearmovement, add documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
gisogrimm committed Jan 9, 2024
1 parent 6146ca5 commit f741911
Show file tree
Hide file tree
Showing 27 changed files with 157 additions and 4,584 deletions.
2 changes: 1 addition & 1 deletion doc/tascar.sty
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ This General Public License does not permit incorporating your program into prop
\lstdefinelanguage{tsc}[]{XML}{
keywords={session,session,},
morekeywords=[2]{scene,connect,modules,},
morekeywords=[3]{receiver,face,facegroup,mask,source,diffuse,hrirconv,simplecontroller,pos2osc,system,datalogging,locationvelocity,rotator,lsljacktime,oscjacktime,route,matrix,ltcgen,lightctl,nearsensor,timedisplay,hoafdnrot,midictl,midi2osc,layout,waitforjackport,},
morekeywords=[3]{receiver,face,facegroup,mask,source,diffuse,hrirconv,simplecontroller,pos2osc,system,datalogging,linearmovement,rotator,lsljacktime,oscjacktime,route,matrix,ltcgen,lightctl,nearsensor,timedisplay,hoafdnrot,midictl,midi2osc,layout,waitforjackport,},
morekeywords=[4]{position,position,orientation,creator,sndfile,pink,filter,level2osc,sound,speaker,faces,entry,plugins,sine,port,mic,}
keywordstyle=\color{h4aGreen}\bfseries, % keyword style
keywordstyle=[2]\color{h4aBlueDark}\bfseries, % keyword style for tascar objects
Expand Down
799 changes: 0 additions & 799 deletions libtascar/tascar.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

42 changes: 42 additions & 0 deletions manual/actmodlinearmovement.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
The \elem{locationvelocity} module can create linear motion of
objects. The velocity \attr{v} and starting position \attr{p0} can be
given in cartesian coordinates, e.g.,
\begin{lstlisting}[numbers=none]
<locationvelocity actor="/scene/obj" v="1 2 3" p0="0 0 1" t0="2"/>
\end{lstlisting}

\begin{snugshade}
{\footnotesize
\label{attrtab:linearmovement}
Attributes of element {\bf linearmovement}\nopagebreak

\begin{tabularx}{\textwidth}{lXl}
\hline
name & description (type, unit) & def.\\
\hline
\hline
\indattr{actor} & pattern to match actor objects (string array) & \\
\hline
\indattr{p0} & start position at time t0 (pos, m) & 0 0 0\\
\hline
\indattr{t0} & start time t0 (double, s) & 0\\
\hline
\indattr{v} & velocity vector (pos, m/s) & 1 1 0\\
\hline
\end{tabularx}
}
\end{snugshade}

All variables can be controlled via OSC; the \attr{actor} attribute is
used as path prefix. In the example above this would result in these
OSC variables:
\begin{verbatim}
/scene/obj/v/x (d)
/scene/obj/v/y (d)
/scene/obj/v/z (d)
/scene/obj/p0/x (d)
/scene/obj/p0/y (d)
/scene/obj/p0/z (d)
/scene/obj/t0 (d)
/scene/obj/vpt (ddddddd)
\end{verbatim}
8 changes: 1 addition & 7 deletions manual/actmodlocationvelocity.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
The \elem{locationvelocity} module can create linear motion of
objects. The velocity \attr{v} and starting position \attr{p0} can be
given in cartesian coordinates, e.g.,
\begin{lstlisting}[numbers=none]
<locationvelocity actor="/*/obj" v="1 2 3" p0="0 0 1" t0="2"/>
\end{lstlisting}

The \elem{locationvelocity} module was renamed to \elem{linearmovement}.
1 change: 1 addition & 0 deletions manual/documentation.tsc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
<lightctl driver="osc"/>
<hossustain/>
<pos2osc pattern="/*/*"/>
<linearmovement actor="/scene/in"/>
</modules>
<connect src="a" dest="b"/>
<range/>
Expand Down
2 changes: 1 addition & 1 deletion packaging/deb/tascarpro.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"plugins/build/tascar_joystick.so","usr/lib/"
"plugins/build/tascar_lightcolorpicker.so","usr/lib/"
"plugins/build/tascar_locationmodulator.so","usr/lib/"
"plugins/build/tascar_locationvelocity.so","usr/lib/"
"plugins/build/tascar_linearmovement.so","usr/lib/"
"plugins/build/tascar_lslactor.so","usr/lib/"
"plugins/build/tascar_orientationmodulator.so","usr/lib/"
"plugins/build/tascar_rotator.so","usr/lib/"
Expand Down
2 changes: 1 addition & 1 deletion plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if (NOT TASCARMODS)
#levels2osc
#lightctl
locationmodulator
locationvelocity
linearmovement
#lslactor
#lsljacktime
#ltcgen
Expand Down
2 changes: 1 addition & 1 deletion plugins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ TASCARMODS = system pos2osc sampler pendulum epicycles motionpath \
foa2hoadiff route oscevents oscjacktime ltcgen nearsensor dirgain \
dummy matrix hoafdnrot mpu6050track touchosc savegains hrirconv \
hossustain rotator orientationmodulator locationmodulator \
locationvelocity granularsynth fail waitforjackport sleep jackrec \
linearmovement granularsynth fail waitforjackport sleep jackrec \
oscserver oscrelay echoc snapangle lightctl oscactor ovheadtracker \
oscheadtracker tonalenhancement

Expand Down
Loading

0 comments on commit f741911

Please sign in to comment.