diff --git a/README.md b/README.md index 502a1f7922e2f207813511e4577a49abd9a678cb..1592c5a674d767ce77eac1c1f8c2de73f972d031 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Revil +# Rivill ## Description -Revil is an application for building and manipulating 3D SceneGraphs for +Rivill is an application for building and manipulating 3D SceneGraphs for Mixed-Reality Artistic Performances and Digital Mediation. It is based on OpenGL (glfw, glm), OpenNI2 and is entirely controllable via OpenSoundControl messages. It relies on the @@ -10,16 +10,16 @@ it with performers and spectator's bodies and props. This content can be used for visualisation, e.g. to augment digital performances or museum cabinets, or for interaction, e.g. controlling sound with 3D widgets. -For video examples of what Revil can do, watch https://vimeo.com/album/4703717 +For video examples of what Rivill can do, watch https://vimeo.com/album/4703717 -Revil has been used in the following projects: +Rivill has been used in the following projects: * http://ixmi.hitmuri.net * https://www.cristal.univ-lille.fr/mint/revealable-volume-displays.html * https://www.cristal.univ-lille.fr/mint/revealed-interfaces.html * https://terrev.univ-lille.fr/ ## Help -A tutorial describing the main components of Revil is available +A tutorial describing the main components of Rivill is available in [the doc folder](doc/tutorial.md). Several examples are also provided. @@ -63,17 +63,17 @@ Several examples are also provided. * Compile and install it : * make * make install -* Clone and compile the revil source code - * git clone https://gitlab.cristal.univ-lille.fr/fberthau/revil.git - * cd revil +* Clone and compile the rivill source code + * git clone https://gitlab.cristal.univ-lille.fr/fberthau/rivill.git + * cd rivill * ./waf configure * ./waf -* Start revil - * ./build/revil +* Start rivill + * ./build/rivill * To create a .app * Install https://github.com/auriamg/macdylibbundler - * In the revil/build folder, type : - * dylibbundler -od -b -x ./revil.app/Contents/MacOS/revil -d ./revil.app/Contents/libs/ + * In the rivill/build folder, type : + * dylibbundler -od -b -x ./rivill.app/Contents/MacOS/rivill -d ./rivill.app/Contents/libs/ ## Uses diff --git a/data/revil.png b/data/revil.png deleted file mode 100644 index 4228f2870ec49460c67bf4363d74c6f9afb8bb70..0000000000000000000000000000000000000000 Binary files a/data/revil.png and /dev/null differ diff --git a/data/revil.desktop b/data/rivill.desktop similarity index 82% rename from data/revil.desktop rename to data/rivill.desktop index 520ef80646bee02daf5f3135fe544c35c11c5be4..da5fcb08996101817102d3fe072db40317fbe9a4 100644 --- a/data/revil.desktop +++ b/data/rivill.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 Version=1.0 -Name=Revil +Name=Rivill Comment=3D Revealed Interfaces -Exec=/usr/local/bin/revil -Icon=revil +Exec=/usr/local/bin/rivill +Icon=rivill Terminal=false Type=Application Categories=AudioVideo; diff --git a/data/revil.icns b/data/rivill.icns similarity index 100% rename from data/revil.icns rename to data/rivill.icns diff --git a/data/rivill.png b/data/rivill.png new file mode 100644 index 0000000000000000000000000000000000000000..1e615967ca2b0bc3e43dab8cacb7dcfaedc802a5 Binary files /dev/null and b/data/rivill.png differ diff --git a/data/revil.svg b/data/rivill.svg similarity index 84% rename from data/revil.svg rename to data/rivill.svg index 56af93c14112132f143292bd2b72b53f784c29f7..25b759da35ce8a219c762d5b9442fe7d956387dd 100644 --- a/data/revil.svg +++ b/data/rivill.svg @@ -2,23 +2,22 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="210mm" height="297mm" viewBox="0 0 744.09448819 1052.3622047" id="svg2" version="1.1" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="revil.svg" - enable-background="new"> + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + sodipodi:docname="rivill.svg" + enable-background="new" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs id="defs4"> <linearGradient @@ -35,7 +34,7 @@ </linearGradient> <linearGradient id="linearGradient6030" - osb:paint="gradient"> + inkscape:swatch="gradient"> <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" @@ -77,7 +76,11 @@ <filter inkscape:collect="always" style="color-interpolation-filters:sRGB" - id="filter6463"> + id="filter6463" + x="0" + y="0" + width="1" + height="1"> <feBlend inkscape:collect="always" mode="screen" @@ -104,16 +107,17 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.49497475" - inkscape:cx="-446.62596" - inkscape:cy="898.65332" + inkscape:cx="337.39095" + inkscape:cy="316.17774" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1920" - inkscape:window-height="1018" + inkscape:window-width="996" + inkscape:window-height="1022" inkscape:window-x="0" - inkscape:window-y="36" - inkscape:window-maximized="1" /> + inkscape:window-y="31" + inkscape:window-maximized="0" + inkscape:pagecheckerboard="0" /> <metadata id="metadata7"> <rdf:RDF> @@ -136,24 +140,24 @@ d="m 130.01379,128.08841 c 21.52877,0.022 43.05755,0.0441 64.58635,0.066 22.3643,-24.06221 48.52474,-31.460888 67.2259,-58.191769 2.71923,-0.06472 20.98912,-11.557161 33.93105,-24.068007 15.4842,-14.968435 25.95668,-31.394675 28.5419,-31.451169 50.54179,-1.104457 -14.12859,63.648811 -14.12859,63.648811 -4.32309,21.069986 25.52253,23.438544 42.33546,21.471776 42.70584,1.240658 85.40384,-0.8708 127.81819,-5.21873 25.73481,0.95872 51.31917,4.15799 76.90885,6.766478 9.54752,15.5434 0.83547,34.65487 -20.48439,28.40762 -26.2476,-2.99553 -27.63034,-2.30793 -53.8003,-2.02882 -12.78621,1.48832 -49.8581,9.73983 -62.64433,11.22817 -13.52493,16.3347 22.62946,13.21758 33.1675,10.07832 39.0413,-3.04219 77.95598,5.00291 116.9575,3.82945 23.10382,5.19727 8.0288,36.69047 -13.60972,28.74833 -44.19318,-2.94318 -88.36238,6.11604 -132.48254,0.88974 -19.82007,8.99739 21.64912,8.11335 30.86918,8.87517 27.68051,0.65118 54.70333,7.75945 82.5212,7.68297 22.55858,-7.69442 38.01639,26.96661 11.18339,29.72006 -36.46307,1.38329 -72.43925,-4.63303 -108.75088,-5.88757 -14.49857,0.76494 -17.71181,-4.22347 -30.32901,0.80137 -10.13989,10.28009 8.44125,11.49178 13.96391,12.36504 16.24581,9.74748 43.72122,2.97051 59.96588,18.47736 6.7707,13.90543 -22.57952,14.89139 -37.10486,9.32981 -30.11101,-5.44137 -35.65502,-1.94584 -60.67011,-9.04294 -19.50206,-3.53729 -40.83637,-3.42785 -60.71049,-0.67171 -24.72427,1.38733 -39.52595,0.63872 -62.90978,-7.17843 -35.40447,-1.67908 -63.45037,-6.42784 -94.2085,-0.57775 L 144.76,253.13224 Z" id="path6341" inkscape:connector-curvature="0" - inkscape:export-filename="/home/flo/test.png" + inkscape:export-filename="/home/flo/INFO/Soft/rivill/data/rivill.png" inkscape:export-xdpi="127.06" inkscape:export-ydpi="127.06" sodipodi:nodetypes="cccssccccccccccccccccccccccccc" /> <text xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:-9.01962376px;word-spacing:0px;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.52591181;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:-9.01875px;word-spacing:0px;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.52591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" x="84.118187" y="241.26474" id="text4136" transform="scale(1.133983,0.88184743)" - inkscape:export-filename="/home/flo/test.png" + inkscape:export-filename="/home/flo/INFO/Soft/rivill/data/rivill.png" inkscape:export-xdpi="127.06" inkscape:export-ydpi="127.06"><tspan sodipodi:role="line" id="tspan4138" x="84.118187" y="241.26474" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:137.36247253px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:-9.01962376px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.52591181;stroke-opacity:1">REVIL</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:137.362px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.52591;stroke-opacity:1">RIVILL</tspan></text> </g> </svg> diff --git a/data/revil.xml b/data/rivill.xml similarity index 100% rename from data/revil.xml rename to data/rivill.xml diff --git a/wscript b/wscript index 46ad72bb6be860ffe6ca6d768525319b710ea819..2cdda6d4844fe425ecd9c6a9f614ce639436efa6 100755 --- a/wscript +++ b/wscript @@ -112,24 +112,24 @@ def build(bld): + bld.path.ant_glob('src/audio/*.cpp') + bld.path.ant_glob('src/*.cpp'), use = ['OS','ringbuf','oscpack'], - target = 'revil'+bld.variant, + target = 'rivill'+bld.variant, vnum = '0.0.1', mac_app = macApp, mac_plist = 'data/Info.plist', - mac_resources = 'data/revil.icns', + mac_resources = 'data/rivill.icns', ) bld.program( source="src/utils/create_marker.cpp", use="OS", - target="revil_create_marker") + target="rivill_create_marker") bld.install_files('${PREFIX}/share/applications', - ['data/revil.desktop']) + ['data/rivill.desktop']) bld.install_files('${PREFIX}/share/mime/packages', - ['data/revil.xml']) + ['data/rivill.xml']) bld.install_files('${PREFIX}/share/icons', - ['data/revil.png']) + ['data/rivill.png']) from waflib.Build import BuildContext, CleanContext class debug(BuildContext):