Changeset 403 for experimental


Ignore:
Timestamp:
Jul 22, 2012, 6:11:10 PM (12 years ago)
Author:
Torben Dannhauer
Message:

placebo Manipulator added to allow to use manipulators together with directly set Viewer matrix

Location:
experimental/distortionNG
Files:
8 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • experimental/distortionNG/DistortionManipulator.cpp

    r401 r403  
    8484bool DistortionManipulator::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, osg::Object* obj, osg::NodeVisitor* nv)
    8585{
    86 
    87 
    8886        switch(ea.getEventType())
    8987    {
  • experimental/distortionNG/distortionNG.vcproj

    r392 r403  
    357357                                >
    358358                        </File>
     359                        <File
     360                                RelativePath=".\PlaceboManipulator.cpp"
     361                                >
     362                        </File>
    359363                </Filter>
    360364                <Filter
     
    383387                                >
    384388                        </File>
     389                        <File
     390                                RelativePath=".\PlaceboManipulator.h"
     391                                >
     392                        </File>
    385393                </Filter>
    386394                <Filter
  • experimental/distortionNG/main.cpp

    r394 r403  
    3838#include "DistortionManipulator.h"
    3939#include "DistortionSetupStrategyProjectSyntropy.h"
     40#include "PlaceboManipulator.h"
    4041
    4142int main(int argc, char** argv)
     
    7374    keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
    7475    keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
     76        keyswitchManipulator->addMatrixManipulator( '5', "Placebo", new osgGA::PlaceboManipulator() );
    7577
    7678    std::string pathfile;
    77     char keyForAnimationPath = '5';
     79    char keyForAnimationPath = '6';
    7880    while (arguments.read("-p",pathfile))
    7981    {
     
    9597
    9698        DistortionSetupStrategyProjectSyntropy* psStrategy = new DistortionSetupStrategyProjectSyntropy();
    97         psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/Vertices/warpmap_1.csv",
    98                                                                                 //"./resources/ProjectSyntropy/TexCoords/warpmap_1.csv",
    99                                                                                 "./resources/ProjectSyntropy/blending_1.bmp",
    100                                                                                 "./resources/ProjectSyntropy/Vertices/frustum_1.csv" );
     99        psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/example2/warpmap_1.csv",
     100                                                                                "./resources/ProjectSyntropy/example2/blending_1.bmp",
     101                                                                                "./resources/ProjectSyntropy/example2/frustum_1.csv" );
    101102        distortionManip->setDistortionSetupStrategy( psStrategy );
    102103        viewer.addEventHandler(distortionManip);
Note: See TracChangeset for help on using the changeset viewer.