Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 06:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some various fixes

Browse source
This commit is contained in:
ZappoMan 2014-07-29 13:34:08 -07:00
parent 230c2f2684
commit 3667eadff0
5 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/editModels.js
View file

@ -503,7 +503,11 @@ function controller(wichSide) {
radius: attachments[attachmentIndex].scale / 2.0,
modelURL: attachments[attachmentIndex].modelURL
};
print(">>>>> CALLING >>>>> newModel = Entities.addEntity(newProperties);");
newModel = Entities.addEntity(newProperties);
} else {
// There is none so ...
// Checking model tree
@ -795,7 +799,8 @@ function mousePressEvent(event) {
var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
if (position.x > 0 && position.y > 0 && position.z > 0) {
Models.addModel({ position: position,
print(">>>>> CALLING >>>>> Entities.addEntity(newProperties);");
Entities.addEntity({ position: position,
radius: radiusDefault,
modelURL: url
});
@ -812,6 +817,7 @@ function mousePressEvent(event) {
var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
if (position.x > 0 && position.y > 0 && position.z > 0) {
print(">>>>> CALLING >>>>> Entities.addEntity(newProperties);");
Entities.addEntity({ position: position,
radius: radiusDefault,
modelURL: url

8
interface/src/entities/EntityTreeRenderer.cpp
View file

@ -63,11 +63,11 @@ void EntityTreeRenderer::update() {
}
void EntityTreeRenderer::render(RenderMode renderMode) {
qDebug() << "EntityTreeRenderer::render() ************";
//qDebug() << "EntityTreeRenderer::render() ************";
OctreeRenderer::render(renderMode);
qDebug() << "-------------------- EntityTreeRenderer::render() ------------";
static_cast<EntityTree*>(_tree)->debugDumpMap();
qDebug() << "******* DONE ******* EntityTreeRenderer::render() ************";
//qDebug() << "-------------------- EntityTreeRenderer::render() ------------";
//static_cast<EntityTree*>(_tree)->debugDumpMap();
//qDebug() << "******* DONE ******* EntityTreeRenderer::render() ************";
}
const FBXGeometry* EntityTreeRenderer::getGeometryForEntity(const EntityItem& entityItem) {

45
interface/src/voxels/OctreePacketProcessor.cpp
View file

@ -80,39 +80,46 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode,
}
if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
app->trackIncomingVoxelPacket(mutablePacket, sendingNode, wasStatsPacket);
app->trackIncomingVoxelPacket(mutablePacket, sendingNode, wasStatsPacket);
if (sendingNode) {
if (sendingNode) {
switch(voxelPacketType) {
case PacketTypeParticleErase: {
switch(voxelPacketType) {
case PacketTypeParticleErase: {
if (Menu::getInstance()->isOptionChecked(MenuOption::Particles)) {
app->_particles.processEraseMessage(mutablePacket, sendingNode);
} break;
}
} break;
case PacketTypeParticleData: {
case PacketTypeParticleData: {
if (Menu::getInstance()->isOptionChecked(MenuOption::Particles)) {
app->_particles.processDatagram(mutablePacket, sendingNode);
} break;
}
} break;
case PacketTypeEntityErase: {
case PacketTypeEntityErase: {
if (Menu::getInstance()->isOptionChecked(MenuOption::Models)) {
app->_entities.processEraseMessage(mutablePacket, sendingNode);
} break;
}
} break;
case PacketTypeEntityData: {
case PacketTypeEntityData: {
if (Menu::getInstance()->isOptionChecked(MenuOption::Models)) {
app->_entities.processDatagram(mutablePacket, sendingNode);
} break;
}
} break;
case PacketTypeEnvironmentData: {
app->_environment.parseData(*sendingNode->getActiveSocket(), mutablePacket);
} break;
case PacketTypeEnvironmentData: {
app->_environment.parseData(*sendingNode->getActiveSocket(), mutablePacket);
} break;
default : {
default : {
if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
app->_voxels.setDataSourceUUID(sendingNode->getUUID());
app->_voxels.parseData(mutablePacket);
app->_voxels.setDataSourceUUID(QUuid());
} break;
}
}
} break;
}
}
}

11
libraries/entities/src/EntityTree.h
View file

@ -53,20 +53,19 @@ public:
// The newer API...
EntityItem* getOrCreateEntityItem(const EntityItemID& entityID, const EntityItemProperties& properties);
void addEntityItem(EntityItem* entityItem);
EntityItem* addEntity(const EntityItemID& entityID, const EntityItemProperties& properties);
bool updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties);
EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID
// the old API
void storeEntity(const EntityItem& entity, const SharedNodePointer& senderNode = SharedNodePointer());
//void updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties);
void deleteEntity(const EntityItemID& entityID);
void deleteEntities(QSet<EntityItemID> entityIDs);
const EntityItem* findClosestEntity(glm::vec3 position, float targetRadius);
EntityItem* findEntityByID(uint32_t id, bool alreadyLocked = false) /*const*/;
EntityItem* findEntityByEntityItemID(const EntityItemID& entityID) /*const*/;
EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID
/// finds all entities that touch a sphere
/// \param center the center of the sphere
/// \param radius the radius of the sphere

4
libraries/octree/src/OctreeRenderer.cpp
View file

@ -159,9 +159,9 @@ void OctreeRenderer::render(RenderMode renderMode) {
RenderArgs args = { this, _viewFrustum, getSizeScale(), getBoundaryLevelAdjust(), renderMode, 0, 0, 0 };
if (_tree) {
_tree->lockForRead();
qDebug() << "OctreeRenderer::render() tree locked START RENDER RECURSION...";
//qDebug() << "OctreeRenderer::render() tree locked START RENDER RECURSION...";
_tree->recurseTreeWithOperation(renderOperation, &args);
qDebug() << "OctreeRenderer::render() tree locked ENDED RENDER RECURSION...";
//qDebug() << "OctreeRenderer::render() tree locked ENDED RENDER RECURSION...";
_tree->unlock();
}
}