Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 13:35:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2017-04-30 12:23:34 -07:00
parent 41663c58b8
commit 1b67a8b251
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -49,7 +49,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::EntityEdit: case PacketType::EntityEdit:
case PacketType::EntityData: case PacketType::EntityData:
case PacketType::EntityPhysics: case PacketType::EntityPhysics:
return VERSION_ENTITIES_MORE_CONSTRAINTS; return VERSION_ENTITIES_BULLET_DYNAMICS;
case PacketType::EntityQuery: case PacketType::EntityQuery:
return static_cast<PacketVersion>(EntityQueryPacketVersion::JSONFilterWithFamilyTree); return static_cast<PacketVersion>(EntityQueryPacketVersion::JSONFilterWithFamilyTree);
case PacketType::AvatarIdentity: case PacketType::AvatarIdentity:

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

@ -208,8 +208,7 @@ const PacketVersion VERSION_ENTITIES_SERVER_SCRIPTS = 66;
const PacketVersion VERSION_ENTITIES_PHYSICS_PACKET = 67; const PacketVersion VERSION_ENTITIES_PHYSICS_PACKET = 67;
const PacketVersion VERSION_ENTITIES_ZONE_FILTERS = 68; const PacketVersion VERSION_ENTITIES_ZONE_FILTERS = 68;
const PacketVersion VERSION_ENTITIES_HINGE_CONSTRAINT = 69; const PacketVersion VERSION_ENTITIES_HINGE_CONSTRAINT = 69;
const PacketVersion VERSION_ENTITIES_SLIDER_CONSTRAINT = 70; const PacketVersion VERSION_ENTITIES_BULLET_DYNAMICS = 70;
const PacketVersion VERSION_ENTITIES_MORE_CONSTRAINTS = 71;
enum class EntityQueryPacketVersion: PacketVersion { enum class EntityQueryPacketVersion: PacketVersion {
JSONFilter = 18, JSONFilter = 18,

4
libraries/physics/src/ObjectConstraintConeTwist.cpp
View file

@ -293,10 +293,6 @@ QVariantMap ObjectConstraintConeTwist::getArguments() {
arguments["softness"] = _softness; arguments["softness"] = _softness;
arguments["biasFactor"] = _biasFactor; arguments["biasFactor"] = _biasFactor;
arguments["relaxationFactor"] = _relaxationFactor; arguments["relaxationFactor"] = _relaxationFactor;
// arguments["linearPosition"] = static_cast<btConeTwistConstraint*>(_constraint)->getLinearPos();
// arguments["angularPosition"] = static_cast<btConeTwistConstraint*>(_constraint)->getAngularPos();
} }
}); });
return arguments; return arguments;

12
scripts/developer/tests/dynamics/dynamics-tests-interface.js
View file

@ -1,3 +1,15 @@
//
// dynamics-tests-interface.js
// scripts/developer/tests/dynamics/
//
// Created by Seth Alves 2017-4-30
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
"use strict"; "use strict";
/* globals $, EventBridge */ /* globals $, EventBridge */

10
scripts/developer/tests/dynamics/dynamicsTests.js
View file

@ -1,3 +1,13 @@
//
// dynamicsTests.js
// scripts/developer/tests/dynamics/
//
// Created by Seth Alves 2017-4-30
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
"use strict"; "use strict";