From e016835962ac15598c9bb2a4bde89fca447eacf6 Mon Sep 17 00:00:00 2001
From: Florent Berthaut <florent.berthaut@univ-lille.fr>
Date: Mon, 9 Jan 2023 14:46:18 +0100
Subject: [PATCH] Added test for opensoundcontrol communication
---
doc/rivillOSC.pd | Bin 0 -> 3008 bytes
doc/rivillOSC.rev | 526 ++++++++++++++++++++++++++++++++++++++++++++++
src/Reveal.cpp | 4 +-
3 files changed, 528 insertions(+), 2 deletions(-)
create mode 100644 doc/rivillOSC.pd
create mode 100644 doc/rivillOSC.rev
diff --git a/doc/rivillOSC.pd b/doc/rivillOSC.pd
new file mode 100644
index 0000000000000000000000000000000000000000..87ddbc1cccf1c3dcabdc74fd5e2859462c8e02fc
GIT binary patch
literal 3008
zcmY%PQ%FwCD@!a^urxDLFf%k$urxJOFflV$Ff_2{QjSo_ElyXkFj25DRY=J!PR`HE
zOHD2TOXMeIDHxlXDj1p@DkPWWWagoYT39HgRumK|XsDza>YAEsYMH|2jSS2bj0{W_
zax(K$!Ga(=j6haeSSaWk8W<=T8z3wPsW!B*P(T+qHnLOzi9=L^Tmw>RWNfKWkeHmU
zkOqQa)8SG^MhYb$QH3<HILKBrQ$qzK151UZ#JqH{AXu?6SS-IdxgfEq7~({bxP^g&
zp@ES?UTR5kYF>(hZmEK95?qs^v4W|gLQZCJi9$h9Y5_<ANENcYnFU0?q$o2NEDm#l
zAxvjUYB3^kO$^Kw49$%dGKzB)42>)l3{4db6by~b6$}&%6jE~wN-9xET_Xiu3y=x}
z1?9A45L8e$00TH}pkN5L7vvcuV+BJ?Ly%{RQj=3N%Tgi!Q7|_^3VRC!1v3i;Xsm<m
z)-%vE&@)u9Fg7wrHp$4y9L;M`D~!yI6^impOHvhzlT)Fw4U@7ogGps179c{|$XLPH
z#8ROoJqO}rOrIK>D}VyQkT{QmLd@92f{F%O8YvhXn=6#&VM%C)=4J}U7KUh%h7n~E
z3c7}-B>BSJOu@u}pt+G`nQKJQ+$d7bH8!D5IDpKhML2-Xr9n6tf>N_WkwQs+P-a<X
zP7X@0F*ShZfFe{mV>8SY1}(HenFs7v6M}ITLTa3W3PVFP3x)jR<h1;v+{6+E-86+_
z1&HGy8CW4PB_+NXHNS#Nb5k=^U1@1)sQSQq6bkZ-GfOh_5mg1qN+Tm=%_z2k%0q>s
z)ZF|sMEL+J3Qf!ua`F>XP)lu)JIsw0iZR0)WQ(DNDK04^6Rf&G1(Bg8EQV6cQWJAh
zQ{szDi_#L4Qx%F}0-1TmnJGy8<kY;9)FOm@YDGzEUWtxEnu0l`swzpXC{ZvnG*d7%
zvs7^Q_X`Q~_fZJ&5B3c4^!Ed&53mYDOR$0<S7%qxFjoZ^#}G#aw;+FCg&@x`Pahv7
zg=V0F(%Ik7&(%3Z!O_n}A=uT=MIpo=L#3ICnS!CQp@O4}3s_x{tFM2Ut3rrtaEL;%
zhhu;%!cZei0|jGqh?IXpYF==DX<mwReqKpYevU$Ner|4QUS@J4C@vMsGfOfQAgNmc
zq!b$Q{=v?AMX6;9CHV@)si_Jj8L0}%8Hsu6sl}kMFtG&N1*=*>Rhprp0wjQ7f`$qP
z3PxyRMhXTB#%N;33I+-mXksQ<)Pd?xbiHO+)PX7&V^cH(K~<|chM1v(IkZlNIod+O
zNWome2*r1nAWO{9G#i5bjP7njkOvLXT?rCUzziR-Cr!}J1$h%a*bG7b1lfq<E<=z{
zF^vUz)fgi(K%Ou%K(h=apkRWo)(8|MM(7R$wKx=v(8JZpSiwla2t9C&!GVMB3y`A}
z3@y>zU<?W}P_qcdZ^lLnh6+aL!E0;;vJHy~#tO#hfo=>AUJSLM;5EiD7ZkoG=%Hf_
m4qx<C0}3t$BlIvcF$B36-Nz<|AorrX%*0T^SOMg1Yc2qjPZJmb
literal 0
HcmV?d00001
diff --git a/doc/rivillOSC.rev b/doc/rivillOSC.rev
new file mode 100644
index 0000000..bde9507
--- /dev/null
+++ b/doc/rivillOSC.rev
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Rivill>
+ <Attributes>
+ <open>
+ <String value=""/>
+ </open>
+ <save>
+ <String value="/home/flo/INFO/Soft/rivill/doc/rivillOSC.rev"/>
+ </save>
+ <quit/>
+ <ressources_folder>
+ <String value=""/>
+ </ressources_folder>
+ <ressource_upload>
+ <String value=""/>
+ <String value=""/>
+ </ressource_upload>
+ <debug_osc_input>
+ <Bool value="0"/>
+ </debug_osc_input>
+ </Attributes>
+ <Modules>
+ <OutputManager>
+ <Attributes>
+ <add_osc_output>
+ <String value="osc"/>
+ </add_osc_output>
+ <add_pd_output>
+ <String value="patch"/>
+ </add_pd_output>
+ </Attributes>
+ <Modules/>
+ </OutputManager>
+ <Spaces>
+ <Attributes>
+ <add_space/>
+ </Attributes>
+ <Modules>
+ <Preview>
+ <Attributes>
+ <active>
+ <Bool value="1"/>
+ </active>
+ <look_at>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </look_at>
+ <from>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-700"/>
+ </from>
+ </Attributes>
+ </Preview>
+ <Space>
+ <Attributes>
+ <name>
+ <String value="space"/>
+ </name>
+ <remove/>
+ <visible>
+ <Bool value="1"/>
+ </visible>
+ <add_projector/>
+ <add_depth_group>
+ <String value="group"/>
+ </add_depth_group>
+ <add_depth_camera/>
+ <add_depth_shape>
+ <String value="shape"/>
+ </add_depth_shape>
+ <add_depth_mesh>
+ <String value="mesh"/>
+ </add_depth_mesh>
+ <position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </position>
+ <scale>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Float value="1"/>
+ </scale>
+ <quaternion>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </quaternion>
+ <rotation>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </rotation>
+ <absolute_position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </absolute_position>
+ </Attributes>
+ <Modules>
+ <DepthShape>
+ <Attributes>
+ <name>
+ <String value="depthshape"/>
+ </name>
+ <remove/>
+ <visible>
+ <Bool value="1"/>
+ </visible>
+ <shape>
+ <String value="box"/>
+ </shape>
+ <dimensions>
+ <Float value="200"/>
+ <Float value="200"/>
+ <Float value="1"/>
+ </dimensions>
+ <position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </position>
+ <scale>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Float value="1"/>
+ </scale>
+ <quaternion>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </quaternion>
+ <rotation>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </rotation>
+ <absolute_position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </absolute_position>
+ <follow_marker>
+ <Int value="0"/>
+ </follow_marker>
+ </Attributes>
+ </DepthShape>
+ <Projector>
+ <Attributes>
+ <name>
+ <String value="projector"/>
+ </name>
+ <remove/>
+ <active>
+ <Bool value="1"/>
+ </active>
+ <window_dimensions>
+ <Int value="0"/>
+ <Int value="57"/>
+ <Int value="640"/>
+ <Int value="480"/>
+ </window_dimensions>
+ <fullscreen_monitor>
+ <String value="windowed"/>
+ </fullscreen_monitor>
+ <view_matrix>
+ <Float value="1"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="1"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-1"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="1"/>
+ </view_matrix>
+ <projection_matrix>
+ <Float value="1.34444"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="1.79259"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-1.0202"/>
+ <Float value="-1"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-202.02"/>
+ <Float value="0"/>
+ </projection_matrix>
+ <mirrored>
+ <Bool value="0"/>
+ </mirrored>
+ <position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-700"/>
+ </position>
+ <scale>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Float value="1"/>
+ </scale>
+ <quaternion>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </quaternion>
+ <rotation>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ </rotation>
+ <absolute_position>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="-700"/>
+ </absolute_position>
+ <attached_to_camera>
+ <String value="none"/>
+ </attached_to_camera>
+ <calibrate_with_camera>
+ <String value="none"/>
+ </calibrate_with_camera>
+ <output_revealed>
+ <Bool value="1"/>
+ </output_revealed>
+ <post_filter>
+ <Int value="0"/>
+ </post_filter>
+ <transparent_window>
+ <Bool value="0"/>
+ </transparent_window>
+ </Attributes>
+ </Projector>
+ </Modules>
+ </Space>
+ </Modules>
+ </Spaces>
+ <Scene>
+ <Attributes>
+ <add_shape>
+ <String value="test"/>
+ </add_shape>
+ <add_model>
+ <String value="model"/>
+ </add_model>
+ <add_path>
+ <String value="path"/>
+ </add_path>
+ <add_text>
+ <String value="text"/>
+ </add_text>
+ <add_cut>
+ <String value="cut"/>
+ </add_cut>
+ <add_arrow>
+ <String value="arrow"/>
+ </add_arrow>
+ <add_grid>
+ <String value="grid"/>
+ </add_grid>
+ <add_group>
+ <String value="group"/>
+ </add_group>
+ </Attributes>
+ <Modules>
+ <Shape>
+ <Attributes>
+ <name>
+ <String value="shape"/>
+ <Listeners/>
+ </name>
+ <remove>
+ <Listeners/>
+ </remove>
+ <visible>
+ <Bool value="1"/>
+ <Listeners/>
+ </visible>
+ <visible_from>
+ <String value="all"/>
+ <Listeners/>
+ </visible_from>
+ <revealed_by>
+ <String value="all"/>
+ <Listeners/>
+ </revealed_by>
+ <shape>
+ <String value="sphere"/>
+ <Listeners/>
+ </shape>
+ <dimensions>
+ <Float value="200"/>
+ <Float value="200"/>
+ <Float value="200"/>
+ <Listeners/>
+ </dimensions>
+ <position>
+ <Float value="100"/>
+ <Float value="100"/>
+ <Float value="100"/>
+ <Listeners/>
+ </position>
+ <scale>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Listeners/>
+ </scale>
+ <quaternion>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Listeners/>
+ </quaternion>
+ <rotation>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Listeners/>
+ </rotation>
+ <absolute_position>
+ <Float value="100"/>
+ <Float value="100"/>
+ <Float value="100"/>
+ </absolute_position>
+ <follow_marker>
+ <Int value="0"/>
+ <Listeners/>
+ </follow_marker>
+ <color>
+ <Float value="360"/>
+ <Float value="0"/>
+ <Float value="100"/>
+ <Listeners/>
+ </color>
+ <surface>
+ <String value="color"/>
+ <Listeners/>
+ </surface>
+ <surface_color>
+ <Float value="360"/>
+ <Float value="0"/>
+ <Float value="100"/>
+ <Listeners/>
+ </surface_color>
+ <surface_thickness>
+ <Float value="5"/>
+ <Listeners/>
+ </surface_thickness>
+ <surface_texture>
+ <String value=""/>
+ <Listeners/>
+ </surface_texture>
+ <inside_visible>
+ <Bool value="1"/>
+ <Listeners/>
+ </inside_visible>
+ <inside_axes>
+ <String value="local"/>
+ <Listeners/>
+ </inside_axes>
+ <inside_structure>
+ <String value="from_surface"/>
+ <Listeners/>
+ </inside_structure>
+ <structure_ratio>
+ <Float value="0"/>
+ <Listeners/>
+ </structure_ratio>
+ <gradient_alpha>
+ <Float value="1"/>
+ <Listeners/>
+ </gradient_alpha>
+ <gradient_type>
+ <String value="grayscale"/>
+ <Listeners/>
+ </gradient_type>
+ <gradient_steps>
+ <Int value="0"/>
+ <Listeners/>
+ </gradient_steps>
+ <gradient_curve_ratio>
+ <Float value="1"/>
+ <Listeners/>
+ </gradient_curve_ratio>
+ <gradient_texture>
+ <String value=""/>
+ <Listeners/>
+ </gradient_texture>
+ <density_alpha>
+ <Float value="0.5"/>
+ <Listeners/>
+ </density_alpha>
+ <density_type>
+ <String value="layers"/>
+ <Listeners/>
+ </density_type>
+ <density_ratio>
+ <Float value="0.3"/>
+ <Listeners/>
+ </density_ratio>
+ <density_size>
+ <Float value="0.1"/>
+ <Listeners/>
+ </density_size>
+ <density_curve_ratio>
+ <Float value="1"/>
+ <Listeners/>
+ </density_curve_ratio>
+ <texture_alpha>
+ <Float value="0"/>
+ <Listeners/>
+ </texture_alpha>
+ <texture>
+ <String value=""/>
+ <Listeners/>
+ </texture>
+ <texture_layers_folder>
+ <String value=""/>
+ <Listeners/>
+ </texture_layers_folder>
+ <texture_grayscale>
+ <Bool value="0"/>
+ <Listeners/>
+ </texture_grayscale>
+ <texture_blend>
+ <Bool value="1"/>
+ <Listeners/>
+ </texture_blend>
+ <texture_offset>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Float value="0"/>
+ <Listeners/>
+ </texture_offset>
+ <texture_scale>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Float value="1"/>
+ <Listeners/>
+ </texture_scale>
+ <texture_reactivity>
+ <String value="none"/>
+ <Listeners/>
+ </texture_reactivity>
+ <layer_anim_position>
+ <Float value="0"/>
+ <Listeners/>
+ </layer_anim_position>
+ <layer_anim_play>
+ <Bool value="0"/>
+ <Listeners/>
+ </layer_anim_play>
+ <layer_anim_speed>
+ <Float value="1"/>
+ <Listeners/>
+ </layer_anim_speed>
+ <revealed_name>
+ <Listeners/>
+ </revealed_name>
+ <revealed_surface>
+ <Listeners>
+ <OscListener>
+ <Parameter value="/rivill/scene/shape/revealed_surface"/>
+ <Parameter value="127.0.0.1:7000"/>
+ <Parameter value="grouped"/>
+ </OscListener>
+ </Listeners>
+ </revealed_surface>
+ <revealed_inside>
+ <Listeners>
+ <OscListener>
+ <Parameter value="/rivill/scene/shape/revealed_inside"/>
+ <Parameter value="127.0.0.1:7000"/>
+ <Parameter value="grouped"/>
+ </OscListener>
+ </Listeners>
+ </revealed_inside>
+ <revealed_center>
+ <Listeners>
+ <OscListener>
+ <Parameter value="/rivill/scene/shape/revealed_center"/>
+ <Parameter value="127.0.0.1:7000"/>
+ <Parameter value="grouped"/>
+ </OscListener>
+ </Listeners>
+ </revealed_center>
+ <revealed_extent>
+ <Listeners>
+ <OscListener>
+ <Parameter value="/rivill/scene/shape/revealed_extent"/>
+ <Parameter value="127.0.0.1:7000"/>
+ <Parameter value="grouped"/>
+ </OscListener>
+ </Listeners>
+ </revealed_extent>
+ <revealed_color>
+ <Listeners/>
+ </revealed_color>
+ <revealed_histo/>
+ <revealed_voxels/>
+ </Attributes>
+ </Shape>
+ </Modules>
+ </Scene>
+ </Modules>
+</Rivill>
diff --git a/src/Reveal.cpp b/src/Reveal.cpp
index 68396b4..5458bef 100644
--- a/src/Reveal.cpp
+++ b/src/Reveal.cpp
@@ -70,8 +70,8 @@ Reveal* Reveal::getInstance() {
Reveal::~Reveal(){}
Reveal::Reveal() : GroupModule() {
- m_type="Revil";
- m_name="revil";
+ m_type="Rivill";
+ m_name="rivill";
addAttribute(new Attribute("open",
Attribute::FILE_OPEN_ATTRIBUTE,
openCallback, this, Attribute::LOCAL,
--
GitLab