Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback new class names

Browse source
This commit is contained in:
ZappoMan 2013-12-18 08:42:34 -08:00
parent a59650beac
commit 70e9781ad9
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.h
View file

@ -69,7 +69,7 @@
#include "ui/LodToolsDialog.h"
#include "ParticleTreeRenderer.h"
#include "ParticleEditHandle.h"
#include "InterfaceControllerScriptingInterface.h"
#include "ControllerScriptingInterface.h"
class QAction;
@ -506,7 +506,7 @@ private:
std::vector<VoxelFade> _voxelFades;
std::vector<Avatar*> _avatarFades;
InterfaceControllerScriptingInterface _controllerScriptingInterface;
ControllerScriptingInterface _controllerScriptingInterface;
};
#endif /* defined(__interface__Application__) */

10
interface/src/InterfaceControllerScriptingInterface.cpp → interface/src/ControllerScriptingInterface.cpp
View file

@ -1,5 +1,5 @@
//
// InterfaceControllerScriptingInterface.h
// ControllerScriptingInterface.h
// hifi
//
// Created by Brad Hefta-Gaub on 12/17/13
@ -8,9 +8,9 @@
#include <HandData.h>
#include "Application.h"
#include "InterfaceControllerScriptingInterface.h"
#include "ControllerScriptingInterface.h"
const PalmData* InterfaceControllerScriptingInterface::getPrimaryPalm() const {
const PalmData* ControllerScriptingInterface::getPrimaryPalm() const {
int leftPalmIndex, rightPalmIndex;
const HandData* handData = Application::getInstance()->getAvatar()->getHandData();
@ -23,7 +23,7 @@ const PalmData* InterfaceControllerScriptingInterface::getPrimaryPalm() const {
return NULL;
}
bool InterfaceControllerScriptingInterface::isPrimaryButtonPressed() const {
bool ControllerScriptingInterface::isPrimaryButtonPressed() const {
const PalmData* primaryPalm = getPrimaryPalm();
if (primaryPalm) {
if (primaryPalm->getControllerButtons() & BUTTON_FWD) {
@ -34,7 +34,7 @@ bool InterfaceControllerScriptingInterface::isPrimaryButtonPressed() const {
return false;
}
glm::vec2 InterfaceControllerScriptingInterface::getPrimaryJoystickPosition() const {
glm::vec2 ControllerScriptingInterface::getPrimaryJoystickPosition() const {
const PalmData* primaryPalm = getPrimaryPalm();
if (primaryPalm) {
return glm::vec2(primaryPalm->getJoystickX(), primaryPalm->getJoystickY());

6
interface/src/InterfaceControllerScriptingInterface.h → interface/src/ControllerScriptingInterface.h
View file

@ -1,5 +1,5 @@
//
// InterfaceControllerScriptingInterface.h
// ControllerScriptingInterface.h
// hifi
//
// Created by Brad Hefta-Gaub on 12/17/13
@ -11,10 +11,10 @@
#include <QtCore/QObject>
#include <ControllerScriptingInterface.h>
#include <AbstractControllerScriptingInterface.h>
/// handles scripting of input controller commands from JS
class InterfaceControllerScriptingInterface : public ControllerScriptingInterface {
class ControllerScriptingInterface : public AbstractControllerScriptingInterface {
Q_OBJECT
public slots:

10
libraries/script-engine/src/ControllerScriptingInterface.h → libraries/script-engine/src/AbstractControllerScriptingInterface.h
View file

@ -1,19 +1,19 @@
//
// ControllerScriptingInterface.h
// AbstractControllerScriptingInterface.h
// hifi
//
// Created by Brad Hefta-Gaub on 12/17/13
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
//
#ifndef __hifi__ControllerScriptingInterface__
#define __hifi__ControllerScriptingInterface__
#ifndef __hifi__AbstractControllerScriptingInterface__
#define __hifi__AbstractControllerScriptingInterface__
#include <QtCore/QObject>
#include <glm/glm.hpp>
/// handles scripting of input controller commands from JS
class ControllerScriptingInterface : public QObject {
class AbstractControllerScriptingInterface : public QObject {
Q_OBJECT
public slots:
@ -21,4 +21,4 @@ public slots:
virtual glm::vec2 getPrimaryJoystickPosition() const = 0;
};
#endif /* defined(__hifi__ControllerScriptingInterface__) */
#endif /* defined(__hifi__AbstractControllerScriptingInterface__) */

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

@ -26,7 +26,7 @@ int ScriptEngine::_scriptNumber = 1;
ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,
const char* scriptMenuName, AbstractMenuInterface* menu,
ControllerScriptingInterface* controllerScriptingInterface) {
AbstractControllerScriptingInterface* controllerScriptingInterface) {
_scriptContents = scriptContents;
_isFinished = false;
_isRunning = false;

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

@ -18,7 +18,7 @@
#include <AbstractMenuInterface.h>
#include <ParticleScriptingInterface.h>
#include <VoxelScriptingInterface.h>
#include "ControllerScriptingInterface.h"
#include "AbstractControllerScriptingInterface.h"
const QString NO_SCRIPT("");
@ -27,7 +27,7 @@ class ScriptEngine : public QObject {
public:
ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,
const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL,
ControllerScriptingInterface* controllerScriptingInterface = NULL);
AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
~ScriptEngine();
@ -60,7 +60,7 @@ protected:
private:
VoxelScriptingInterface _voxelScriptingInterface;
ParticleScriptingInterface _particleScriptingInterface;
ControllerScriptingInterface* _controllerScriptingInterface;
AbstractControllerScriptingInterface* _controllerScriptingInterface;
bool _wantMenuItems;
QString _scriptMenuName;
AbstractMenuInterface* _menu;