Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox

Browse source
This commit is contained in:
Atlante45 2016-01-06 18:56:58 -08:00
commit e59397a97a
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -737,6 +737,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
case Action::UI_NAV_SELECT: case Action::UI_NAV_SELECT:
key = Qt::Key_Return; key = Qt::Key_Return;
break; break;
default:
break;
} }
if (navAxis) { if (navAxis) {

6
interface/src/avatar/Avatar.cpp
View file

@ -585,7 +585,7 @@ bool Avatar::shouldRenderHead(const RenderArgs* renderArgs) const {
// virtual // virtual
void Avatar::simulateAttachments(float deltaTime) { void Avatar::simulateAttachments(float deltaTime) {
for (int i = 0; i < _attachmentModels.size(); i++) { for (int i = 0; i < (int)_attachmentModels.size(); i++) {
const AttachmentData& attachment = _attachmentData.at(i); const AttachmentData& attachment = _attachmentData.at(i);
auto& model = _attachmentModels.at(i); auto& model = _attachmentModels.at(i);
int jointIndex = getJointIndex(attachment.jointName); int jointIndex = getJointIndex(attachment.jointName);
@ -949,14 +949,14 @@ void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
AvatarData::setAttachmentData(attachmentData); AvatarData::setAttachmentData(attachmentData);
// if number of attachments has been reduced, remove excess models. // if number of attachments has been reduced, remove excess models.
while (_attachmentModels.size() > attachmentData.size()) { while ((int)_attachmentModels.size() > attachmentData.size()) {
auto attachmentModel = _attachmentModels.back(); auto attachmentModel = _attachmentModels.back();
_attachmentModels.pop_back(); _attachmentModels.pop_back();
_attachmentsToRemove.push_back(attachmentModel); _attachmentsToRemove.push_back(attachmentModel);
} }
for (int i = 0; i < attachmentData.size(); i++) { for (int i = 0; i < attachmentData.size(); i++) {
if (i == _attachmentModels.size()) { if (i == (int)_attachmentModels.size()) {
// if number of attachments has been increased, we need to allocate a new model // if number of attachments has been increased, we need to allocate a new model
_attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig())); _attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig()));
} }

1
libraries/entities/src/EntityItem.h
View file

@ -56,6 +56,7 @@ namespace render {
#define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10)) #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10))
#define debugTreeVector(V) V << "[" << V << " in meters ]" #define debugTreeVector(V) V << "[" << V << " in meters ]"
/// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
/// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
/// one directly, instead you must only construct one of it's derived classes with additional features. /// one directly, instead you must only construct one of it's derived classes with additional features.

1
libraries/ui/src/QmlWindowClass.cpp
View file

@ -90,7 +90,6 @@ QScriptValue QmlWindowClass::internalConstructor(const QString& qmlSource,
QString url; QString url;
QString title; QString title;
int width = 100, height = 100; int width = 100, height = 100;
bool isToolWindow = false;
bool visible = true; bool visible = true;
if (argumentCount > 1) { if (argumentCount > 1) {

2
stack-manager/src/AppDelegate.cpp
View file

@ -77,6 +77,8 @@ void myMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q
fprintf(stdout, "Fatal: %s\n", qPrintable(msg)); fprintf(stdout, "Fatal: %s\n", qPrintable(msg));
txt += msg; txt += msg;
break; break;
default:
break;
} }
if (outStream) { if (outStream) {