Skip to content

Fixed HangingLamp #411

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
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fixed HangingLamp #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9854d0
Merge from dev [skip ci]
xrSimpodin Jun 29, 2021
c6245aa
Merge from dev [skip ci]
xrSimpodin Sep 4, 2021
8ca4e1a
Merge from dev [skip ci]
xrSimpodin Sep 6, 2021
7ab5bb7
Merge from dev [skip ci]
xrSimpodin Sep 22, 2021
4c6a8bc
Merge from dev [skip ci]
xrSimpodin Nov 4, 2021
b1f1b5b
Fixed HangingLamp
Graff46 Feb 12, 2022
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
4 changes: 3 additions & 1 deletion OgsrBuildProps.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<!--PreferredToolArchitecture>x64</PreferredToolArchitecture-->

<!-- Default is v142 -->
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>

<!-- v141 is allowed -->
<PlatformToolset Condition="'$(DefaultPlatformToolset)'=='v141'">v141</PlatformToolset>
Expand Down
27 changes: 17 additions & 10 deletions ogsr_engine/xrGame/HangingLamp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ BOOL CHangingLamp::net_Spawn(CSE_Abstract* DC)
// CInifile* pUserData = K->LL_UserData();
// R_ASSERT3 (pUserData,"Empty HangingLamp user data!",lamp->get_visual());
xr_delete(collidable.model);
IKinematics* K = nullptr;
if (Visual()){
IKinematics* K = smart_cast<IKinematics*>(Visual());
K = smart_cast<IKinematics*>(Visual());
R_ASSERT (Visual()&&smart_cast<IKinematics*>(Visual()));
light_bone = K->LL_BoneID (*lamp->light_main_bone); VERIFY(light_bone!=BI_NONE);
ambient_bone = K->LL_BoneID (*lamp->light_ambient_bone);VERIFY(ambient_bone!=BI_NONE);
Expand Down Expand Up @@ -142,16 +143,20 @@ BOOL CHangingLamp::net_Spawn(CSE_Abstract* DC)
lanim = LALib.FindItem(*lamp->color_animator);

CPHSkeleton::Spawn(e);
if (smart_cast<IKinematicsAnimated*>(Visual())) smart_cast<IKinematicsAnimated*> (Visual())->PlayCycle("idle");
if (smart_cast<IKinematics*>(Visual())){
smart_cast<IKinematics*> (Visual())->CalculateBones_Invalidate ();
smart_cast<IKinematics*> (Visual())->CalculateBones();

if (K) {
IKinematicsAnimated* KA = smart_cast<IKinematicsAnimated*>(Visual());
if (KA) KA->PlayCycle("idle");

K->CalculateBones_Invalidate ();
K->CalculateBones();
//.intepolate_pos
}
if (lamp->flags.is(CSE_ALifeObjectHangingLamp::flPhysic)&&!Visual())
Msg("! WARNING: lamp, obj name [%s],flag physics set, but has no visual",*cName());
//. if (lamp->flags.is(CSE_ALifeObjectHangingLamp::flPhysic)&&Visual()&&!guid_physic_bone) fHealth=0.f;
if (Alive()) TurnOn ();
if (Alive() && isOn)
TurnOn ();
else{
processing_activate (); // temporal enable
TurnOff (); // -> and here is disable :)
Expand Down Expand Up @@ -257,10 +262,11 @@ void CHangingLamp::UpdateCL ()

void CHangingLamp::TurnOn ()
{
light_render->set_active (true);
isOn = true;
if (light_render) light_render->set_active (true);
if (glow_render) glow_render->set_active (true);
if (light_ambient) light_ambient->set_active (true);
if (Visual()){
if (Visual() && (light_bone != BI_NONE)){
IKinematics* K = smart_cast<IKinematics*>(Visual());
K->LL_SetBoneVisible (light_bone, TRUE, TRUE);
K->CalculateBones_Invalidate();
Expand All @@ -271,10 +277,11 @@ void CHangingLamp::TurnOn ()

void CHangingLamp::TurnOff ()
{
light_render->set_active (false);
isOn = false;
if (light_render) light_render->set_active (false);
if (glow_render) glow_render->set_active (false);
if (light_ambient) light_ambient->set_active (false);
if (Visual()) smart_cast<IKinematics*>(Visual())->LL_SetBoneVisible(light_bone, FALSE, TRUE);
if (Visual() && (light_bone != BI_NONE)) smart_cast<IKinematics*>(Visual())->LL_SetBoneVisible(light_bone, FALSE, TRUE);
processing_deactivate ();

}
Expand Down
1 change: 1 addition & 0 deletions ogsr_engine/xrGame/HangingLamp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public CPHSkeleton
ref_light light_ambient;
CLAItem* lanim;
float ambient_power;
bool isOn = true;

ref_glow glow_render;

Expand Down