Commit 0b140c05 authored by Jussi Lindgren's avatar Jussi Lindgren

Everything: Small fixes

- Fixed version number in the generated doc. Its now automatically generated.
- Designer will now point to the version-specific web documentation
- Fixed lua stimulator tutorial (Mantis #172)
- Added some verbosity to VR Demo & fixed an unimportant memory leak
- Updated version to 1.0.0+git
parent 2f255569
......@@ -6,7 +6,7 @@ PROJECT(OpenVIBE)
# If you wish to maintain specific version numbers for a subproject, please do so in the projects CMakeLists.txt
SET(OV_GLOBAL_VERSION_MAJOR 1)
SET(OV_GLOBAL_VERSION_MINOR 0)
SET(OV_GLOBAL_VERSION_PATCH 0)
SET(OV_GLOBAL_VERSION_PATCH 0+git)
# Default is to build to dist/. If you wish a custom install, set your own MAKE_INSTALL_PREFIX when you call CMake. Safest to do under a fakeroot.
#IF(NOT CMAKE_INSTALL_PREFIX)
......
particle_system tie-fighter/spark
particle_system spaceship/spark
{
quota 2000
material ringflare
......
......@@ -335,6 +335,8 @@ bool CSpaceshipBCI::process(double timeSinceLastProcess)
if(l_rVrpnButtonState.second) // if the button is ON
{
// std::cout << "Received button " << l_rVrpnButtonState.first << "\n";
switch(l_rVrpnButtonState.first)
{
case 0: m_iPhase=Phase_Rest; break;
......@@ -344,6 +346,8 @@ bool CSpaceshipBCI::process(double timeSinceLastProcess)
case 4: m_iStage=Stage_FreetimeReal; break;
case 5: m_iStage=Stage_FreetimeImaginary; break;
case 6: m_iStage=Stage_Statistics; break;
default:
std::cout << "Received unsupported button " << l_rVrpnButtonState.first << "\n";
}
}
......@@ -357,7 +361,7 @@ bool CSpaceshipBCI::process(double timeSinceLastProcess)
m_dFeedback = *(l_rVrpnAnalogState.begin());
m_dMinimumFeedback = (m_dMinimumFeedback > m_dFeedback ? m_dFeedback : m_dMinimumFeedback);
//cout<< "New analog state received. Feedback is : "<<m_dFeedback<<endl;
// std::cout << "Received analog " << m_dFeedback << "\n";
m_poVrpnPeripheral->m_vAnalog.pop_front();
}
......
......@@ -45,6 +45,7 @@ namespace
CAbstractVrpnPeripheral::CAbstractVrpnPeripheral(void)
{
m_pDevice = NULL;
m_dAnalogScale=1;
m_dAnalogOffset=0;
m_sDeviceAddress = "openvibe-vrpn@localhost";
......@@ -52,6 +53,7 @@ CAbstractVrpnPeripheral::CAbstractVrpnPeripheral(void)
CAbstractVrpnPeripheral::CAbstractVrpnPeripheral(const std::string serverName)
{
m_pDevice = NULL;
m_dAnalogScale=1;
m_dAnalogOffset=0;
m_sDeviceAddress = serverName;
......@@ -59,6 +61,13 @@ CAbstractVrpnPeripheral::CAbstractVrpnPeripheral(const std::string serverName)
CAbstractVrpnPeripheral::~CAbstractVrpnPeripheral(void)
{
if(m_pDevice)
{
delete m_pDevice->m_pAnalog;
delete m_pDevice->m_pButton;
delete m_pDevice;
m_pDevice = NULL;
}
}
void CAbstractVrpnPeripheral::init(void)
......
......@@ -172,9 +172,12 @@ bool COgreVRApplication::setup()
this->initCEGUI(OpenViBE::Directories::getLogDir() + "/openvibe-vr-demo-cegui.log");
//VRPN
m_poVrpnPeripheral = new CAbstractVrpnPeripheral("openvibe-vrpn@localhost");
const std::string l_sVRPNAddress("openvibe-vrpn@localhost");
m_poVrpnPeripheral = new CAbstractVrpnPeripheral(l_sVRPNAddress);
m_poVrpnPeripheral->init();
std::cout << "Listening to VRPN address [" << l_sVRPNAddress << "]\n";
return true;
}
......
......@@ -112,6 +112,11 @@ IF(doxygen_bin)
CreateDoxygen.cmake
@ONLY)
CONFIGURE_FILE(
openvibe.dox-base
openvibe.dox
@ONLY)
IF(WIN32)
ADD_CUSTOM_COMMAND(
TARGET ${PROJECT_NAME}
......
......@@ -2,7 +2,7 @@
\mainpage Home
\section Doc_Preface Preface
Welcome to the Doxygen Documentation for OpenViBE v0.18+git.x.
Welcome to the Doxygen Documentation for OpenViBE @PROJECT_VERSION@.
The tutorials and user manual, as well as build instructions for OpenViBE are located on the website : http://openvibe.inria.fr/documentation-index
......
......@@ -75,7 +75,6 @@ IF(UNIX)
ADD_DEFINITIONS(-DTARGET_COMPILER_GCC)
ENDIF(UNIX)
# -----------------------------
# Install files
# -----------------------------
......@@ -84,6 +83,23 @@ INSTALL(TARGETS ${PROJECT_NAME}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
INSTALL(DIRECTORY share/ DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/openvibe/kernel PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY share/ DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/openvibe/kernel PATTERN ".svn" EXCLUDE PATTERN "*-base" EXCLUDE)
#INSTALL(DIRECTORY src/ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "doc" EXCLUDE)
# -----------------------------
# Install and configure .conf
# -----------------------------
# This construct is to fetch the documentation specific to this version.
# In addition, it tweaks the patch version to allow the "1.0.0+git" style version to
# fetch the "1.0.0" (base) version documentation as we don't have git version docs on the web.
STRING(REGEX REPLACE "[^0-9]" "" PROJECT_VERSION_PATCH_PRUNED ${PROJECT_VERSION_PATCH})
SET(OV_PROJECT_BASE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH_PRUNED})
CONFIGURE_FILE(share/openvibe.conf-base "${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf" @ONLY)
CONFIGURE_FILE(share/openvibe_test.conf-base "${CMAKE_CURRENT_BINARY_DIR}/openvibe_test.conf" @ONLY)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/openvibe.conf" DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/openvibe/kernel)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/openvibe_test.conf" DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/openvibe/kernel)
......@@ -101,7 +101,7 @@ Designer_WindowManager_Center = false
Designer_WebBrowserCommand_Windows = explorer
Designer_WebBrowserCommand_Linux = xdg-open
Designer_WebBrowserCommand = ${Designer_WebBrowserCommand_${OperatingSystem}}
Designer_WebBrowserHelpURLBase = http://openvibe.inria.fr/documentation/unstable
Designer_WebBrowserHelpURLBase = http://openvibe.inria.fr/documentation/@OV_PROJECT_BASE_VERSION@
Designer_WebBrowserOpenViBEHomepage = http://openvibe.inria.fr/
Designer_ScriptEditorCommand_Windows = notepad
Designer_ScriptEditorCommand_Linux = xdg-open
......
......@@ -101,7 +101,7 @@ Designer_WindowManager_Center = false
Designer_WebBrowserCommand_Windows = explorer
Designer_WebBrowserCommand_Linux = xdg-open
Designer_WebBrowserCommand = ${Designer_WebBrowserCommand_${OperatingSystem}}
Designer_WebBrowserHelpURLBase = http://openvibe.inria.fr/documentation/unstable
Designer_WebBrowserHelpURLBase = http://openvibe.inria.fr/documentation/@OV_PROJECT_BASE_VERSION@
Designer_WebBrowserOpenViBEHomepage = http://openvibe.inria.fr/
Designer_ScriptEditorCommand_Windows = notepad
Designer_ScriptEditorCommand_Linux = xdg-open
......
......@@ -233,7 +233,7 @@ function process(box)
-- enters infinite loop
-- cpu will be released with a call to sleep
-- at the end of the loop
while true do
while box:keep_processing() do
-- gets current simulated time
t = box:get_current_time()
......
......@@ -145,7 +145,7 @@ namespace OpenViBEToolkit
OpenViBE::uint64 l_ui64StimId=m_rTypeManager.getEnumerationEntryValueFromName(m_oSettingType, m_sSettingValue);
if(l_ui64StimId==0xffffffffffffffffll)
{
m_rLogManager << OpenViBE::Kernel::LogLevel_ImportantWarning << "Did not find an enumeration value for [" << m_rTypeManager.getTypeName(m_oSettingType) << ":" << m_sSettingValue << "]\n";
m_rLogManager << OpenViBE::Kernel::LogLevel_ImportantWarning << "Did not find an enumeration value for [" << m_rTypeManager.getTypeName(m_oSettingType) << "] = [" << m_sSettingValue << "]\n";
}
return l_ui64StimId;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment