Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed invokeMethod bug + removed debug

Browse source
This commit is contained in:
Atlante45 2014-07-23 14:38:37 -07:00
parent e1365a2927
commit 0d039b1cdb
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/editModels.js
View file

@ -1168,7 +1168,6 @@ function handeMenuEvent(menuItem){
angles.z = array[7].value;
selectedModelProperties.modelRotation = Quat.fromVec3Degrees(angles);
selectedModelProperties.radius = array[8].value / 2;
print(selectedModelProperties.radius);
Models.editModel(selectedModelID, selectedModelProperties);
}

3
interface/src/models/ModelTreeRenderer.h
View file

@ -27,6 +27,7 @@
// Generic client side Octree renderer class.
class ModelTreeRenderer : public OctreeRenderer, public ModelItemFBXService {
Q_OBJECT
public:
ModelTreeRenderer();
virtual ~ModelTreeRenderer();
@ -56,7 +57,7 @@ public:
protected:
void clearModelsCache();
Model* getModel(const ModelItem& modelItem);
Q_INVOKABLE Model* getModel(const ModelItem& modelItem);
QMap<uint32_t, Model*> _knownModelsItemModels;
QMap<uint32_t, Model*> _unknownModelsItemModels;
};

2
libraries/models/src/ModelsScriptingInterface.cpp
View file

@ -70,7 +70,7 @@ ModelItemProperties ModelsScriptingInterface::getModelProperties(ModelItemID mod
if (_modelTree) {
_modelTree->lockForRead();
ModelItem* model = const_cast<ModelItem*>(_modelTree->findModelByID(identity.id, true));
if (model) {
if (model && _modelTree->getGeometryForModel(*model)) {
model->setSittingPoints(_modelTree->getGeometryForModel(*model)->sittingPoints);
results.copyFromModelItem(*model);
} else {