Skip to content

Commit

Permalink
Merged with kchen.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdfeist committed Jun 13, 2013
1 parent 9dc9a88 commit 3a9c215
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion BlinkAnalysis/BlinkAnalysis.cpp
Expand Up @@ -21,11 +21,13 @@ int main(array<System::String ^> ^args)
// Create the ClientHandler and attach it to the global App Data // Create the ClientHandler and attach it to the global App Data
ClientHandler* client = new ClientHandler(); ClientHandler* client = new ClientHandler();
AppData::getInstance()->setClient(client); AppData::getInstance()->setClient(client);

// Create new custom world
CaptureWorld* world = new CaptureWorld(); CaptureWorld* world = new CaptureWorld();
world->setName("default"); world->setName("default");
AppData::getInstance()->addWorld(world); AppData::getInstance()->addWorld(world);
//TODO TESTING //TODO TESTING
world->addPlane(osg::Vec3(0, 0, 0.5), osg::Vec3(1, 0, 0.5), osg::Vec3(0, 1, 0.5), ""); world->addPlane(osg::Vec3(0, 0, 0.5), osg::Vec3(1, 0, 0.5), osg::Vec3(0, 1, 0.5), "Plane");


if (args->Length >= 1) { if (args->Length >= 1) {
char* fileName = (char*)Marshal::StringToHGlobalAnsi(args[0]).ToPointer(); char* fileName = (char*)Marshal::StringToHGlobalAnsi(args[0]).ToPointer();
Expand Down
Binary file removed BlinkAnalysis/rayMap.bmp
Binary file not shown.

0 comments on commit 3a9c215

Please sign in to comment.