mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
- added vector builtins Length() and Unit().
This should complete the vector type except for use as function parameter.
This commit is contained in:
parent
b5222f08e8
commit
f5d1b1a491
4 changed files with 81 additions and 0 deletions
|
@ -730,3 +730,5 @@ xx(__decorate_internal_state__)
|
|||
xx(__decorate_internal_float__)
|
||||
|
||||
xx(DamageFunction)
|
||||
xx(Length)
|
||||
xx(Unit)
|
||||
|
|
|
@ -5535,6 +5535,18 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
|
|||
|
||||
PClass *cls;
|
||||
bool staticonly = false;
|
||||
if (Self->IsVector())
|
||||
{
|
||||
// handle builtins: Vectors got 2: Length and Unit.
|
||||
if (MethodName == NAME_Length || MethodName == NAME_Unit)
|
||||
{
|
||||
auto x = new FxVectorBuiltin(Self, MethodName);
|
||||
Self = nullptr;
|
||||
delete this;
|
||||
return x->Resolve(ctx);
|
||||
}
|
||||
}
|
||||
|
||||
if (Self->ValueType->IsKindOf(RUNTIME_CLASS(PClassPointer)))
|
||||
{
|
||||
cls = static_cast<PClassPointer *>(Self->ValueType)->ClassRestriction;
|
||||
|
@ -6096,6 +6108,51 @@ ExpEmit FxFlopFunctionCall::Emit(VMFunctionBuilder *build)
|
|||
return v;
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
FxVectorBuiltin::FxVectorBuiltin(FxExpression *self, FName name)
|
||||
:FxExpression(EFX_VectorBuiltin, self->ScriptPosition)
|
||||
{
|
||||
Self = self;
|
||||
Function = name;
|
||||
}
|
||||
|
||||
FxVectorBuiltin::~FxVectorBuiltin()
|
||||
{
|
||||
SAFE_DELETE(Self);
|
||||
}
|
||||
|
||||
FxExpression *FxVectorBuiltin::Resolve(FCompileContext &ctx)
|
||||
{
|
||||
SAFE_RESOLVE(Self, ctx);
|
||||
assert(Self->IsVector()); // should never be created for anything else.
|
||||
ValueType = Function == NAME_Length ? TypeFloat64 : Self->ValueType;
|
||||
return this;
|
||||
}
|
||||
|
||||
ExpEmit FxVectorBuiltin::Emit(VMFunctionBuilder *build)
|
||||
{
|
||||
ExpEmit to(build, ValueType->GetRegType(), ValueType->GetRegCount());
|
||||
ExpEmit op = Self->Emit(build);
|
||||
if (Function == NAME_Length)
|
||||
{
|
||||
build->Emit(Self->ValueType == TypeVector2 ? OP_LENV2 : OP_LENV3, to.RegNum, op.RegNum);
|
||||
}
|
||||
else
|
||||
{
|
||||
ExpEmit len(build, REGT_FLOAT);
|
||||
build->Emit(Self->ValueType == TypeVector2 ? OP_LENV2 : OP_LENV3, len.RegNum, op.RegNum);
|
||||
build->Emit(Self->ValueType == TypeVector2 ? OP_DIVVF2_RR : OP_DIVVF3_RR, to.RegNum, op.RegNum, len.RegNum);
|
||||
len.Free(build);
|
||||
}
|
||||
op.Free(build);
|
||||
return to;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// FxSequence :: Resolve
|
||||
|
|
|
@ -266,6 +266,7 @@ enum EFxType
|
|||
EFX_SwitchStatement,
|
||||
EFX_CaseStatement,
|
||||
EFX_VectorInitializer,
|
||||
EFX_VectorBuiltin,
|
||||
EFX_COUNT
|
||||
};
|
||||
|
||||
|
@ -1254,6 +1255,25 @@ public:
|
|||
ExpEmit Emit(VMFunctionBuilder *build);
|
||||
};
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// FxFlopFunctionCall
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
class FxVectorBuiltin : public FxExpression
|
||||
{
|
||||
FName Function;
|
||||
FxExpression *Self;
|
||||
|
||||
public:
|
||||
|
||||
FxVectorBuiltin(FxExpression *self, FName name);
|
||||
~FxVectorBuiltin();
|
||||
FxExpression *Resolve(FCompileContext&);
|
||||
ExpEmit Emit(VMFunctionBuilder *build);
|
||||
};
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// FxVMFunctionCall
|
||||
|
|
|
@ -177,3 +177,5 @@ zscript/chex/chexweapons.txt
|
|||
zscript/chex/chexitems.txt
|
||||
zscript/chex/chexdecorations.txt
|
||||
zscript/chex/chexplayer.txt
|
||||
|
||||
zscript/test2.txt
|
||||
|
|
Loading…
Reference in a new issue