Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix linux build warning; remove unnecessary code

Browse source
This commit is contained in:
humbletim 2019-07-23 12:13:18 -04:00
parent e9e9607a3b
commit c5b2514e0e
5 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -190,7 +190,6 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
case Context::ENTITY_SERVER_SCRIPT: case Context::ENTITY_SERVER_SCRIPT:
_type = Type::ENTITY_SERVER; _type = Type::ENTITY_SERVER;
break; break;
case Context::EDIT_FILTER_SCRIPT:
case Context::AGENT_SCRIPT: case Context::AGENT_SCRIPT:
_type = Type::AGENT; _type = Type::AGENT;
break; break;

3
libraries/script-engine/src/ScriptEngine.h
View file

@ -130,8 +130,7 @@ public:
CLIENT_SCRIPT, CLIENT_SCRIPT,
ENTITY_CLIENT_SCRIPT, ENTITY_CLIENT_SCRIPT,
ENTITY_SERVER_SCRIPT, ENTITY_SERVER_SCRIPT,
AGENT_SCRIPT, AGENT_SCRIPT
EDIT_FILTER_SCRIPT
}; };
enum Type { enum Type {

4
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -542,9 +542,7 @@ void ScriptEngines::quitWhenFinished() {
int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) { int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
auto nativeCount = DependencyManager::get<ScriptInitializers>()->runScriptInitializers(scriptEngine.data()); auto nativeCount = DependencyManager::get<ScriptInitializers>()->runScriptInitializers(scriptEngine.data());
return nativeCount + std::count_if(_scriptInitializers.begin(), _scriptInitializers.end(), return nativeCount + ScriptInitializerMixin<ScriptEnginePointer>::runScriptInitializers(scriptEngine);
[scriptEngine](auto initializer){ initializer(scriptEngine); return true; }
);
} }
void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) { void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {

4
plugins/KasenAPIExample/CMakeLists.txt
View file

@ -1,7 +1,3 @@
set(TARGET_NAME KasenAPIExample) set(TARGET_NAME KasenAPIExample)
setup_hifi_client_server_plugin() setup_hifi_client_server_plugin()
link_hifi_libraries(shared plugins avatars networking graphics gpu) link_hifi_libraries(shared plugins avatars networking graphics gpu)
if (BUILD_SERVER)
install_beside_console()
endif()

2
plugins/KasenAPIExample/src/KasenAPIExample.cpp
View file

@ -105,7 +105,7 @@ private:
static QVariantMap zipNonZeroValues(const QStringList& keys, const QVector<float>& values) { static QVariantMap zipNonZeroValues(const QStringList& keys, const QVector<float>& values) {
QVariantMap out; QVariantMap out;
for (int i=1; i < values.size(); i++) { for (int i=1; i < values.size(); i++) {
if (fabs(values[i]) > 1.0e-6f) { if (fabs(values[i]) > 1.0e-6) {
out[keys.value(i)] = values[i]; out[keys.value(i)] = values[i];
} }
} }