http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&feed=atom&action=history
Modifications for Varrier on Vellum - Revision history
2024-03-29T11:16:27Z
Revision history for this page on the wiki
MediaWiki 1.21.1
http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&diff=2799&oldid=prev
Aprudhom at 18:48, 7 November 2008
2008-11-07T18:48:09Z
<p></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr style='vertical-align: top;'>
<td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 18:48, 7 November 2008</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 495:</td>
<td colspan="2" class="diff-lineno">Line 495:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>==Backup Files==</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>==Backup Files==</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierCombiner.tar]]</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierCombiner.tar]]<ins class="diffchange diffchange-inline"><br></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierChangeBackup.tar]]</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierChangeBackup.tar]]</div></td></tr>
</table>
Aprudhom
http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&diff=2798&oldid=prev
Aprudhom at 18:47, 7 November 2008
2008-11-07T18:47:07Z
<p></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr style='vertical-align: top;'>
<td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 18:47, 7 November 2008</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 494:</td>
<td colspan="2" class="diff-lineno">Line 494:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>==<del class="diffchange diffchange-inline">Varrier Combiner</del>==</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>==<ins class="diffchange diffchange-inline">Backup Files</ins>==</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierCombiner.tar]]</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[Image:VarrierCombiner.tar]]</div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Image:VarrierChangeBackup.tar]]</ins></div></td></tr>
</table>
Aprudhom
http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&diff=2796&oldid=prev
Aprudhom at 18:36, 7 November 2008
2008-11-07T18:36:56Z
<p></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr style='vertical-align: top;'>
<td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 18:36, 7 November 2008</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 493:</td>
<td colspan="2" class="diff-lineno">Line 493:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>endif</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>endif</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">==Varrier Combiner==</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Image:VarrierCombiner.tar]]</ins></div></td></tr>
</table>
Aprudhom
http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&diff=2782&oldid=prev
Aprudhom at 20:28, 3 November 2008
2008-11-03T20:28:05Z
<p></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr style='vertical-align: top;'>
<td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 20:28, 3 November 2008</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>Changes made for the implementation of varrier under covise on vellum:</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>Changes made for the implementation of varrier under covise on vellum:</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>Covise <del class="diffchange diffchange-inline">config file changes:</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">==</ins>Covise <ins class="diffchange diffchange-inline">Config File Changes==</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>The following tracking offsets were made:</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>The following tracking offsets were made:</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 62:</td>
<td colspan="2" class="diff-lineno">Line 62:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></LOCAL></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></LOCAL></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>OpenCOVER <del class="diffchange diffchange-inline">files modified</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">==</ins>OpenCOVER <ins class="diffchange diffchange-inline">Files Modified==</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/src/renderer/OpenCOVER/kernel/ARToolKit.cpp</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/src/renderer/OpenCOVER/kernel/ARToolKit.cpp<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in void ARToolKitNode::drawImplementation(osg::RenderInfo &renderInfo) const: case statement added for Varrier mode</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in void ARToolKitNode::drawImplementation(osg::RenderInfo &renderInfo) const: case statement added for Varrier mode</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 76:</td>
<td colspan="2" class="diff-lineno">Line 76:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/src/renderer/OpenCOVER/kernel/coVRConfig.cpp</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/src/renderer/OpenCOVER/kernel/coVRConfig.cpp<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in int coVRConfig::parseStereoMode(const char *modeName) const: statement added to parse Varrier stereo mode</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in int coVRConfig::parseStereoMode(const char *modeName) const: statement added to parse Varrier stereo mode</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 88:</td>
<td colspan="2" class="diff-lineno">Line 88:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>OpenSceneGraph-2.4 <del class="diffchange diffchange-inline">files modified</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">==</ins>OpenSceneGraph-2.4 <ins class="diffchange diffchange-inline">Files Modified==</ins></div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div> </div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/extern_libs/src/OpenSceneGraph/include/osg/DisplaySettings<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/extern_libs/src/OpenSceneGraph/include/osg/DisplaySettings</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in class OSG_EXPORT DisplaySettings : public osg::Referenced</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in class OSG_EXPORT DisplaySettings : public osg::Referenced</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 109:</td>
<td colspan="2" class="diff-lineno">Line 108:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/extern_libs/src/OpenSceneGraph/include/osgUtil/SceneView</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/extern_libs/src/OpenSceneGraph/include/osgUtil/SceneView<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>include added:</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>include added:</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 128:</td>
<td colspan="2" class="diff-lineno">Line 127:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/extern_libs/src/OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/extern_libs/src/OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in bool GraphicsWindowX11::createWindow(): added code to force override redirect.  </div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>in bool GraphicsWindowX11::createWindow(): added code to force override redirect.  </div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 166:</td>
<td colspan="2" class="diff-lineno">Line 165:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>NOTE: using this flag reverses the right and left eye in varrier, don't ask me why.</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>NOTE: using this flag reverses the right and left eye in varrier, don't ask me why.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/extern_libs/src/OpenSceneGraph/src/osg/DisplaySettings.cpp</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/extern_libs/src/OpenSceneGraph/src/osg/DisplaySettings.cpp<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div><PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div><PRE></div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 210:</td>
<td colspan="2" class="diff-lineno">Line 209:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div></PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>covise/extern_libs/src/OpenSceneGraph/src/osgUtil/SceneView.cpp</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">===</ins>covise/extern_libs/src/OpenSceneGraph/src/osgUtil/SceneView.cpp<ins class="diffchange diffchange-inline">===</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>added static init:</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>added static init:</div></td></tr>
<tr><td colspan="2" class="diff-lineno">Line 484:</td>
<td colspan="2" class="diff-lineno">Line 483:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>NOTE: osg needs to link against the varrier library, thus it needs to be added to the linking operation.  Adding it to (osgDir)/src/osgViewer/CMakeFiles/osgViewer.dir/link.txt worked for me.</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>NOTE: osg needs to link against the varrier library, thus it needs to be added to the linking operation.  Adding it to (osgDir)/src/osgViewer/CMakeFiles/osgViewer.dir/link.txt worked for me.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>.cshrc <del class="diffchange diffchange-inline">changes:</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline">==</ins>.cshrc <ins class="diffchange diffchange-inline">Changes==</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div><PRE></div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div><PRE></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>#sets varrier quality mode</div></td><td class='diff-marker'> </td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>#sets varrier quality mode</div></td></tr>
</table>
Aprudhom
http://ivl.calit2.net/wiki/index.php?title=Modifications_for_Varrier_on_Vellum&diff=2781&oldid=prev
Aprudhom: New page: Changes made for the implementation of varrier under covise on vellum: Covise config file changes: The following tracking offsets were made: <PRE> <TrackingSystem> <Offset x="0" y="-15...
2008-11-03T20:22:20Z
<p>New page: Changes made for the implementation of varrier under covise on vellum: Covise config file changes: The following tracking offsets were made: <PRE> <TrackingSystem> <Offset x="0" y="-15...</p>
<p><b>New page</b></p><div>Changes made for the implementation of varrier under covise on vellum:<br />
<br />
Covise config file changes:<br />
<br />
The following tracking offsets were made:<br />
<PRE><br />
<TrackingSystem><br />
<Offset x="0" y="-1550" z="-1120" /><br />
<Orientation h="0" p="90" r="0" /><br />
</TrackingSystem><br />
<br />
<HeadDevice><br />
<Offset x="0" y="-25.4" z="38.1" /><br />
<Orientation h="0" p="-90" r="0" /><br />
</HeadDevice><br />
<br />
<HandDevice><br />
<Offset x="0" y="0" z="0" /><br />
<Orientation h="0" p="-90" r="90" /><br />
</HandDevice><br />
</PRE><br />
Screen settings were changed and made different for the headnode:<br />
<PRE><br />
<LOCAL host="vellum" ><br />
<!-- one window, two screens horizontally --><br />
<!-- two channels in Window 0 one left and one right --><br />
<!-- stereoMode: LEFT | VARRIER --><br />
<COVER><br />
<NumWindows value="1" /><br />
<NumScreens value="1" /><br />
<Stereo value="true"/><br />
<ChannelConfig><br />
<Channel windowIndex="0" stereoMode="LEFT" channel="0" left="0" width="640" bottom="0" height="480" comment="MASTER" name="0" /><br />
</ChannelConfig><br />
<br />
<WindowConfig><br />
<Window window="0" pipeIndex="0" left="0" bottom="0" width="640" height="480" comment="MAIN" name="0" decoration="true" resize="on" /><br />
</WindowConfig><br />
</COVER><br />
</LOCAL><br />
<br />
<LOCAL host="vellum1-10,vellum2-10,vellum3-10,vellum4-10,vellum5-10,vellum6-10,vellum7-10,vellum8-10,vellum9-10,vellum10-10,vellum11-10,vellum12-10,vellum13-10,vellum14-10,vellum15-10" ><br />
<!-- one window, two screens horizontally --><br />
<!-- two channels in Window 0 one left and one right --><br />
<!-- stereoMode: LEFT | VARRIER --><br />
<COVER><br />
<NumWindows value="2" /><br />
<NumScreens value="4" /><br />
<Stereo value="true"/><br />
<ChannelConfig><br />
<Channel windowIndex="0" stereoMode="VARRIER" channel="0" left="0" width="1600" bottom="0" height="1200" comment="C_A" name="0" /><br />
<Channel windowIndex="0" stereoMode="VARRIER" channel="1" left="0" width="1600" bottom="1200" height="1200" comment="C_B" name="1" /><br />
<Channel windowIndex="1" stereoMode="VARRIER" channel="2" left="0" width="1600" bottom="0" height="1200" comment="C_C" name="2" /><br />
<Channel windowIndex="1" stereoMode="VARRIER" channel="3" left="0" width="1600" bottom="1200" height="1200" comment="C_D" name="3" /><br />
</ChannelConfig><br />
<br />
<WindowConfig><br />
<Window window="0" pipeIndex="0" left="0" bottom="0" width="1600" height="2400" comment="MAIN" name="0" decoration="false" resize="off" /><br />
<Window window="1" pipeIndex="0" left="1600" bottom="0" width="1600" height="2400" comment="MAIN" name="1" decoration="false" resize="off" /><br />
</WindowConfig><br />
</COVER><br />
</LOCAL><br />
</PRE><br />
OpenCOVER files modified<br />
<br />
covise/src/renderer/OpenCOVER/kernel/ARToolKit.cpp<br />
<br />
in void ARToolKitNode::drawImplementation(osg::RenderInfo &renderInfo) const: case statement added for Varrier mode<br />
<PRE><br />
case osg::DisplaySettings::HORIZONTAL_INTERLACE:<br />
case osg::DisplaySettings::VERTICAL_INTERLACE:<br />
case osg::DisplaySettings::ANAGLYPHIC:<br />
case osg::DisplaySettings::VARRIER: // ADDED FOR VARRIER<br />
/* TODO */<br />
break;<br />
</PRE><br />
<br />
covise/src/renderer/OpenCOVER/kernel/coVRConfig.cpp<br />
<br />
in int coVRConfig::parseStereoMode(const char *modeName) const: statement added to parse Varrier stereo mode<br />
<PRE><br />
else if(modeName[0]=='\0')<br />
stereoMode = osg::DisplaySettings::ANAGLYPHIC;<br />
else if(strcasecmp(modeName,"VARRIER")==0) // ADDED FOR VARRIER<br />
stereoMode = osg::DisplaySettings::VARRIER; // ADDED FOR VARRIER<br />
else<br />
cerr << "Unknown stereo mode \"" << modeName << "\"" << endl;<br />
</PRE><br />
<br />
OpenSceneGraph-2.4 files modified<br />
<br />
covise/extern_libs/src/OpenSceneGraph/include/osg/DisplaySettings<br />
<br />
in class OSG_EXPORT DisplaySettings : public osg::Referenced<br />
<PRE><br />
enum StereoMode<br />
{<br />
QUAD_BUFFER,<br />
ANAGLYPHIC,<br />
HORIZONTAL_SPLIT,<br />
VERTICAL_SPLIT,<br />
LEFT_EYE,<br />
RIGHT_EYE,<br />
HORIZONTAL_INTERLACE,<br />
VERTICAL_INTERLACE,<br />
CHECKERBOARD,<br />
VARRIER // ADDED FOR VARRIER<br />
};<br />
</PRE><br />
<br />
covise/extern_libs/src/OpenSceneGraph/include/osgUtil/SceneView<br />
<br />
include added:<br />
<PRE><br />
#include </home/covise/covise/extern_libs/include/VarrierCombiner.h><br />
</PRE><br />
<br />
in class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings<br />
<PRE><br />
public functions added:<br />
static void setVarrierTestPattern(bool b);<br />
static bool isVarrierTestPattern();<br />
<br />
protected members added:<br />
static bool _varrierTestPattern;<br />
static VarrierCombiner** _varrier;<br />
int _delayCount; <br />
</PRE><br />
<br />
covise/extern_libs/src/OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp<br />
<br />
in bool GraphicsWindowX11::createWindow(): added code to force override redirect. <br />
<PRE><br />
swatt.background_pixel = 0;<br />
swatt.border_pixel = 0;<br />
swatt.event_mask = 0;<br />
unsigned long mask = CWBackPixel | CWBorderPixel | CWEventMask | CWColormap;<br />
<br />
// START OF VARRIER ADDED CODE<br />
<br />
bool overrideRedirect = false;<br />
<br />
char * override = getenv("OSG_OVERRIDE_REDIRECT");<br />
<br />
if(override != NULL && (std::string(override) == "1" || std::string(override) == "true"))<br />
{<br />
overrideRedirect = true;<br />
}<br />
<br />
if (overrideRedirect)<br />
{<br />
swatt.override_redirect = true;<br />
mask |= CWOverrideRedirect;<br />
}<br />
<br />
_window = XCreateWindow( _display, _parent, ......<br />
</PRE><br />
<br />
Added to fix title bars showing up randomly on some nodes. Not good to use on master node. The following:<br />
<PRE><br />
if($HOST != "vellum") then<br />
setenv OSG_OVERRIDE_REDIRECT 1<br />
endif<br />
</PRE><br />
at the end of .cshrc will make it only work on tile nodes.<br />
NOTE: using this flag reverses the right and left eye in varrier, don't ask me why.<br />
<br />
covise/extern_libs/src/OpenSceneGraph/src/osg/DisplaySettings.cpp<br />
<br />
<PRE><br />
static ApplicationUsageProxy DisplaySetting_e1(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_STEREO_MODE <mode>","QUAD_BUFFER | ANAGLYPHIC | HORIZONTAL_SPLIT | VERTICAL_SPLIT | LEFT_EYE | RIGHT_EYE | VERTICAL_INTERLACE | HORIZONTAL_INTERLACE | VARRIER"); // VARRIER ADDED<br />
</PRE><br />
<br />
in void DisplaySettings::readEnvironmentalVariables()<br />
<PRE><br />
if( (ptr = getenv("OSG_STEREO_MODE")) != 0)<br />
{<br />
if (strcmp(ptr,"QUAD_BUFFER")==0)<br />
{<br />
_stereoMode = QUAD_BUFFER;<br />
}<br />
......<br />
else if (strcmp(ptr,"VARRIER")==0)<br />
{<br />
_stereoMode = VARRIER;<br />
}<br />
}<br />
</PRE><br />
<br />
in void DisplaySettings::readCommandLine(ArgumentParser& arguments)<br />
<PRE><br />
if (arguments.getApplicationUsage())<br />
{<br />
arguments.getApplicationUsage()->addCommandLineOption("--display <type>","MONITOR | POWERWALL | REALITY_CENTER | HEAD_MOUNTED_DISPLAY");<br />
arguments.getApplicationUsage()->addCommandLineOption("--stereo","Use default stereo mode which is ANAGLYPHIC if not overriden by environmental variable");<br />
arguments.getApplicationUsage()->addCommandLineOption("--stereo <mode>","ANAGLYPHIC | QUAD_BUFFER | HORIZONTAL_SPLIT | VERTICAL_SPLIT | VARRIER | LEFT_EYE | RIGHT_EYE | HORIZONTAL_INTERLACE | VERTICAL_INTERLACE | CHECKERBOARD | ON | OFF "); // VARRIER ADDED<br />
......<br />
<br />
while ((pos=arguments.find("--stereo"))!=0)<br />
{<br />
if (arguments.match(pos+1,"ANAGLYPHIC")) { arguments.remove(pos,2); _stereo = true;_stereoMode = ANAGLYPHIC; }<br />
else if (arguments.match(pos+1,"QUAD_BUFFER")) { arguments.remove(pos,2); _stereo = true;_stereoMode = QUAD_BUFFER; }<br />
else if (arguments.match(pos+1,"HORIZONTAL_SPLIT")) { arguments.remove(pos,2); _stereo = true;_stereoMode = HORIZONTAL_SPLIT; }<br />
else if (arguments.match(pos+1,"VERTICAL_SPLIT")) { arguments.remove(pos,2); _stereo = true;_stereoMode = VERTICAL_SPLIT; }<br />
else if (arguments.match(pos+1,"HORIZONTAL_INTERLACE")) { arguments.remove(pos,2); _stereo = true;_stereoMode = HORIZONTAL_INTERLACE; }<br />
else if (arguments.match(pos+1,"VERTICAL_INTERLACE")) { arguments.remove(pos,2); _stereo = true;_stereoMode = VERTICAL_INTERLACE; }<br />
else if (arguments.match(pos+1,"CHECKERBOARD")) { arguments.remove(pos,2); _stereo = true;_stereoMode = CHECKERBOARD; }<br />
else if (arguments.match(pos+1,"VARRIER")) { arguments.remove(pos,2); _stereo = true;_stereoMode = VARRIER; } // ADDED FOR VARRIER<br />
.....<br />
</PRE><br />
<br />
covise/extern_libs/src/OpenSceneGraph/src/osgUtil/SceneView.cpp<br />
<br />
added static init:<br />
<PRE><br />
VarrierCombiner ** SceneView::_varrier = NULL;<br />
bool SceneView::_varrierTestPattern = false;<br />
</PRE><br />
<br />
in SceneView::SceneView(DisplaySettings* ds): at end<br />
<PRE><br />
_delayCount = 10;<br />
</PRE><br />
<br />
in SceneView::SceneView(const SceneView& rhs, const osg::CopyOp& copyop): at end<br />
<PRE><br />
_delayCount = rhs._delayCount;<br />
</PRE><br />
<br />
in void SceneView::draw(): case added for switch(_displaySettings->getStereoMode())<br />
<PRE><br />
case(osg::DisplaySettings::VARRIER):<br />
{<br />
enum {VARRIER_LEFT_EYE = 0, VARRIER_RIGHT_EYE = 1};<br />
float screenLoc[60][9] = // screen locations from vellum.lua FIXME: read from file instead<br />
{<br />
{ -4.7547, 1.5459, 0.6620, -0.0992, -0.0000, -1.3263, -0.0000, 1.0000, -0.0000 },<br />
.....<br />
};<br />
float line_screen[60][5] = {<br />
<br />
//{ 536.85342, -10.46, 0.0244, -0.0004, 0.75 },<br />
{ 536.85342, -10.445, 0.0231, 0.00075, 0.75 },<br />
.....<br />
};<br />
int nodeLUT[15] = {14, 11, 8, 5, 2, 13, 10, 7, 4, 1, 12, 9, 6, 3, 0};<br />
<br />
osg::notify(osg::DEBUG_INFO) << "osgUtil::SceneView in varrier mode called" << std::endl;<br />
<br />
if (_delayCount >= 0)<br />
{<br />
--_delayCount;<br />
if (_delayCount==0)<br />
{<br />
<br />
if(_varrier == NULL)<br />
{<br />
int maxContext = _renderInfo.getState()->getGraphicsContext()->getMaxContextID();<br />
_varrier = new VarrierCombiner*[maxContext+1];<br />
<br />
for(int i = 0; i <= maxContext; i++)<br />
{<br />
_varrier[i] = NULL;<br />
}<br />
}<br />
}<br />
}<br />
else // call every time once init has been called<br />
{<br />
static int swidth = 0;<br />
static int sheight = 0;<br />
static float squality = 0.0;<br />
int contextid = _renderInfo.getState()->getContextID();<br />
// Initialize varrier combiner if not already initialized:<br />
if (_varrier[contextid] == NULL)<br />
{<br />
swidth = int(getViewport()->width());<br />
sheight = int(getViewport()->height());<br />
char * qual = getenv("OSG_VARRIER_QUALITY");<br />
if(qual == NULL)<br />
{<br />
squality = 1.0;<br />
}<br />
else<br />
{<br />
squality = atof(qual);<br />
if(squality <= 0.0 || squality > 1.0)<br />
{<br />
squality = 1.0;<br />
}<br />
}<br />
osg::notify(osg::DEBUG_INFO) << "viewport size: " << swidth << " x " << sheight << std::endl;<br />
_varrier[contextid] = new VarrierCombiner(swidth, sheight, squality);<br />
osg::notify(osg::DEBUG_INFO) << "initializing varrier in context: " << contextid << " with quality: " << squality << std::endl;<br />
}<br />
<br />
// Varrier coordinates are like OpenGL: x=right, y=up, z=out<br />
// Get eye positions from OSG:<br />
osg::Camera* camLeft = _renderStageLeft->getCamera();<br />
osg::Camera* camRight = _renderStageRight->getCamera();<br />
Vec3 leftEye, rightEye, center, up;<br />
<br />
computeLeftEyeView(getViewMatrix()).getLookAt(leftEye,center, up);<br />
computeRightEyeView(getViewMatrix()).getLookAt(rightEye,center, up);<br />
<br />
// Rotate eyes 90 deg about x axis (Varrier uses y up coordinates):<br />
Matrixd rot;<br />
rot.makeRotate(90.0 * M_PI / 180.0, 1.0, 0.0, 0.0);<br />
leftEye = rot * leftEye;<br />
rightEye = rot * rightEye;<br />
<br />
<br />
// Translate coordinate system to floor in center of screen circle:<br />
leftEye[1] += 1120; leftEye[2] -= 1550;<br />
rightEye[1] += 1120; rightEye[2] -= 1550;<br />
<br />
// Convert eyes to float array and feet:<br />
float eyeLeft[3];<br />
float eyeRight[3];<br />
const double MM_IN_FEET = 0.0032808399;<br />
for (int i=0; i<3; ++i) eyeLeft[i] = leftEye[i] * MM_IN_FEET;<br />
for (int i=0; i<3; ++i) eyeRight[i] = rightEye[i] * MM_IN_FEET;<br />
<br />
osg::notify(osg::DEBUG_INFO) << "FEET: Left eye: " << eyeLeft[0] << ", " << eyeLeft[1] << ", " << eyeLeft[2] << std::endl;<br />
osg::notify(osg::DEBUG_INFO) << "FEET: Right eye: " << eyeRight[0] << ", " << eyeRight[1] << ", " << eyeRight[2] << std::endl;<br />
<br />
osg::Viewport * vport = getViewport();<br />
vport->setViewport(vport->x(), vport->y(), swidth * squality , sheight * squality);<br />
setViewport(vport);<br />
<br />
// Get OpenGL viewport location on desktop:<br />
int x = int(getViewport()->x());<br />
int y = int(getViewport()->y());<br />
int width = int(swidth);<br />
int height = int(sheight);<br />
<br />
osg::notify(osg::DEBUG_INFO) << "viewport: " << x << ", " << y << ", " << width << " x " << height << std::endl;<br />
<br />
// Calculate which screen index is being rendered:<br />
char hostname[33];<br />
gethostname(hostname, 32);<br />
int node;<br />
int screen;<br />
int quadrant;<br />
sscanf(hostname, "vellum%d-10", &node);<br />
--node;<br />
if (node<0) node = 0; // for head node<br />
else node = nodeLUT[node];<br />
if (x==0 && y==0) quadrant = 0;<br />
else if (x==0 && y>0) quadrant = 1;<br />
else if (x>0 && y==0) quadrant = 2;<br />
else quadrant = 3;<br />
screen = node * 4 + (contextid * 2) + quadrant;<br />
osg::notify(osg::DEBUG_INFO) << "rendering using varrier combiner on " << hostname << ", node " << node << ", screen " << screen << std::endl;<br />
<br />
VarrierCombiner::Display varrierConfig;<br />
varrierConfig.viewport_x = x;<br />
varrierConfig.viewport_y = y;<br />
varrierConfig.viewport_w = width;<br />
varrierConfig.viewport_h = height;<br />
varrierConfig.quality = squality;<br />
<br />
// Create absolute points from vellum.lua values:<br />
varrierConfig.screen_BL[0] = screenLoc[screen][0];<br />
varrierConfig.screen_BL[1] = screenLoc[screen][1];<br />
varrierConfig.screen_BL[2] = screenLoc[screen][2];<br />
varrierConfig.screen_BR[0] = screenLoc[screen][0] + screenLoc[screen][3];<br />
varrierConfig.screen_BR[1] = screenLoc[screen][1] + screenLoc[screen][4];<br />
varrierConfig.screen_BR[2] = screenLoc[screen][2] + screenLoc[screen][5];<br />
varrierConfig.screen_TL[0] = screenLoc[screen][0] + screenLoc[screen][6];<br />
varrierConfig.screen_TL[1] = screenLoc[screen][1] + screenLoc[screen][7];<br />
varrierConfig.screen_TL[2] = screenLoc[screen][2] + screenLoc[screen][8];<br />
<br />
osg::notify(osg::DEBUG_INFO) <<<br />
"screen - BL: " << varrierConfig.screen_BL[0] << ", " << varrierConfig.screen_BL[1] << ", " << varrierConfig.screen_BL[2] << ", " <<<br />
"BR: " << varrierConfig.screen_BR[0] << ", " << varrierConfig.screen_BR[1] << ", " << varrierConfig.screen_BR[2] << ", " <<<br />
"TL: " << varrierConfig.screen_TL[0] << ", " << varrierConfig.screen_TL[1] << ", " << varrierConfig.screen_TL[2] << ", " << std::endl;<br />
<br />
varrierConfig.pitch = line_screen[screen][0];<br />
varrierConfig.angle = line_screen[screen][1];<br />
varrierConfig.thick = line_screen[screen][2];<br />
varrierConfig.shift = line_screen[screen][3];<br />
varrierConfig.cycle = line_screen[screen][4];<br />
<br />
if( getDrawBufferValue() != GL_NONE)<br />
{<br />
_renderStageLeft->setDrawBuffer(getDrawBufferValue());<br />
_renderStageLeft->setReadBuffer(getDrawBufferValue());<br />
<br />
_renderStageRight->setDrawBuffer(getDrawBufferValue());<br />
_renderStageRight->setReadBuffer(getDrawBufferValue());<br />
}<br />
<br />
// ensure that all color planes are active.<br />
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));<br />
if (cmask)<br />
{<br />
cmask->setMask(true,true,true,true);<br />
}<br />
else<br />
{<br />
cmask = new osg::ColorMask(true,true,true,true);<br />
_localStateSet->setAttribute(cmask);<br />
}<br />
_renderStageLeft->setColorMask(cmask);<br />
_renderStageRight->setColorMask(cmask);<br />
<br />
_renderInfo.getState()->getContextID();<br />
osg::notify(osg::DEBUG_INFO) << "GL context ID: " << _renderInfo.getState()->getContextID() << std::endl;<br />
<br />
//_localStateSet->setAttribute(getViewport());<br />
_renderStageLeft->drawPreRenderStages(_renderInfo,previous);<br />
_renderStageRight->drawPreRenderStages(_renderInfo,previous);<br />
<br />
glPushAttrib(GL_ALL_ATTRIB_BITS);<br />
<br />
// render left eye:<br />
_varrier[contextid]->prepare(&varrierConfig, VARRIER_RIGHT_EYE);<br />
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);<br />
osg::notify(osg::DEBUG_INFO) << "GL context ID: " << _renderInfo.getState()->getContextID() << std::endl;<br />
<br />
_renderStageLeft->draw(getRenderInfo(),previous);<br />
osg::notify(osg::DEBUG_INFO) << "After renderleft." << std::endl;<br />
<br />
if (_varrierTestPattern)<br />
{<br />
glClearColor(0.0, 1.0, 0.0, 1.0);<br />
glClear(GL_COLOR_BUFFER_BIT);<br />
}<br />
<br />
// render right eye:<br />
_varrier[contextid]->prepare(&varrierConfig, VARRIER_LEFT_EYE);<br />
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);<br />
<br />
_renderStageRight->draw(getRenderInfo(),previous);<br />
osg::notify(osg::DEBUG_INFO) << "After renderright." << std::endl;<br />
<br />
if (_varrierTestPattern)<br />
{<br />
glClearColor(1.0, 0.0, 1.0, 1.0);<br />
glClear(GL_COLOR_BUFFER_BIT);<br />
}<br />
<br />
// combine eyes:<br />
_varrier[contextid]->combine(&varrierConfig, eyeLeft, eyeRight);<br />
<br />
osg::notify(osg::DEBUG_INFO) << "After combine." << std::endl;<br />
<br />
glPopAttrib();<br />
}<br />
} // end varrier style<br />
break;<br />
</PRE><br />
<br />
in bool SceneView::getStats(Statistics& stats): case added<br />
<PRE><br />
switch(_displaySettings->getStereoMode())<br />
{<br />
case(osg::DisplaySettings::QUAD_BUFFER):<br />
case(osg::DisplaySettings::ANAGLYPHIC):<br />
case(osg::DisplaySettings::HORIZONTAL_SPLIT):<br />
case(osg::DisplaySettings::VERTICAL_SPLIT):<br />
case(osg::DisplaySettings::VERTICAL_INTERLACE):<br />
case(osg::DisplaySettings::HORIZONTAL_INTERLACE):<br />
case(osg::DisplaySettings::VARRIER): // ADDED FOR VARRIER<br />
{<br />
bool resultLeft = _renderStageLeft->getStats(stats);<br />
bool resultRight = _renderStageRight->getStats(stats);<br />
return resultLeft && resultRight;<br />
}<br />
</PRE><br />
functions added:<br />
<PRE><br />
void SceneView::setVarrierTestPattern(bool b)<br />
{<br />
_varrierTestPattern = b;<br />
}<br />
<br />
bool SceneView::isVarrierTestPattern()<br />
{<br />
return _varrierTestPattern;<br />
}<br />
</PRE><br />
NOTE: osg needs to link against the varrier library, thus it needs to be added to the linking operation. Adding it to (osgDir)/src/osgViewer/CMakeFiles/osgViewer.dir/link.txt worked for me.<br />
<br />
.cshrc changes:<br />
<PRE><br />
#sets varrier quality mode<br />
setenv OSG_VARRIER_QUALITY 0.5<br />
<br />
#sets override flag for all but headnode<br />
if($HOST != "vellum") then<br />
setenv OSG_OVERRIDE_REDIRECT 1<br />
endif<br />
</PRE></div>
Aprudhom