Skip to content

Update for Skyrim 1.7.99 (CommonLibSSE-NG 6.6.3) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rrasto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update for Skyrim 1.7.99 (CommonLibSSE-NG 6.6.3) #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/ActiveActor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ bool ActiveActor::UpdateClone()

uint32_t filterInfo = 0;
if (!Utils::GetActorCollisionFilterInfo(actor.get(), filterInfo)) {
actor->GetCollisionFilterInfo(filterInfo);
RE::CFilter filterInfo_cf;
actor->GetCollisionFilterInfo(filterInfo_cf);
filterInfo = filterInfo_cf.filter;
}

uint16_t currentCollisionGroup = filterInfo >> 16;
Expand Down Expand Up @@ -112,8 +114,8 @@ bool ActiveActor::UpdateClone()
if (auto collidable = static_cast<RE::bhkCollisionObject*>(cloneNode->collisionObject.get())) {
if (auto worldObject = collidable->body.get()) {
if (auto hkpWorldObject = static_cast<RE::hkpWorldObject*>(worldObject->referencedObject.get())) {
hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo &= (0x0000ffff); // zero out collision group
hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo |= (static_cast<uint32_t>(collisionGroup) << 16); // set collision group to current
hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo.filter &= (0x0000ffff); // zero out collision group
hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo.filter |= (static_cast<uint32_t>(collisionGroup) << 16); // set collision group to current
}
}
}
Expand Down Expand Up @@ -264,7 +266,7 @@ void ActiveActor::FillCloneMap(RE::NiAVObject* a_clone, RE::NiAVObject* a_origin
if (auto collidable = static_cast<RE::bhkCollisionObject*>(cloneChild->collisionObject.get())) {
if (auto worldObject = collidable->body.get()) {
if (auto hkpWorldObject = static_cast<RE::hkpWorldObject*>(worldObject->referencedObject.get())) {
auto& collisionFilterInfo = hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo;
auto& collisionFilterInfo = hkpWorldObject->collidable.broadPhaseHandle.collisionFilterInfo.filter;
CollisionLayer layer = static_cast<CollisionLayer>(collisionFilterInfo & 0x7f);

// remove children that have the char controller layer
Expand Down
4 changes: 3 additions & 1 deletion src/AttackCollision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,9 @@ bool AttackCollision::CreateCollision(RE::bhkWorld* a_world, RE::Actor* a_actor,
uint32_t collisionFilterInfo = 0;

if (!Utils::GetActorCollisionFilterInfo(a_actor, collisionFilterInfo)) {
a_actor->GetCollisionFilterInfo(collisionFilterInfo);
RE::CFilter collisionFilterInfo_cf;
a_actor->GetCollisionFilterInfo(collisionFilterInfo_cf);
collisionFilterInfo = collisionFilterInfo_cf.filter;
}

uint16_t collisionGroup = collisionFilterInfo >> 16;
Expand Down
2 changes: 1 addition & 1 deletion src/AttackTrail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ bool AttackTrail::GetTrailDefinition(RE::ActorHandle a_actorHandle, RE::Inventor

RE::BSVisit::BSVisitControl AttackTrail::ApplyColorSettings(RE::BSGeometry* a_geometry, bool a_init, bool a_bExpired)
{
const auto effect = a_geometry->properties[RE::BSGeometry::States::kEffect];
const auto effect = a_geometry->GetGeometryRuntimeData().shaderProperty;
const auto effectShader = netimmerse_cast<RE::BSEffectShaderProperty*>(effect.get());
if (effectShader) {
auto effectShaderMaterial = skyrim_cast<RE::BSEffectShaderMaterial*>(effectShader->material);
Expand Down
6 changes: 4 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ add_library(
target_compile_features(
"${PROJECT_NAME}"
PRIVATE
cxx_std_20
cxx_std_23
)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
Expand All @@ -100,7 +100,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
"/utf-8" # Set Source and Executable character sets to UTF-8
# "/Zi" # Debug Information Format

"/await"
# "/await" removed: it is the pre-C++20 experimental coroutine switch. With it MSVC's
# <coroutine> disables itself (STL4039) and only provides std::experimental::coroutine_handle,
# so CommonLibSSE-NG 6.x fails to compile. C++23 has coroutines without any flag.

"/permissive-" # Standards conformance
"/Zc:preprocessor" # Enable preprocessor conformance mode
Expand Down
67 changes: 36 additions & 31 deletions src/Havok/ContactListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,30 @@ RE::hkVector4 GetParentNodePointVelocity(RE::NiAVObject* a_node, const RE::hkVec

void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_event)
{
if (a_event.contactPointProperties->flags & RE::hkContactPointMaterial::FlagEnum::kIsDisabled ||
!a_event.contactPointProperties->flags & RE::hkContactPointMaterial::FlagEnum::kIsNew) {
// The original read `flags & kIsDisabled || !flags & kIsNew`. C++ binds ! tighter than &,
// so the second term is (!flags) & kIsNew, and with kIsNew == 1 that is simply "flags == 0".
// It looks like a precedence slip for !(flags & kIsNew), but the mod has shipped and been
// tuned with this behaviour for three years - writing the apparently intended version drops
// continuing contacts and takes weapon-versus-wall recoil with it. Kept exactly as it was.
if (a_event.contactPointProperties->flags.any(RE::hkContactPointMaterial::Flag::kIsDisabled) ||
a_event.contactPointProperties->flags.underlying() == 0) {
return;
}

// run callbacks and re-check flag
PrecisionHandler::GetSingleton()->RunContactListenerCallbacks(a_event);
if (a_event.contactPointProperties->flags & RE::hkContactPointMaterial::FlagEnum::kIsDisabled) {
if (a_event.contactPointProperties->flags.any(RE::hkContactPointMaterial::Flag::kIsDisabled)) {
return;
}

RE::hkpRigidBody* rigidBodyA = a_event.bodies[0];
RE::hkpRigidBody* rigidBodyB = a_event.bodies[1];

CollisionLayer layerA = static_cast<CollisionLayer>(rigidBodyA->collidable.broadPhaseHandle.collisionFilterInfo & 0x7f);
CollisionLayer layerB = static_cast<CollisionLayer>(rigidBodyB->collidable.broadPhaseHandle.collisionFilterInfo & 0x7f);
CollisionLayer layerA = static_cast<CollisionLayer>(rigidBodyA->collidable.broadPhaseHandle.collisionFilterInfo.filter & 0x7f);
CollisionLayer layerB = static_cast<CollisionLayer>(rigidBodyB->collidable.broadPhaseHandle.collisionFilterInfo.filter & 0x7f);

//uint16_t groupA = rigidBodyA->collidable.broadPhaseHandle.collisionFilterInfo >> 16;
//uint16_t groupB = rigidBodyB->collidable.broadPhaseHandle.collisionFilterInfo >> 16;
//uint16_t groupA = rigidBodyA->collidable.broadPhaseHandle.collisionFilterInfo.filter >> 16;
//uint16_t groupB = rigidBodyB->collidable.broadPhaseHandle.collisionFilterInfo.filter >> 16;

if (layerA != CollisionLayer::kPrecisionAttack && layerA != CollisionLayer::kPrecisionRecoil && layerB != CollisionLayer::kPrecisionAttack && layerB != CollisionLayer::kPrecisionRecoil) {
return; // Every collision we care about involves the Precision Attack or recoil layer
Expand All @@ -60,7 +65,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
if (!hitRigidBodyWrapper || !hittingRigidBodyWrapper) {
if (hittingRigidBody->collidable.broadPhaseHandle.objectQualityType == RE::hkpCollidableQualityType::kKeyframedReporting && !Utils::IsMoveableEntity(hitRigidBody)) {
// It's not a hit, so disable contact for keyframed/fixed objects in this case
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
}
return;
}
Expand All @@ -77,7 +82,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
// RECOIL
if (hittingLayer == CollisionLayer::kPrecisionRecoil) {
// Recoil layer is only used for recoil, so disable contact
a_event.contactPointProperties->flags |= RE::hkContactPointMaterial::FlagEnum::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);

if (auto attackerActor = attacker->As<RE::Actor>()) {
auto precisionHandler = PrecisionHandler::GetSingleton();
Expand Down Expand Up @@ -106,7 +111,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
}

if (pointVelocity.IsEqual(RE::hkVector4())) { // still zero, skip this collision
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

Expand Down Expand Up @@ -159,14 +164,14 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
}

if (!attacker || attacker->formType != RE::FormType::ActorCharacter) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

if (!target && hitLayer != CollisionLayer::kGround) {
if (hittingRigidBody->collidable.broadPhaseHandle.objectQualityType == RE::hkpCollidableQualityType::kKeyframedReporting && !Utils::IsMoveableEntity(hitRigidBody)) {
// It's not a hit, so disable contact for keyframed/fixed objects in this case
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
}
return;
}
Expand All @@ -182,12 +187,12 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
RE::Actor* targetActor = target ? target->As<RE::Actor>() : nullptr;

if (!attackCollision) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

if (attackCollision->bIsRecoiling) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

Expand All @@ -201,7 +206,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
}

if (pointVelocity.IsEqual(RE::hkVector4())) { // still zero, skip this collision
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

Expand All @@ -221,12 +226,12 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
for (auto& entry : callbackReturns) {
if (entry.bIgnoreHit) {
// abort hit
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
} else {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return; // Disable weapon-weapon collisions
}
}
Expand All @@ -249,12 +254,12 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
for (auto& entry : callbackReturns) {
if (entry.bIgnoreHit) {
// abort hit
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
} else {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return; // Disable weapon-moving projectile collisions
}
}
Expand All @@ -277,7 +282,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
if (hittingNode && visualWeaponLength > 0.f) {
if (hitDistanceFromWeaponRoot > visualWeaponLength) {
// skip collision if the contact point is farther away than visual weapon length
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
Expand All @@ -293,7 +298,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
if (!bIsMovableEntity && !bIsDestructible) {
// check if already has hit the same material recently
if (attackCollision->HasHitMaterial(materialID)) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

Expand All @@ -314,13 +319,13 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve

// filter out self for whatever reason
if (targetActor == attackerActor) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

if (attackCollision->HasHitRef(target ? target->GetHandle() : RE::ObjectRefHandle())) {
// refr has already been recently hit, so disable the contact point and gtfo
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}

Expand All @@ -329,7 +334,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
auto charController = targetActor->GetCharController();
if (charController) {
if (!PrecisionHandler::IsCharacterControllerHittable(charController)) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
Expand All @@ -354,7 +359,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve

if (Settings::bNoPlayerTeammateAttackCollision && bAttackerIsPlayer && bTargetIsTeammate) {
if (targetActor->GetActorRuntimeData().currentCombatTarget != attackerActor->GetHandle()) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
Expand All @@ -364,28 +369,28 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
// don't let the player's teammates or summons hit the player
if (Settings::bNoPlayerTeammateAttackCollision && bAttackerIsTeammate && bTargetIsPlayer) {
if (attackerCombatTarget != targetActorHandle) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}
// don't let the player's teammates hit each other
if (Settings::bNoPlayerTeammateAttackCollision && bAttackerIsTeammate && bTargetIsTeammate) {
if (attackerCombatTarget != targetActorHandle) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}

// don't hit actors that aren't hostile and are in combat already
if (Settings::bNoNonHostileAttackCollision && precisionHandler->CheckActorInCombat(targetActorHandle) && !targetActor->IsHostileToActor(attackerActor)) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
return;
}
}

if (targetActor && targetActor->IsGhost()) {
// skip hitting actors with iframes
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
if (Settings::bDebug && Settings::bDisplayIframeHits) {
const glm::vec4 blue{ 0.2, 0.2, 1.0, 1.0 };
DrawHandler::AddPoint(niHitPos, 1.f, blue);
Expand All @@ -397,7 +402,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve
if (PrecisionHandler::HasJumpIframes(targetActor)) {
if (auto hitNode = GetNiObjectFromCollidable(hitRigidBody->GetCollidable())) {
if (!Utils::IsNodeOrChildOfNode(hitNode, Settings::jumpIframeNode)) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);

if (Settings::bDebug && Settings::bDisplayIframeHits) {
const glm::vec4 blue{ 0.2, 0.2, 1.0, 1.0 };
Expand All @@ -411,7 +416,7 @@ void ContactListener::ContactPointCallback(const RE::hkpContactPointEvent& a_eve

// disable physical collision with actor
if (targetActor || Settings::bDisablePhysicalCollisionOnHit) {
a_event.contactPointProperties->flags |= RE::hkpContactPointProperties::kIsDisabled;
a_event.contactPointProperties->flags.set(RE::hkContactPointMaterial::Flag::kIsDisabled);
}

// add to already hit refs so we don't hit the target again within the same attack
Expand Down
Loading