marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Elevator construction preview shows placement of the case (#1534). 

Structures can use the definition call ConstructionPreview(Previewer Object, Overlay, Direction) to add any overlay to the previewer. It will be coloured accordingly.
stable-7
Clonkonaut 2016-01-28 00:31:22 +01:00 committed by Maikel de Vries
parent 684b0d0682
commit 47820691d0
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionPreviewer.ocd/Script.c
View File

@ -9,9 +9,10 @@ static const CONSTRUCTION_STICK_Left = 1;
static const CONSTRUCTION_STICK_Right = 2;
static const CONSTRUCTION_STICK_Bottom = 4;
local dimension_x, dimension_y, clonk, structure, direction, stick_to, blocked;
local extra_overlay, dimension_x, dimension_y, clonk, structure, direction, stick_to, blocked;
local GFX_StructureOverlay = 1;
local GFX_CombineIconOverlay = 2;
local GFX_PreviewerPictureOverlay = 2;
public func GetFlipDescription() { return "$TxtFlipDesc$"; }
@ -23,7 +24,11 @@ func Initialize()
func Set(id to_construct, object constructing_clonk)
{
SetGraphics(nil, to_construct, GFX_StructureOverlay, GFXOV_MODE_Base);
SetGraphics(nil, to_construct, 3, GFXOV_MODE_Picture, nil, GFX_BLIT_Wireframe);
SetGraphics(nil, to_construct, GFX_PreviewerPictureOverlay, GFXOV_MODE_Picture, nil, GFX_BLIT_Wireframe);
// Buildings may add something to the preview and can do so on GFX_PreviewerPictureOverlay
// This is used by the elevator to preview the case
// The definition should return true
extra_overlay = to_construct->~ConstructionPreview(this, GFX_PreviewerPictureOverlay, direction);
dimension_x = to_construct->GetDefWidth();
dimension_y = to_construct->GetDefHeight();
@ -60,7 +65,10 @@ public func AdjustPreview(bool below_surface, bool look_up, bool no_call)
if (blocked && !no_call)
return AdjustPreview(below_surface, !look_up, true);
if (blocked)
{
if (extra_overlay) SetClrModulation(RGBa(255,50,50, 100), GFX_PreviewerPictureOverlay);
return SetClrModulation(RGBa(255,50,50, 100), GFX_StructureOverlay);
}
// Position depends on whether the object should below surface.
if (!below_surface)
SetPosition(GetX(), GetY() + y);
@ -80,12 +88,21 @@ public func AdjustPreview(bool below_surface, bool look_up, bool no_call)
if(!blocked)
{
if (!stick_to)
{
SetClrModulation(RGBa(50,255,50, 100), GFX_PreviewerPictureOverlay);
SetClrModulation(RGBa(50,255,50, 100), GFX_StructureOverlay);
}
else
{
SetClrModulation(RGBa(255,255,50, 200), GFX_PreviewerPictureOverlay);
SetClrModulation(RGBa(255,255,50, 200), GFX_StructureOverlay);
}
}
else
{
SetClrModulation(RGBa(255,50,50, 100), GFX_PreviewerPictureOverlay);
SetClrModulation(RGBa(255,50,50, 100), GFX_StructureOverlay);
}
}
// Positions the preview according to the mouse cursor, calls AdjustPreview afterwards
@ -134,7 +151,7 @@ func Reposition(int x, int y)
stick_to = nil;
SetGraphics(nil, nil, GFX_CombineIconOverlay);
}
else if (stick_to)
else if (stick_to)
{
SetGraphics(nil, ConstructionPreviewer_IconCombine, GFX_CombineIconOverlay, GFXOV_MODE_Base);
var dir = 1;
@ -162,6 +179,8 @@ func Flip()
direction = DIR_Left;
SetObjDrawTransform(1000,0,0, 0,1000,0, GFX_StructureOverlay);
}
if (extra_overlay)
structure->~ConstructionPreview(this, GFX_PreviewerPictureOverlay, direction);
}
// UI not saved.

10
planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c
View File

@ -214,6 +214,16 @@ private func UpdateTurnSpeed()
/* Construction preview */
// Definition call by the construction previewer
public func ConstructionPreview(object previewer, int overlay, int dir)
{
if (GetType(this) != C4V_Def) return;
previewer->SetGraphics(nil, Elevator_Case_Front, overlay, GFXOV_MODE_Base);
previewer->SetObjDrawTransform(1000, 0, -19000 * (dir*2-1), 0, 1000, 17000, overlay);
return true;
}
// Sticking to other elevators
public func ConstructionCombineWith() { return "IsElevator"; }
public func ConstructionCombineDirection() { return CONSTRUCTION_STICK_Left | CONSTRUCTION_STICK_Right; }