Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 14:35:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add loadPriority to model entities, working on other avatars waitForWearables

Browse source
This commit is contained in:
HifiExperiments 2024-07-15 14:32:22 -07:00
parent fe61d92a09
commit 7c3498bf9d
17 changed files with 94 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/+android_interface/Stats.qml
View file

@ -241,9 +241,9 @@ Item {
model: root.downloadUrls
delegate: StatText {
visible: root.expanded;
text: modelData.length > 30
text: (modelData.length > 30
? modelData.substring(0, 5) + "..." + modelData.substring(modelData.length - 22)
: modelData
: modelData) + "\n\t" + "Priority: " + root.downloadPriorities[index] + ", Progress: " + root.downloadProgresses[index] + "%"
}
}
}

3
interface/src/avatar/MyAvatar.cpp
View file

@ -1841,6 +1841,8 @@ void MyAvatar::handleChangedAvatarEntityData() {
}
});
}
_hasCheckedForAvatarEntities = true;
}
bool MyAvatar::updateStaleAvatarEntityBlobs() const {
@ -1896,6 +1898,7 @@ void MyAvatar::prepareAvatarEntityDataForReload() {
});
_reloadAvatarEntityDataFromSettings = true;
_hasCheckedForAvatarEntities = false;
}
AvatarEntityMap MyAvatar::getAvatarEntityData() const {

11
interface/src/avatar/OtherAvatar.cpp
View file

@ -595,7 +595,8 @@ void OtherAvatar::handleChangedAvatarEntityData() {
}
});
setAvatarEntityDataChanged(false);
_avatarEntityDataChanged = false;
_hasCheckedForAvatarEntities = true;
}
void OtherAvatar::onAddAttachedAvatarEntity(const QUuid& id) {
@ -630,3 +631,11 @@ void OtherAvatar::updateAttachedAvatarEntities() {
}
}
}
void OtherAvatar::onIdentityRecieved() {
if (_avatarEntityIdentityCountdown > 0) {
_avatarEntityIdentityCountdown--;
} else {
_hasCheckedForAvatarEntities = true;
}
}

10
interface/src/avatar/OtherAvatar.h
View file

@ -73,6 +73,8 @@ protected:
void onAddAttachedAvatarEntity(const QUuid& id);
void onRemoveAttachedAvatarEntity(const QUuid& id);
void onIdentityRecieved() override;
class AvatarEntityDataHash {
public:
AvatarEntityDataHash(uint32_t h) : hash(h) {};
@ -91,6 +93,14 @@ protected:
uint8_t _workloadRegion { workload::Region::INVALID };
BodyLOD _bodyLOD { BodyLOD::Sphere };
bool _needsDetailedRebuild { false };
private:
// When determining _hasCheckedForAvatarEntities for OtherAvatars, we can set it to true in
// handleChangedAvatarEntityData if we have avatar entities. But we never receive explicit
// confirmation from the avatar mixer if we don't have any. So instead, we wait to receive
// a few identity packets, and assume that if we haven't gotten any avatar entities by then,
// that we're safe to say there aren't any.
uint8_t _avatarEntityIdentityCountdown { 2 };
};
using OtherAvatarPointer = std::shared_ptr<OtherAvatar>;

