diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-12 19:44:16 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-12 19:44:16 (GMT) |
| commit | 9a9afb6aaf314a68901cce3463e91512c261bd7a (patch) | |
| tree | 20e7f888da47c67272cfd2c1c16d62e9189ed6c5 /src | |
| parent | 363250f8a9e33dc3f198f114fdfccd100b55ca12 (diff) | |
| download | uscxml-9a9afb6aaf314a68901cce3463e91512c261bd7a.zip uscxml-9a9afb6aaf314a68901cce3463e91512c261bd7a.tar.gz uscxml-9a9afb6aaf314a68901cce3463e91512c261bd7a.tar.bz2 | |
Started with JavaScript DM in Java (Rhino)
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/interpreter/InterpreterDraft6.cpp | 2 | ||||
| -rw-r--r-- | src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp index 02dcff5..721aea0 100644 --- a/src/uscxml/interpreter/InterpreterDraft6.cpp +++ b/src/uscxml/interpreter/InterpreterDraft6.cpp @@ -432,7 +432,7 @@ LOOP: enabledTransitions = filterPreempted(enabledTransitions); -#if 1 +#if 0 std::cout << "Enabled transitions: " << std::endl; for (int i = 0; i < enabledTransitions.size(); i++) { std::cout << DOMUtils::xPathForNode(enabledTransitions[i]) << std::endl; diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp index 536d276..bc747a1 100644 --- a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp +++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.cpp @@ -342,7 +342,7 @@ void OSGConverter::process(const SendRequest& req) { viewer.getCameraManipulator()->setByMatrix(osg::Matrix::lookAt(osg::Vec3d(0,0,bs.radius() * (-3.4 * zoom)), // eye (osg::Vec3d)bs.center(), // center - osg::Vec3d(0,1,0))); // up + osg::Vec3d(0,0,1))); // up osg::Image *image = new osg::Image(); camera->attach(osg::Camera::COLOR_BUFFER0, image); |