From cfa618d6940a7c0571a303fc92ac8a6a9dc30c55 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 8 Mar 2014 23:31:23 -0800 Subject: [PATCH] cleanup constructors --- .../src/octree/OctreeQueryNode.cpp | 16 +++++++------ libraries/octree/src/JurisdictionListener.cpp | 7 +----- libraries/octree/src/JurisdictionSender.cpp | 2 +- .../octree/src/OctreeEditPacketSender.cpp | 9 ++++---- libraries/octree/src/OctreePersistThread.cpp | 3 ++- libraries/octree/src/OctreeSceneStats.cpp | 23 +++++++++---------- .../octree/src/OctreeScriptingInterface.cpp | 6 ++--- libraries/octree/src/Plane.cpp | 5 ---- libraries/script-engine/src/ScriptEngine.cpp | 23 +++++++++++-------- libraries/script-engine/src/ScriptEngine.h | 3 ++- 10 files changed, 47 insertions(+), 50 deletions(-) diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp index 3ff9d6820b..8cb577d2f9 100644 --- a/assignment-client/src/octree/OctreeQueryNode.cpp +++ b/assignment-client/src/octree/OctreeQueryNode.cpp @@ -15,7 +15,14 @@ OctreeQueryNode::OctreeQueryNode() : _viewSent(false), + _octreePacket(new unsigned char[MAX_PACKET_SIZE]), + _octreePacketAt(_octreePacket), _octreePacketAvailableBytes(MAX_PACKET_SIZE), + _octreePacketWaiting(false), + _lastOctreePacket(new unsigned char[MAX_PACKET_SIZE]), + _lastOctreePacketLength(0), + _duplicatePacketCount(0), + _firstSuppressedPacket(usecTimestampNow()), _maxSearchLevel(1), _maxLevelReachedInLastSearch(1), _lastTimeBagEmpty(0), @@ -27,14 +34,9 @@ OctreeQueryNode::OctreeQueryNode() : _lastClientBoundaryLevelAdjust(0), _lastClientOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE), _lodChanged(false), - _lodInitialized(false) + _lodInitialized(false), + _sequenceNumber(0) { - _octreePacket = new unsigned char[MAX_PACKET_SIZE]; - _octreePacketAt = _octreePacket; - _lastOctreePacket = new unsigned char[MAX_PACKET_SIZE]; - _lastOctreePacketLength = 0; - _duplicatePacketCount = 0; - _sequenceNumber = 0; } OctreeQueryNode::~OctreeQueryNode() { diff --git a/libraries/octree/src/JurisdictionListener.cpp b/libraries/octree/src/JurisdictionListener.cpp index 1ad6c69912..49cdfac741 100644 --- a/libraries/octree/src/JurisdictionListener.cpp +++ b/libraries/octree/src/JurisdictionListener.cpp @@ -16,13 +16,12 @@ #include "JurisdictionListener.h" JurisdictionListener::JurisdictionListener(NodeType_t type) : + _nodeType(type), _packetSender(JurisdictionListener::DEFAULT_PACKETS_PER_SECOND) { - _nodeType = type; ReceivedPacketProcessor::_dontSleep = true; // we handle sleeping so this class doesn't need to connect(NodeList::getInstance(), &NodeList::nodeKilled, this, &JurisdictionListener::nodeKilled); - //qDebug("JurisdictionListener::JurisdictionListener(NodeType_t type=%c)", type); // tell our NodeList we want to hear about nodes with our node type NodeList::getInstance()->addNodeTypeToInterestSet(type); @@ -35,8 +34,6 @@ void JurisdictionListener::nodeKilled(SharedNodePointer node) { } bool JurisdictionListener::queueJurisdictionRequest() { - //qDebug() << "JurisdictionListener::queueJurisdictionRequest()"; - static unsigned char buffer[MAX_PACKET_SIZE]; unsigned char* bufferOut = &buffer[0]; ssize_t sizeOut = populatePacketHeader(reinterpret_cast(bufferOut), PacketTypeJurisdictionRequest); @@ -71,7 +68,6 @@ void JurisdictionListener::processPacket(const SharedNodePointer& sendingNode, c } bool JurisdictionListener::process() { - //qDebug() << "JurisdictionListener::process()"; bool continueProcessing = isStillRunning(); // If we're still running, and we don't have any requests waiting to be sent, then queue our jurisdiction requests @@ -80,7 +76,6 @@ bool JurisdictionListener::process() { } if (continueProcessing) { - //qDebug() << "JurisdictionListener::process() calling _packetSender.process()"; continueProcessing = _packetSender.process(); } if (continueProcessing) { diff --git a/libraries/octree/src/JurisdictionSender.cpp b/libraries/octree/src/JurisdictionSender.cpp index e47bcf0619..1d26e4a53a 100644 --- a/libraries/octree/src/JurisdictionSender.cpp +++ b/libraries/octree/src/JurisdictionSender.cpp @@ -19,9 +19,9 @@ JurisdictionSender::JurisdictionSender(JurisdictionMap* map, NodeType_t type) : ReceivedPacketProcessor(), _jurisdictionMap(map), + _nodeType(type), _packetSender(JurisdictionSender::DEFAULT_PACKETS_PER_SECOND) { - _nodeType = type; } JurisdictionSender::~JurisdictionSender() { diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index e47730ccd4..bb8ff9d8a0 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -17,10 +17,11 @@ #include "OctreeEditPacketSender.h" -EditPacketBuffer::EditPacketBuffer(PacketType type, unsigned char* buffer, ssize_t length, QUuid nodeUUID) { - _nodeUUID = nodeUUID; - _currentType = type; - _currentSize = length; +EditPacketBuffer::EditPacketBuffer(PacketType type, unsigned char* buffer, ssize_t length, QUuid nodeUUID) : + _nodeUUID(nodeUUID), + _currentType(type), + _currentSize(length) +{ memcpy(_currentBuffer, buffer, length); }; diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp index 3de3085a36..29715f9d90 100644 --- a/libraries/octree/src/OctreePersistThread.cpp +++ b/libraries/octree/src/OctreePersistThread.cpp @@ -19,7 +19,8 @@ OctreePersistThread::OctreePersistThread(Octree* tree, const QString& filename, _filename(filename), _persistInterval(persistInterval), _initialLoadComplete(false), - _loadTimeUSecs(0) { + _loadTimeUSecs(0) +{ } bool OctreePersistThread::process() { diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp index 8a5a731cff..794884334f 100644 --- a/libraries/octree/src/OctreeSceneStats.cpp +++ b/libraries/octree/src/OctreeSceneStats.cpp @@ -20,23 +20,22 @@ const int samples = 100; OctreeSceneStats::OctreeSceneStats() : - _elapsedAverage(samples), + _isReadyToSend(false), + _isStarted(false), + _lastFullElapsed(0), + _elapsedAverage(samples), _bitsPerOctreeAverage(samples), + _lastFullTotalEncodeTime(0), + _incomingPacket(0), + _incomingBytes(0), + _incomingWastedBytes(0), + _incomingLastSequence(0), + _incomingOutOfOrder(0), + _incomingLikelyLost(0), _incomingFlightTimeAverage(samples), _jurisdictionRoot(NULL) { reset(); - _isReadyToSend = false; - _isStarted = false; - _lastFullTotalEncodeTime = 0; - _lastFullElapsed = 0; - _incomingPacket = 0; - _incomingBytes = 0; - _incomingWastedBytes = 0; - _incomingLastSequence = 0; - _incomingOutOfOrder = 0; - _incomingLikelyLost = 0; - } // copy constructor diff --git a/libraries/octree/src/OctreeScriptingInterface.cpp b/libraries/octree/src/OctreeScriptingInterface.cpp index 1ed82564b6..982496bc58 100644 --- a/libraries/octree/src/OctreeScriptingInterface.cpp +++ b/libraries/octree/src/OctreeScriptingInterface.cpp @@ -12,14 +12,12 @@ OctreeScriptingInterface::OctreeScriptingInterface(OctreeEditPacketSender* packetSender, JurisdictionListener* jurisdictionListener) : - _packetSender(NULL), - _jurisdictionListener(NULL), + _packetSender(packetSender), + _jurisdictionListener(jurisdictionListener), _managedPacketSender(false), _managedJurisdictionListener(false), _initialized(false) { - setPacketSender(packetSender); - setJurisdictionListener(jurisdictionListener); } OctreeScriptingInterface::~OctreeScriptingInterface() { diff --git a/libraries/octree/src/Plane.cpp b/libraries/octree/src/Plane.cpp index 0a1a7ed86c..6a356784b7 100755 --- a/libraries/octree/src/Plane.cpp +++ b/libraries/octree/src/Plane.cpp @@ -12,11 +12,6 @@ #include -// These are some useful utilities that vec3 is missing -void printVec3(const char* name, const glm::vec3& v) { - printf("%s x=%f y=%f z=%f\n", name, v.x, v.y, v.z); -} - void Plane::set3Points(const glm::vec3 &v1, const glm::vec3 &v2, const glm::vec3 &v3) { glm::vec3 linev1v2, linev1v3; diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 59ce841969..f29b4e471d 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -44,22 +44,28 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractControllerScriptingInterface* controllerScriptingInterface) : + + _scriptContents(scriptContents), + _isFinished(false), + _isRunning(false), + _isInitialized(false), + _engine(), _isAvatar(false), _avatarIdentityTimer(NULL), _avatarBillboardTimer(NULL), - _avatarData(NULL) + _timerFunctionMap(), + _controllerScriptingInterface(controllerScriptingInterface), + _avatarData(NULL), + _wantMenuItems(wantMenuItems), + _scriptMenuName(), + _fileNameString(fileNameString), + _quatLibrary(), + _vec3Library() { - _scriptContents = scriptContents; - _isFinished = false; - _isRunning = false; - _isInitialized = false; - _fileNameString = fileNameString; - QByteArray fileNameAscii = fileNameString.toLocal8Bit(); const char* scriptMenuName = fileNameAscii.data(); // some clients will use these menu features - _wantMenuItems = wantMenuItems; if (!fileNameString.isEmpty()) { _scriptMenuName = "Stop "; _scriptMenuName.append(scriptMenuName); @@ -69,7 +75,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co _scriptMenuName.append(_scriptNumber); } _scriptNumber++; - _controllerScriptingInterface = controllerScriptingInterface; } ScriptEngine::~ScriptEngine() { diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 6b9ec9c9eb..186524eb7f 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -96,13 +96,14 @@ private: static VoxelsScriptingInterface _voxelsScriptingInterface; static ParticlesScriptingInterface _particlesScriptingInterface; + static int _scriptNumber; + AbstractControllerScriptingInterface* _controllerScriptingInterface; AudioScriptingInterface _audioScriptingInterface; AvatarData* _avatarData; bool _wantMenuItems; QString _scriptMenuName; QString _fileNameString; - static int _scriptNumber; Quat _quatLibrary; Vec3 _vec3Library; };