2
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -843,7 +843,7 @@ bool Avatar::getEnableMeshVisible() const {
}
void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
if (_needsWearablesLoadedCheck) {
if (_needsWearablesLoadedCheck && _hasCheckedForAvatarEntities) {
bool wearablesAreLoaded = true;
// Technically, we should be checking for descendant avatar entities that are owned by this avatar.
// But it's sufficient to just check all children entities here.

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -748,6 +748,7 @@ protected:
bool _isMeshVisible { true };
bool _needMeshVisibleSwitch { true };
bool _needsWearablesLoadedCheck { false };
bool _hasCheckedForAvatarEntities { false };
static const float MYAVATAR_LOADING_PRIORITY;
static const float OTHERAVATAR_LOADING_PRIORITY;

2
libraries/avatars/src/AvatarData.cpp
View file

@ -2072,6 +2072,8 @@ void AvatarData::processAvatarIdentity(QDataStream& packetStream, bool& identity
<< "is >=" << (udt::SequenceNumber::Type) incomingSequenceNumber;
#endif
}
onIdentityRecieved();
}
QUrl AvatarData::getWireSafeSkeletonModelURL() const {

3
libraries/avatars/src/AvatarData.h
View file

@ -1276,7 +1276,6 @@ public:
*/
Q_INVOKABLE virtual void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
AvatarEntityIDs getAndClearRecentlyRemovedIDs();
/*@jsdoc
@ -1583,6 +1582,8 @@ protected:
virtual const QString& getSessionDisplayNameForTransport() const { return _sessionDisplayName; }
virtual void maybeUpdateSessionDisplayNameFromTransport(const QString& sessionDisplayName) { } // No-op in AvatarMixer
virtual void onIdentityRecieved() {}
// Body scale
float _targetScale;
float _domainMinimumHeight { MIN_AVATAR_HEIGHT };

5
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -1310,7 +1310,10 @@ void ModelEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPoint
scene->enqueueTransaction(transaction);
});
entity->setModel(model);
model->setLoadingPriorityOperator([entity]() { return EntityTreeRenderer::getEntityLoadingPriority(*entity); });
model->setLoadingPriorityOperator([entity]() {
float loadPriority = entity->getLoadPriority();
return fabs(loadPriority) > EPSILON ? loadPriority : EntityTreeRenderer::getEntityLoadingPriority(*entity);
});
withWriteLock([&] { _model = model; });
}

14
libraries/entities/src/EntityItemProperties.cpp
View file

@ -612,6 +612,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
CHECK_PROPERTY_CHANGE(PROP_GROUP_CULLED, groupCulled);
CHECK_PROPERTY_CHANGE(PROP_BLENDSHAPE_COEFFICIENTS, blendshapeCoefficients);
CHECK_PROPERTY_CHANGE(PROP_USE_ORIGINAL_PIVOT, useOriginalPivot);
CHECK_PROPERTY_CHANGE(PROP_LOAD_PRIORITY, loadPriority);
changedProperties += _animation.getChangedProperties();
// Light
@ -1090,6 +1091,9 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {boolean} useOriginalPivot=false - If <code>false</code>, the model will be centered based on its content,
* ignoring any offset in the model itself. If <code>true</code>, the model will respect its original offset. Currently,
* only pivots relative to <code>{x: 0, y: 0, z: 0}</code> are supported.
* @property {number} loadPriority=0.0 - If <code>0</code>, the model download will be prioritized based on distance, size, and
* other factors, and assigned a priority automatically between <code>0</code> and <code>PI / 2</code>. Otherwise, the
* download will be ordered based on the set <code>loadPriority</code>.
* @property {string} textures="" - A JSON string of texture name, URL pairs used when rendering the model in place of the
* model's original textures. Use a texture name from the <code>originalTextures</code> property to override that texture.
* Only the texture names and URLs to be overridden need be specified; original textures are used where there are no
@ -1919,6 +1923,7 @@ ScriptValue EntityItemProperties::copyToScriptValue(ScriptEngine* engine, bool s
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_GROUP_CULLED, groupCulled);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_BLENDSHAPE_COEFFICIENTS, blendshapeCoefficients);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_USE_ORIGINAL_PIVOT, useOriginalPivot);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOAD_PRIORITY, loadPriority);
_animation.copyToScriptValue(_desiredProperties, properties, engine, skipDefaults, defaultEntityProperties, returnNothingOnEmptyPropertyFlags, isMyOwnAvatarEntity);
}
@ -2350,6 +2355,7 @@ void EntityItemProperties::copyFromScriptValue(const ScriptValue& object, bool h
COPY_PROPERTY_FROM_QSCRIPTVALUE(groupCulled, bool, setGroupCulled);
COPY_PROPERTY_FROM_QSCRIPTVALUE(blendshapeCoefficients, QString, setBlendshapeCoefficients);
COPY_PROPERTY_FROM_QSCRIPTVALUE(useOriginalPivot, bool, setUseOriginalPivot);
COPY_PROPERTY_FROM_QSCRIPTVALUE(loadPriority, float, setLoadPriority);
_animation.copyFromScriptValue(object, namesSet, _defaultSettings);
// Light
@ -2658,6 +2664,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
COPY_PROPERTY_IF_CHANGED(groupCulled);
COPY_PROPERTY_IF_CHANGED(blendshapeCoefficients);
COPY_PROPERTY_IF_CHANGED(useOriginalPivot);
COPY_PROPERTY_IF_CHANGED(loadPriority);
_animation.merge(other._animation);
// Light
@ -3036,6 +3043,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
ADD_PROPERTY_TO_MAP(PROP_GROUP_CULLED, GroupCulled, groupCulled, bool);
ADD_PROPERTY_TO_MAP(PROP_BLENDSHAPE_COEFFICIENTS, BlendshapeCoefficients, blendshapeCoefficients, QString);
ADD_PROPERTY_TO_MAP(PROP_USE_ORIGINAL_PIVOT, UseOriginalPivot, useOriginalPivot, bool);
ADD_PROPERTY_TO_MAP(PROP_LOAD_PRIORITY, LoadPriority, loadPriority, float);
{ // Animation
ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_URL, Animation, animation, URL, url);
ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_ALLOW_TRANSLATION, Animation, animation, AllowTranslation, allowTranslation);
@ -3517,6 +3525,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
APPEND_ENTITY_PROPERTY(PROP_GROUP_CULLED, properties.getGroupCulled());
APPEND_ENTITY_PROPERTY(PROP_BLENDSHAPE_COEFFICIENTS, properties.getBlendshapeCoefficients());
APPEND_ENTITY_PROPERTY(PROP_USE_ORIGINAL_PIVOT, properties.getUseOriginalPivot());
APPEND_ENTITY_PROPERTY(PROP_LOAD_PRIORITY, properties.getLoadPriority());
_staticAnimation.setProperties(properties);
_staticAnimation.appendToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState);
@ -4029,6 +4038,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_GROUP_CULLED, bool, setGroupCulled);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_BLENDSHAPE_COEFFICIENTS, QString, setBlendshapeCoefficients);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_USE_ORIGINAL_PIVOT, bool, setUseOriginalPivot);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOAD_PRIORITY, float, setLoadPriority);
properties.getAnimation().decodeFromEditPacket(propertyFlags, dataAt, processedBytes);
}
@ -4438,6 +4448,7 @@ void EntityItemProperties::markAllChanged() {
_groupCulledChanged = true;
_blendshapeCoefficientsChanged = true;
_useOriginalPivotChanged = true;
_loadPriorityChanged = true;
_animation.markAllChanged();
// Light
@ -5024,6 +5035,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
if (useOriginalPivotChanged()) {
out += "useOriginalPivot";
}
if (loadPriorityChanged()) {
out += "loadPriority";
}
getAnimation().listChangedProperties(out);
// Light

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

@ -315,6 +315,7 @@ public:
DEFINE_PROPERTY_REF(PROP_GROUP_CULLED, GroupCulled, groupCulled, bool, false);
DEFINE_PROPERTY_REF(PROP_BLENDSHAPE_COEFFICIENTS, BlendshapeCoefficients, blendshapeCoefficients, QString, "");
DEFINE_PROPERTY_REF(PROP_USE_ORIGINAL_PIVOT, UseOriginalPivot, useOriginalPivot, bool, false);
DEFINE_PROPERTY_REF(PROP_LOAD_PRIORITY, LoadPriority, loadPriority, float, 0.0f);
DEFINE_PROPERTY_GROUP(Animation, animation, AnimationPropertyGroup);
// Light

21
libraries/entities/src/EntityPropertyFlags.h
View file

@ -255,17 +255,18 @@ enum EntityPropertyList {
PROP_GROUP_CULLED = PROP_DERIVED_7,
PROP_BLENDSHAPE_COEFFICIENTS = PROP_DERIVED_8,
PROP_USE_ORIGINAL_PIVOT = PROP_DERIVED_9,
PROP_LOAD_PRIORITY = PROP_DERIVED_10,
// Animation
PROP_ANIMATION_URL = PROP_DERIVED_10,
PROP_ANIMATION_ALLOW_TRANSLATION = PROP_DERIVED_11,
PROP_ANIMATION_FPS = PROP_DERIVED_12,
PROP_ANIMATION_FRAME_INDEX = PROP_DERIVED_13,
PROP_ANIMATION_PLAYING = PROP_DERIVED_14,
PROP_ANIMATION_LOOP = PROP_DERIVED_15,
PROP_ANIMATION_FIRST_FRAME = PROP_DERIVED_16,
PROP_ANIMATION_LAST_FRAME = PROP_DERIVED_17,
PROP_ANIMATION_HOLD = PROP_DERIVED_18,
PROP_ANIMATION_SMOOTH_FRAMES = PROP_DERIVED_19,
PROP_ANIMATION_URL = PROP_DERIVED_11,
PROP_ANIMATION_ALLOW_TRANSLATION = PROP_DERIVED_12,
PROP_ANIMATION_FPS = PROP_DERIVED_13,
PROP_ANIMATION_FRAME_INDEX = PROP_DERIVED_14,
PROP_ANIMATION_PLAYING = PROP_DERIVED_15,
PROP_ANIMATION_LOOP = PROP_DERIVED_16,
PROP_ANIMATION_FIRST_FRAME = PROP_DERIVED_17,
PROP_ANIMATION_LAST_FRAME = PROP_DERIVED_18,
PROP_ANIMATION_HOLD = PROP_DERIVED_19,
PROP_ANIMATION_SMOOTH_FRAMES = PROP_DERIVED_20,
// Light
PROP_IS_SPOTLIGHT = PROP_DERIVED_0,

18
libraries/entities/src/ModelEntityItem.cpp
View file

@ -72,6 +72,7 @@ EntityItemProperties ModelEntityItem::getProperties(const EntityPropertyFlags& d
COPY_ENTITY_PROPERTY_TO_PROPERTIES(groupCulled, getGroupCulled);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(blendshapeCoefficients, getBlendshapeCoefficients);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(useOriginalPivot, getUseOriginalPivot);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(loadPriority, getLoadPriority);
withReadLock([&] {
_animationProperties.getProperties(properties);
});
@ -96,6 +97,7 @@ bool ModelEntityItem::setSubClassProperties(const EntityItemProperties& properti
SET_ENTITY_PROPERTY_FROM_PROPERTIES(groupCulled, setGroupCulled);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(blendshapeCoefficients, setBlendshapeCoefficients);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(useOriginalPivot, setUseOriginalPivot);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(loadPriority, setLoadPriority);
withWriteLock([&] {
AnimationPropertyGroup animationProperties = _animationProperties;
@ -131,6 +133,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
READ_ENTITY_PROPERTY(PROP_GROUP_CULLED, bool, setGroupCulled);
READ_ENTITY_PROPERTY(PROP_BLENDSHAPE_COEFFICIENTS, QString, setBlendshapeCoefficients);
READ_ENTITY_PROPERTY(PROP_USE_ORIGINAL_PIVOT, bool, setUseOriginalPivot);
READ_ENTITY_PROPERTY(PROP_LOAD_PRIORITY, float, setLoadPriority);
// grab a local copy of _animationProperties to avoid multiple locks
int bytesFromAnimation;
@ -171,6 +174,7 @@ EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams&
requestedProperties += PROP_GROUP_CULLED;
requestedProperties += PROP_BLENDSHAPE_COEFFICIENTS;
requestedProperties += PROP_USE_ORIGINAL_PIVOT;
requestedProperties += PROP_LOAD_PRIORITY;
requestedProperties += _animationProperties.getEntityProperties(params);
return requestedProperties;
@ -201,6 +205,7 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
APPEND_ENTITY_PROPERTY(PROP_GROUP_CULLED, getGroupCulled());
APPEND_ENTITY_PROPERTY(PROP_BLENDSHAPE_COEFFICIENTS, getBlendshapeCoefficients());
APPEND_ENTITY_PROPERTY(PROP_USE_ORIGINAL_PIVOT, getUseOriginalPivot());
APPEND_ENTITY_PROPERTY(PROP_LOAD_PRIORITY, getLoadPriority());
withReadLock([&] {
_animationProperties.appendSubclassData(packetData, params, entityTreeElementExtraEncodeData, requestedProperties,
@ -255,6 +260,7 @@ void ModelEntityItem::debugDump() const {
qCDebug(entities) << " compound shape URL:" << getCompoundShapeURL();
qCDebug(entities) << " blendshapeCoefficients:" << getBlendshapeCoefficients();
qCDebug(entities) << " useOrigialPivot:" << getUseOriginalPivot();
qCDebug(entities) << " loadPriority:" << getLoadPriority();
}
void ModelEntityItem::setShapeType(ShapeType type) {
@ -768,3 +774,15 @@ bool ModelEntityItem::getUseOriginalPivot() const {
return _useOriginalPivot;
});
}
float ModelEntityItem::getLoadPriority() const {
return resultWithReadLock<float>([&] {
return _loadPriority;
});
}
void ModelEntityItem::setLoadPriority(float loadPriority) {
withWriteLock([&] {
_loadPriority = loadPriority;
});
}

4
libraries/entities/src/ModelEntityItem.h
View file

@ -123,6 +123,9 @@ public:
bool getUseOriginalPivot() const;
void setUseOriginalPivot(bool useOriginalPivot);
float getLoadPriority() const;
void setLoadPriority(float loadPriority);
private:
void setAnimationSettings(const QString& value); // only called for old bitstream format
bool applyNewAnimationProperties(AnimationPropertyGroup newProperties);
@ -152,6 +155,7 @@ protected:
glm::u8vec3 _color;
glm::vec3 _modelScale { 1.0f };
QString _modelURL;
float _loadPriority { 0.0f };
bool _relayParentJoints;
bool _groupCulled { false };
QVariantMap _blendshapeCoefficientsMap;

19
libraries/networking/src/ResourceCache.cpp
View file

@ -30,14 +30,9 @@
#include "NetworkLogging.h"
#include "NodeList.h"
bool ResourceCacheSharedItems::appendRequest(QWeakPointer<Resource> resource) {
bool ResourceCacheSharedItems::appendRequest(QWeakPointer<Resource> resource, float priority) {
Lock lock(_mutex);
if ((uint32_t)_loadingRequests.size() < _requestLimit) {
float priority = 0.0f;
// This should always be true, but just in case
if (QSharedPointer<Resource> resourceStrong = resource.lock()) {
priority = resourceStrong->getLoadPriority();
}
_loadingRequests.append({ resource, priority });
return true;
} else {
@ -111,7 +106,7 @@ void ResourceCacheSharedItems::removeRequest(QWeakPointer<Resource> resource) {
}
}
QSharedPointer<Resource> ResourceCacheSharedItems::getHighestPendingRequest() {
std::pair<QSharedPointer<Resource>, float> ResourceCacheSharedItems::getHighestPendingRequest() {
// look for the highest priority pending request
int highestIndex = -1;
float highestPriority = -FLT_MAX;
@ -144,7 +139,7 @@ QSharedPointer<Resource> ResourceCacheSharedItems::getHighestPendingRequest() {
_pendingRequests.takeAt(highestIndex);
}
return highestResource;
return { highestResource, highestPriority };
}
void ResourceCacheSharedItems::clear() {
@ -536,11 +531,11 @@ uint32_t ResourceCache::getLoadingRequestCount() {
return DependencyManager::get<ResourceCacheSharedItems>()->getLoadingRequestsCount();
}
bool ResourceCache::attemptRequest(QSharedPointer<Resource> resource) {
bool ResourceCache::attemptRequest(QSharedPointer<Resource> resource, float priority) {
Q_ASSERT(!resource.isNull());
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
if (sharedItems->appendRequest(resource)) {
if (sharedItems->appendRequest(resource, priority)) {
resource->makeRequest();
return true;
}
@ -560,8 +555,8 @@ void ResourceCache::requestCompleted(QWeakPointer<Resource> resource) {
bool ResourceCache::attemptHighestPriorityRequest() {
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
auto resource = sharedItems->getHighestPendingRequest();
return (resource && attemptRequest(resource));
auto resourcePair = sharedItems->getHighestPendingRequest();
return (resourcePair.first && attemptRequest(resourcePair.first, resourcePair.second));
}
static int requestID = 0;

6
libraries/networking/src/ResourceCache.h
View file

@ -66,12 +66,12 @@ class ResourceCacheSharedItems : public Dependency {
using Lock = std::unique_lock<Mutex>;
public:
bool appendRequest(QWeakPointer<Resource> newRequest);
bool appendRequest(QWeakPointer<Resource> newRequest, float priority);
void removeRequest(QWeakPointer<Resource> doneRequest);
void setRequestLimit(uint32_t limit);
uint32_t getRequestLimit() const;
QList<QSharedPointer<Resource>> getPendingRequests() const;
QSharedPointer<Resource> getHighestPendingRequest();
std::pair<QSharedPointer<Resource>, float> getHighestPendingRequest();
uint32_t getPendingRequestsCount() const;
QList<std::pair<QSharedPointer<Resource>, float>> getLoadingRequests() const;
uint32_t getLoadingRequestsCount() const;
@ -268,7 +268,7 @@ protected:
/// Attempt to load a resource if requests are below the limit, otherwise queue the resource for loading
/// \return true if the resource began loading, otherwise false if the resource is in the pending queue
static bool attemptRequest(QSharedPointer<Resource> resource);
static bool attemptRequest(QSharedPointer<Resource> resource, float priority = NAN);
static void requestCompleted(QWeakPointer<Resource> resource);
static bool attemptHighestPriorityRequest();

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -359,6 +359,7 @@ enum class EntityVersion : PacketVersion {
AmbientColor,
SoundEntities,
TonemappingAndAmbientOcclusion,
ModelLoadPriority,
// Add new versions above here
NUM_PACKET_TYPE,