Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:57:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-12-17 14:27:54 -08:00
parent 88c319a0da
commit f469553b8c
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/CMakeLists.txt
View file

@ -30,7 +30,7 @@ link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(particle-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(particle-server ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(voxel-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(voxel-server ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(scriptengine ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR})
#testing #testing
include_directories(${ROOT_DIR}/externals/civetweb/include) include_directories(${ROOT_DIR}/externals/civetweb/include)

2
interface/CMakeLists.txt
View file

@ -96,7 +96,7 @@ link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(scriptengine ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR})
# find required libraries # find required libraries
find_package(Faceshift) find_package(Faceshift)

2
libraries/scriptengine/CMakeLists.txt → libraries/script-engine/CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
# setup for find modules # setup for find modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
set(TARGET_NAME scriptengine) set(TARGET_NAME script-engine)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)

4
libraries/scriptengine/src/ScriptEngine.cpp → libraries/script-engine/src/ScriptEngine.cpp
View file

@ -24,7 +24,7 @@
int ScriptEngine::_scriptNumber = 1; int ScriptEngine::_scriptNumber = 1;
ScriptEngine::ScriptEngine(QString scriptContents, bool wantMenuItems, ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,
const char* scriptMenuName, AbstractMenuInterface* menu) { const char* scriptMenuName, AbstractMenuInterface* menu) {
_scriptContents = scriptContents; _scriptContents = scriptContents;
_isFinished = false; _isFinished = false;
@ -60,7 +60,7 @@ void ScriptEngine::cleanMenuItems() {
} }
} }
bool ScriptEngine::setScriptContents(QString scriptContents) { bool ScriptEngine::setScriptContents(const QString& scriptContents) {
if (_isRunning) { if (_isRunning) {
return false; return false;
} }

4
libraries/scriptengine/src/ScriptEngine.h → libraries/script-engine/src/ScriptEngine.h
View file

@ -24,7 +24,7 @@ const QString NO_SCRIPT("");
class ScriptEngine : public QObject { class ScriptEngine : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ScriptEngine(QString scriptContents = NO_SCRIPT, bool wantMenuItems = false, ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,
const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL); const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL);
~ScriptEngine(); ~ScriptEngine();
@ -36,7 +36,7 @@ public:
ParticleScriptingInterface* getParticleScriptingInterface() { return &_particleScriptingInterface; } ParticleScriptingInterface* getParticleScriptingInterface() { return &_particleScriptingInterface; }
/// sets the script contents, will return false if failed, will fail if script is already running /// sets the script contents, will return false if failed, will fail if script is already running
bool setScriptContents(QString scriptContents); bool setScriptContents(const QString& scriptContents);
void setupMenuItems(); void setupMenuItems();
void cleanMenuItems(); void cleanMenuItems();