diff --git a/doc/rivillOSC.pd b/doc/rivillOSC.pd new file mode 100644 index 0000000000000000000000000000000000000000..87ddbc1cccf1c3dcabdc74fd5e2859462c8e02fc Binary files /dev/null and b/doc/rivillOSC.pd differ diff --git a/doc/rivillOSC.rev b/doc/rivillOSC.rev new file mode 100644 index 0000000000000000000000000000000000000000..bde9507d2da537ab187502907d0b941d1e817848 --- /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 68396b4590279e7bdb1fdc199c32ef5571248447..5458befb4713908268247d1ecfbe4a694ed856ac 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,