History

first cut at renaming Models to Entities

ZappoMan committed 12 years ago

Commit ccc9eab1 parent f7820ce42 files · +1426 −1424Browse files

Showing the changes to interface/src/Application.cpp (1 of 42 files). Show all

Unified · Split

interface/src/Application.cpp+32−32
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #include <AccountManager.h>
5555 #include <AudioInjector.h>
5656 #include <Logging.h>
57−#include <ModelsScriptingInterface.h>
57+#include <EntityScriptingInterface.h>
5858 #include <OctalCode.h>
5959 #include <PacketHeaders.h>
6060 #include <ParticlesScriptingInterface.h>
@@ -284,13 +284,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 223 unmodified lines
284284
285285 // tell the NodeList instance who to tell the domain server we care about
286286 nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
287− << NodeType::VoxelServer << NodeType::ParticleServer << NodeType::ModelServer
287+ << NodeType::VoxelServer << NodeType::ParticleServer << NodeType::EntityServer
288288 << NodeType::MetavoxelServer);
289289
290290 // connect to the packet sent signal of the _voxelEditSender and the _particleEditSender
291291 connect(&_voxelEditSender, &VoxelEditPacketSender::packetSent, this, &Application::packetSent);
292292 connect(&_particleEditSender, &ParticleEditPacketSender::packetSent, this, &Application::packetSent);
293− connect(&_modelEditSender, &ModelEditPacketSender::packetSent, this, &Application::packetSent);
293+ connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
294294
295295 // move the silentNodeTimer to the _nodeThread
296296 QTimer* silentNodeTimer = new QTimer();
@@ -334,7 +334,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 37 unmodified lines
334334 // Tell our voxel edit sender about our known jurisdictions
335335 _voxelEditSender.setVoxelServerJurisdictions(&_voxelServerJurisdictions);
336336 _particleEditSender.setServerJurisdictions(&_particleServerJurisdictions);
337− _modelEditSender.setServerJurisdictions(&_modelServerJurisdictions);
337+ _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
338338
339339 Particle::setVoxelEditPacketSender(&_voxelEditSender);
340340 Particle::setParticleEditPacketSender(&_particleEditSender);
@@ -346,7 +346,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 5 unmodified lines
346346 // probably not the right long term solution. But for now, we're going to do this to
347347 // allow you to move a particle around in your hand
348348 _particleEditSender.setPacketsPerSecond(3000); // super high!!
349− _modelEditSender.setPacketsPerSecond(3000); // super high!!
349+ _entityEditSender.setPacketsPerSecond(3000); // super high!!
350350
351351 // Set the sixense filtering
352352 _sixenseManager.setFilter(Menu::getInstance()->isOptionChecked(MenuOption::FilterSixense));
@@ -424,7 +424,7 @@ Application::~Application() { · 71 unmodified lines
424424 _voxelHideShowThread.terminate();
425425 _voxelEditSender.terminate();
426426 _particleEditSender.terminate();
427− _modelEditSender.terminate();
427+ _entityEditSender.terminate();
428428
429429 storeSizeAndPosition();
430430 saveScripts();
@@ -523,7 +523,7 @@ void Application::initializeGL() { · 92 unmodified lines
523523 _voxelEditSender.initialize(_enableProcessVoxelsThread);
524524 _voxelHideShowThread.initialize(_enableProcessVoxelsThread);
525525 _particleEditSender.initialize(_enableProcessVoxelsThread);
526− _modelEditSender.initialize(_enableProcessVoxelsThread);
526+ _entityEditSender.initialize(_enableProcessVoxelsThread);
527527
528528 if (_enableProcessVoxelsThread) {
529529 qDebug("Voxel parsing thread created.");
@@ -749,7 +749,7 @@ void Application::controlledBroadcastToNodes(const QByteArray& packet, const Nod · 219 unmodified lines
749749 break;
750750 case NodeType::VoxelServer:
751751 case NodeType::ParticleServer:
752− case NodeType::ModelServer:
752+ case NodeType::EntityServer:
753753 channel = BandwidthMeter::VOXELS;
754754 break;
755755 default:
@@ -1285,7 +1285,7 @@ void Application::dropEvent(QDropEvent *event) { · 529 unmodified lines
12851285 void Application::sendPingPackets() {
12861286 QByteArray pingPacket = NodeList::getInstance()->constructPingPacket();
12871287 controlledBroadcastToNodes(pingPacket, NodeSet()
1288− << NodeType::VoxelServer << NodeType::ParticleServer << NodeType::ModelServer
1288+ << NodeType::VoxelServer << NodeType::ParticleServer << NodeType::EntityServer
12891289 << NodeType::AudioMixer << NodeType::AvatarMixer
12901290 << NodeType::MetavoxelServer);
12911291 }
@@ -1687,8 +1687,8 @@ void Application::init() { · 395 unmodified lines
16871687 _particles.init();
16881688 _particles.setViewFrustum(getViewFrustum());
16891689
1690− _models.init();
1691− _models.setViewFrustum(getViewFrustum());
1690+ _entities.init();
1691+ _entities.setViewFrustum(getViewFrustum());
16921692
16931693 _metavoxels.init();
16941694
@@ -1909,7 +1909,7 @@ void Application::updateThreads(float deltaTime) { · 214 unmodified lines
19091909 _voxelHideShowThread.threadRoutine();
19101910 _voxelEditSender.threadRoutine();
19111911 _particleEditSender.threadRoutine();
1912− _modelEditSender.threadRoutine();
1912+ _entityEditSender.threadRoutine();
19131913 }
19141914 }
19151915
@@ -2052,8 +2052,8 @@ void Application::update(float deltaTime) { · 136 unmodified lines
20522052 }
20532053
20542054 {
2055− PerformanceTimer perfTimer("idle/update/_models");
2056− _models.update(); // update the models...
2055+ PerformanceTimer perfTimer("idle/update/_entities");
2056+ _entities.update(); // update the models...
20572057 }
20582058
20592059 {
@@ -2111,7 +2111,7 @@ void Application::updateMyAvatar(float deltaTime) { · 51 unmodified lines
21112111 _lastQueriedTime = now;
21122112 queryOctree(NodeType::VoxelServer, PacketTypeVoxelQuery, _voxelServerJurisdictions);
21132113 queryOctree(NodeType::ParticleServer, PacketTypeParticleQuery, _particleServerJurisdictions);
2114− queryOctree(NodeType::ModelServer, PacketTypeModelQuery, _modelServerJurisdictions);
2114+ queryOctree(NodeType::EntityServer, PacketTypeEntityQuery, _entityServerJurisdictions);
21152115 _lastQueriedViewFrustum = _viewFrustum;
21162116 }
21172117 }
@@ -2143,7 +2143,7 @@ int Application::sendNackPackets() { · 25 unmodified lines
21432143 if (node->getActiveSocket() &&
21442144 ( node->getType() == NodeType::VoxelServer
21452145 || node->getType() == NodeType::ParticleServer
2146− || node->getType() == NodeType::ModelServer)
2146+ || node->getType() == NodeType::EntityServer)
21472147 ) {
21482148
21492149 QUuid nodeUUID = node->getUUID();
@@ -2535,7 +2535,7 @@ void Application::updateShadowMap() { · 385 unmodified lines
25352535
25362536 _avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE);
25372537 _particles.render(OctreeRenderer::SHADOW_RENDER_MODE);
2538− _models.render(OctreeRenderer::SHADOW_RENDER_MODE);
2538+ _entities.render(OctreeRenderer::SHADOW_RENDER_MODE);
25392539
25402540 glDisable(GL_POLYGON_OFFSET_FILL);
25412541
@@ -2736,7 +2736,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 194 unmodified lines
27362736 PerformanceTimer perfTimer("paintGL/displaySide/models");
27372737 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
27382738 "Application::displaySide() ... models...");
2739− _models.render();
2739+ _entities.render();
27402740 }
27412741
27422742 // render the ambient occlusion effect if enabled
@@ -3247,7 +3247,7 @@ void Application::domainChanged(const QString& domainHostname) { · 504 unmodified lines
32473247 _particles.clear();
32483248
32493249 // reset the model renderer
3250− _models.clear();
3250+ _entities.clear();
32513251
32523252 // reset the voxels renderer
32533253 _voxels.killLocalVoxels();
@@ -3286,7 +3286,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 32 unmodified lines
32863286
32873287 _voxelEditSender.nodeKilled(node);
32883288 _particleEditSender.nodeKilled(node);
3289− _modelEditSender.nodeKilled(node);
3289+ _entityEditSender.nodeKilled(node);
32903290
32913291 if (node->getType() == NodeType::VoxelServer) {
32923292 QUuid nodeUUID = node->getUUID();
@@ -3362,16 +3362,16 @@ void Application::nodeKilled(SharedNodePointer node) { · 69 unmodified lines
33623362 }
33633363 _octreeSceneStatsLock.unlock();
33643364
3365− } else if (node->getType() == NodeType::ModelServer) {
3365+ } else if (node->getType() == NodeType::EntityServer) {
33663366
33673367 QUuid nodeUUID = node->getUUID();
33683368 // see if this is the first we've heard of this node...
3369− _modelServerJurisdictions.lockForRead();
3370− if (_modelServerJurisdictions.find(nodeUUID) != _modelServerJurisdictions.end()) {
3371− unsigned char* rootCode = _modelServerJurisdictions[nodeUUID].getRootOctalCode();
3369+ _entityServerJurisdictions.lockForRead();
3370+ if (_entityServerJurisdictions.find(nodeUUID) != _entityServerJurisdictions.end()) {
3371+ unsigned char* rootCode = _entityServerJurisdictions[nodeUUID].getRootOctalCode();
33723372 VoxelPositionSize rootDetails;
33733373 voxelDetailsForCode(rootCode, rootDetails);
3374− _modelServerJurisdictions.unlock();
3374+ _entityServerJurisdictions.unlock();
33753375
33763376 qDebug("model server going away...... v[%f, %f, %f, %f]",
33773377 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
@@ -3388,10 +3388,10 @@ void Application::nodeKilled(SharedNodePointer node) { · 10 unmodified lines
33883388 }
33893389
33903390 // If the model server is going away, remove it from our jurisdiction map so we don't send voxels to a dead server
3391− _modelServerJurisdictions.lockForWrite();
3392− _modelServerJurisdictions.erase(_modelServerJurisdictions.find(nodeUUID));
3391+ _entityServerJurisdictions.lockForWrite();
3392+ _entityServerJurisdictions.erase(_entityServerJurisdictions.find(nodeUUID));
33933393 }
3394− _modelServerJurisdictions.unlock();
3394+ _entityServerJurisdictions.unlock();
33953395
33963396 // also clean up scene stats for that server
33973397 _octreeSceneStatsLock.lockForWrite();
@@ -3457,8 +3457,8 @@ int Application::parseOctreeStats(const QByteArray& packet, const SharedNodePoin · 59 unmodified lines
34573457 jurisdiction = &_particleServerJurisdictions;
34583458 serverType = "Particle";
34593459 } else {
3460− jurisdiction = &_modelServerJurisdictions;
3461− serverType = "Model";
3460+ jurisdiction = &_entityServerJurisdictions;
3461+ serverType = "Entity";
34623462 }
34633463
34643464 jurisdiction->lockForRead();
@@ -3563,8 +3563,8 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 98 unmodified lines
35633563 scriptEngine->getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
35643564 scriptEngine->getParticlesScriptingInterface()->setParticleTree(_particles.getTree());
35653565
3566− scriptEngine->getModelsScriptingInterface()->setPacketSender(&_modelEditSender);
3567− scriptEngine->getModelsScriptingInterface()->setModelTree(_models.getTree());
3566+ scriptEngine->getEntityScriptingInterface()->setPacketSender(&_entityEditSender);
3567+ scriptEngine->getEntityScriptingInterface()->setEntityTree(_entities.getTree());
35683568
35693569 // hook our avatar object into this script engine
35703570 scriptEngine->setAvatarData(_myAvatar, "MyAvatar"); // leave it as a MyAvatar class to expose thrust features

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t