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

rename MenuType and other CR feedback

Browse source
This commit is contained in:
ZappoMan 2014-02-25 17:32:16 -08:00
parent 81bff60645
commit 3943c49dcc
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Menu.h
View file

@ -16,9 +16,8 @@
#include <AbstractMenuInterface.h> #include <AbstractMenuInterface.h>
#include <EventTypes.h> #include <EventTypes.h>
#include <MenuTypes.h> #include <MenuItemProperties.h>
#include <OctreeConstants.h> #include <OctreeConstants.h>
//#include <VoxelConstants.h>
const float ADJUST_LOD_DOWN_FPS = 40.0; const float ADJUST_LOD_DOWN_FPS = 40.0;
const float ADJUST_LOD_UP_FPS = 55.0; const float ADJUST_LOD_UP_FPS = 55.0;

2
interface/src/MenuScriptingInterface.h
View file

@ -15,7 +15,7 @@
#include <QString> #include <QString>
#include "Menu.h" #include "Menu.h"
#include <MenuTypes.h> #include <MenuItemProperties.h>
class MenuScriptingInterface : public QObject { class MenuScriptingInterface : public QObject {
Q_OBJECT Q_OBJECT

6
libraries/script-engine/src/MenuTypes.cpp → libraries/script-engine/src/MenuItemProperties.cpp
View file

@ -1,5 +1,5 @@
// //
// MenuTypes.cpp // MenuItemProperties.cpp
// hifi // hifi
// //
// Created by Brad Hefta-Gaub on 1/28/14. // Created by Brad Hefta-Gaub on 1/28/14.
@ -10,7 +10,7 @@
#include <QDebug> #include <QDebug>
#include <RegisteredMetaTypes.h> #include <RegisteredMetaTypes.h>
#include "MenuTypes.h" #include "MenuItemProperties.h"
MenuItemProperties::MenuItemProperties() : MenuItemProperties::MenuItemProperties() :
menuName(""), menuName(""),
@ -56,7 +56,7 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
{ {
} }
void registerMenuTypes(QScriptEngine* engine) { void registerMenuItemProperties(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, menuItemPropertiesToScriptValue, menuItemPropertiesFromScriptValue); qScriptRegisterMetaType(engine, menuItemPropertiesToScriptValue, menuItemPropertiesFromScriptValue);
} }

10
libraries/script-engine/src/MenuTypes.h → libraries/script-engine/src/MenuItemProperties.h
View file

@ -1,13 +1,13 @@
// //
// MenuTypes.h // MenuItemProperties.h
// hifi // hifi
// //
// Created by Brad Hefta-Gaub on 1/28/14. // Created by Brad Hefta-Gaub on 1/28/14.
// Copyright (c) 2014 HighFidelity, Inc. All rights reserved. // Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
// //
#ifndef __hifi_MenuTypes_h__ #ifndef __hifi_MenuItemProperties_h__
#define __hifi_MenuTypes_h__ #define __hifi_MenuItemProperties_h__
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
@ -43,8 +43,8 @@ public:
Q_DECLARE_METATYPE(MenuItemProperties) Q_DECLARE_METATYPE(MenuItemProperties)
QScriptValue menuItemPropertiesToScriptValue(QScriptEngine* engine, const MenuItemProperties& props); QScriptValue menuItemPropertiesToScriptValue(QScriptEngine* engine, const MenuItemProperties& props);
void menuItemPropertiesFromScriptValue(const QScriptValue& object, MenuItemProperties& props); void menuItemPropertiesFromScriptValue(const QScriptValue& object, MenuItemProperties& props);
void registerMenuTypes(QScriptEngine* engine); void registerMenuItemProperties(QScriptEngine* engine);
#endif // __hifi_MenuTypes_h__ #endif // __hifi_MenuItemProperties_h__

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

@ -24,7 +24,7 @@
#include <Sound.h> #include <Sound.h>
#include "MenuTypes.h" #include "MenuItemProperties.h"
#include "ScriptEngine.h" #include "ScriptEngine.h"
const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000; const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
@ -138,7 +138,7 @@ void ScriptEngine::init() {
registerMetaTypes(&_engine); registerMetaTypes(&_engine);
registerVoxelMetaTypes(&_engine); registerVoxelMetaTypes(&_engine);
registerEventTypes(&_engine); registerEventTypes(&_engine);
registerMenuTypes(&_engine); registerMenuItemProperties(&_engine);
qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue); qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue); qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);