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

Fixing line endings

Browse source
This commit is contained in:
Brad Davis 2015-10-19 16:51:31 -07:00
parent 052ad1236c
commit 5a0bb4c31b
1 changed files with 150 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

300
tests/controllers/src/main.cpp
View file

@ -1,158 +1,158 @@
// //
// main.cpp // main.cpp
// tests/gpu-test/src // tests/gpu-test/src
// //
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <unordered_map> #include <unordered_map>
#include <memory> #include <memory>
#include <cstdio> #include <cstdio>
#include <mutex> #include <mutex>
#include <set> #include <set>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <QtCore/QTime> #include <QtCore/QTime>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>
#include <QtGui/QResizeEvent> #include <QtGui/QResizeEvent>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtQuick/QQuickItem> #include <QtQuick/QQuickItem>
#include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext> #include <QtQml/QQmlContext>
#include <plugins/Plugin.h> #include <plugins/Plugin.h>
#include <plugins/PluginContainer.h> #include <plugins/PluginContainer.h>
#include <plugins/PluginManager.h> #include <plugins/PluginManager.h>
#include <input-plugins/InputPlugin.h> #include <input-plugins/InputPlugin.h>
#include <input-plugins/KeyboardMouseDevice.h> #include <input-plugins/KeyboardMouseDevice.h>
#include <controllers/ScriptingInterface.h> #include <controllers/ScriptingInterface.h>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <controllers/UserInputMapper.h> #include <controllers/UserInputMapper.h>
const QString& getResourcesDir() { const QString& getResourcesDir() {
static QString dir; static QString dir;
if (dir.isEmpty()) { if (dir.isEmpty()) {
QDir path(__FILE__); QDir path(__FILE__);
path.cdUp(); path.cdUp();
dir = path.cleanPath(path.absoluteFilePath("../../../interface/resources/")) + "/"; dir = path.cleanPath(path.absoluteFilePath("../../../interface/resources/")) + "/";
qDebug() << "Resources Path: " << dir; qDebug() << "Resources Path: " << dir;
} }
return dir; return dir;
} }
const QString& getQmlDir() { const QString& getQmlDir() {
static QString dir; static QString dir;
if (dir.isEmpty()) { if (dir.isEmpty()) {
dir = getResourcesDir() + "qml/"; dir = getResourcesDir() + "qml/";
qDebug() << "Qml Path: " << dir; qDebug() << "Qml Path: " << dir;
} }
return dir; return dir;
} }
const QString& getTestQmlDir() { const QString& getTestQmlDir() {
static QString dir; static QString dir;
if (dir.isEmpty()) { if (dir.isEmpty()) {
QDir path(__FILE__); QDir path(__FILE__);
path.cdUp(); path.cdUp();
dir = path.cleanPath(path.absoluteFilePath("../")) + "/qml/"; dir = path.cleanPath(path.absoluteFilePath("../")) + "/qml/";
qDebug() << "Qml Test Path: " << dir; qDebug() << "Qml Test Path: " << dir;
} }
return dir; return dir;
} }
using namespace controller; using namespace controller;
class PluginContainerProxy : public QObject, PluginContainer { class PluginContainerProxy : public QObject, PluginContainer {
Q_OBJECT Q_OBJECT
public: public:
PluginContainerProxy() { PluginContainerProxy() {
Plugin::setContainer(this); Plugin::setContainer(this);
} }
virtual ~PluginContainerProxy() {} virtual ~PluginContainerProxy() {}
virtual void addMenu(const QString& menuName) override {} virtual void addMenu(const QString& menuName) override {}
virtual void removeMenu(const QString& menuName) override {} virtual void removeMenu(const QString& menuName) override {}
virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr; } virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr; }
virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override {} virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override {}
virtual bool isOptionChecked(const QString& name) override { return false; } virtual bool isOptionChecked(const QString& name) override { return false; }
virtual void setIsOptionChecked(const QString& path, bool checked) override {} virtual void setIsOptionChecked(const QString& path, bool checked) override {}
virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override {} virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override {}
virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override {} virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override {}
virtual void showDisplayPluginsTools() override {} virtual void showDisplayPluginsTools() override {}
virtual void requestReset() override {} virtual void requestReset() override {}
virtual QGLWidget* getPrimarySurface() override { return nullptr; } virtual QGLWidget* getPrimarySurface() override { return nullptr; }
virtual bool isForeground() override { return true; } virtual bool isForeground() override { return true; }
virtual const DisplayPlugin* getActiveDisplayPlugin() const override { return nullptr; } virtual const DisplayPlugin* getActiveDisplayPlugin() const override { return nullptr; }
}; };
class MyControllerScriptingInterface : public controller::ScriptingInterface { class MyControllerScriptingInterface : public controller::ScriptingInterface {
public: public:
virtual void registerControllerTypes(QScriptEngine* engine) {}; virtual void registerControllerTypes(QScriptEngine* engine) {};
}; };
int main(int argc, char** argv) { int main(int argc, char** argv) {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
auto rootContext = engine.rootContext(); auto rootContext = engine.rootContext();
new PluginContainerProxy(); new PluginContainerProxy();
// Simulate our application idle loop
QTimer timer;
QObject::connect(&timer, &QTimer::timeout, [] {
static float last = secTimestampNow();
float now = secTimestampNow();
float delta = now - last;
last = now;
foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
inputPlugin->pluginUpdate(delta, false);
}
auto userInputMapper = DependencyManager::get<UserInputMapper>();
userInputMapper->update(delta);
});
timer.start(50);
{ // Simulate our application idle loop
DependencyManager::set<UserInputMapper>(); QTimer timer;
foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) { QObject::connect(&timer, &QTimer::timeout, [] {
QString name = inputPlugin->getName(); static float last = secTimestampNow();
inputPlugin->activate(); float now = secTimestampNow();
auto userInputMapper = DependencyManager::get<UserInputMapper>(); float delta = now - last;
if (name == KeyboardMouseDevice::NAME) { last = now;
auto keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
keyboardMouseDevice->registerToUserInputMapper(*userInputMapper); foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
} inputPlugin->pluginUpdate(delta, false);
inputPlugin->pluginUpdate(0, false); }
}
auto userInputMapper = DependencyManager::get<UserInputMapper>();
userInputMapper->update(delta);
});
timer.start(50);
{
DependencyManager::set<UserInputMapper>();
foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
QString name = inputPlugin->getName();
inputPlugin->activate();
auto userInputMapper = DependencyManager::get<UserInputMapper>();
if (name == KeyboardMouseDevice::NAME) {
auto keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
keyboardMouseDevice->registerToUserInputMapper(*userInputMapper);
}
inputPlugin->pluginUpdate(0, false);
}
rootContext->setContextProperty("Controllers", new MyControllerScriptingInterface()); rootContext->setContextProperty("Controllers", new MyControllerScriptingInterface());
} }
qDebug() << getQmlDir(); qDebug() << getQmlDir();
rootContext->setContextProperty("ResourcePath", getQmlDir()); rootContext->setContextProperty("ResourcePath", getQmlDir());
engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir())); engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir()));
engine.addImportPath(getQmlDir()); engine.addImportPath(getQmlDir());
engine.load(getTestQmlDir() + "main.qml"); engine.load(getTestQmlDir() + "main.qml");
for (auto pathItem : engine.importPathList()) { for (auto pathItem : engine.importPathList()) {
qDebug() << pathItem; qDebug() << pathItem;
} }
app.exec(); app.exec();
return 0; return 0;
} }
#include "main.moc" #include "main.moc"