Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 19da3c8

Browse files
MaximDudeMaximDude
committed
1 parent 1d63aa1 commit 19da3c8

File tree

10 files changed

+40
-40
lines changed

10 files changed

+40
-40
lines changed

‎Base.rte/AI/HumanFunctions.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
146146
for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
147147
local screen = ActivityMan:GetActivity():ScreenOfPlayer(actor.controller.Player);
148148
if not SceneMan:IsUnseen(drawPos.X, drawPos.Y, ActivityMan:GetActivity():GetTeamOfPlayer(player)) then
149-
FrameMan:DrawBitmapPrimitive(screen, drawPos, item, rotAng, 0);
149+
PrimitiveMan:DrawBitmapPrimitive(screen, drawPos, item, rotAng, 0);
150150
end
151151
end
152152
end

‎Base.rte/Activities/NetworkTest.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ function NetworkTest:UpdateActivity()
109109
end
110110
--ConsoleMan:ForceVisibility(true)
111111

112-
--FrameMan:DrawBoxPrimitive(Vector(1,401), Vector(9,409), 20)
112+
--PrimitiveMan:DrawBoxPrimitive(Vector(1,401), Vector(9,409), 20)
113113

114-
--FrameMan:DrawBoxPrimitive(-1, Vector(30,430), Vector(50,450), 30)
114+
--PrimitiveMan:DrawBoxPrimitive(-1, Vector(30,430), Vector(50,450), 30)
115115

116116
--for actor in MovableMan.Actors do
117117
-- print (actor.DeploymentID)
@@ -145,11 +145,11 @@ function NetworkTest:UpdateActivity()
145145
self.SoundTimer:Reset();
146146
end
147147

148-
FrameMan:DrawBoxPrimitive(0, Vector(10,410), Vector(100,449), 5)
149-
FrameMan:DrawBoxPrimitive(1, Vector(10,450), Vector(100,500), 10)
148+
PrimitiveMan:DrawBoxPrimitive(0, Vector(10,410), Vector(100,449), 5)
149+
PrimitiveMan:DrawBoxPrimitive(1, Vector(10,450), Vector(100,500), 10)
150150

151-
FrameMan:DrawTextPrimitive(0, Vector(30, 430), "Player One Sees This!", true, 0);
152-
FrameMan:DrawTextPrimitive(1, Vector(30, 430), "Player Two Sees This!", true, 0);
151+
PrimitiveMan:DrawTextPrimitive(0, Vector(30, 430), "Player One Sees This!", true, 0);
152+
PrimitiveMan:DrawTextPrimitive(1, Vector(30, 430), "Player Two Sees This!", true, 0);
153153

154154
for actor in MovableMan.Actors do
155155
--[[if actor.ClassName == "ACRocket" then

‎Base.rte/Craft/Shared/MGTurret.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ function Update(self)
4444
local aimPos = self.Pos + Vector((self.searchRange / 2), 0):RadRotate(self.RotAngle);
4545
-- Debug: visualize aim area
4646
if self.showAim then
47-
FrameMan:DrawCirclePrimitive(self.Team, aimPos, (self.searchRange / 2), 13);
47+
PrimitiveMan:DrawCirclePrimitive(self.Team, aimPos, (self.searchRange / 2), 13);
4848
end
4949
local aimTarget = MovableMan:GetClosestEnemyActor(self.Team, aimPos, (self.searchRange / 2), Vector());
5050
if aimTarget then
5151
-- Debug: visualize search trace
5252
if self.showAim then
53-
FrameMan:DrawLinePrimitive(self.Team, aimPos, aimTarget.Pos, 13);
53+
PrimitiveMan:DrawLinePrimitive(self.Team, aimPos, aimTarget.Pos, 13);
5454
end
5555
-- Check that the target isn't obscured by terrain
5656
local aimTrace = SceneMan:ShortestDistance(self.Pos, aimTarget.Pos, SceneMan.SceneWrapsX);
@@ -59,7 +59,7 @@ function Update(self)
5959
self.RotAngle = aimTrace.AbsRadAngle;
6060
-- Debug: visualize aim trace
6161
if self.showAim then
62-
FrameMan:DrawLinePrimitive(self.Team, self.Pos, aimTarget.Pos, 254);
62+
PrimitiveMan:DrawLinePrimitive(self.Team, self.Pos, aimTarget.Pos, 254);
6363
end
6464
self:EnableEmission(true);
6565
self:TriggerBurst();
@@ -89,8 +89,8 @@ function Update(self)
8989
end
9090
-- Debug: visualize aim traces
9191
if self.showAim then
92-
FrameMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(1 / math.sqrt(self.searchRange)), color);
93-
FrameMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(-1 / math.sqrt(self.searchRange)), color);
92+
PrimitiveMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(1 / math.sqrt(self.searchRange)), color);
93+
PrimitiveMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(-1 / math.sqrt(self.searchRange)), color);
9494
end
9595
end
9696
end

‎Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ function Update(self)
5252

5353
if #self.guideTable > 1 then
5454
for i = 1, #self.guideTable-1 do
55-
FrameMan:DrawLinePrimitive(self.guideTable[i],self.guideTable[i+1],120);
55+
PrimitiveMan:DrawLinePrimitive(self.guideTable[i],self.guideTable[i+1],120);
5656
end
57-
FrameMan:DrawCirclePrimitive(self.guideTable[#self.guideTable],12,120);
57+
PrimitiveMan:DrawCirclePrimitive(self.guideTable[#self.guideTable],12,120);
5858
end
5959

6060
end

‎Base.rte/Devices/Tools/Constructor/Constructor.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ function Update(self)
211211
local mode = {"Dig", "Spray"};
212212

213213
if ctrl:IsState(Controller.PIE_MENU_ACTIVE) then
214-
FrameMan:DrawTextPrimitive(screen, actor.AboveHUDPos + Vector(0, 26), "Mode: " .. mode[self:GetNumberValue("Constructor Mode") + 1], true, 1);
214+
PrimitiveMan:DrawTextPrimitive(screen, actor.AboveHUDPos + Vector(0, 26), "Mode: " .. mode[self:GetNumberValue("Constructor Mode") + 1], true, 1);
215215
end
216216

217217
-- constructor actions if the user is in gold dig mode
@@ -410,7 +410,7 @@ function Update(self)
410410

411411
local mapx = math.floor((self.cursor.Pos.X-12)/24)*24+12;
412412
local mapy = math.floor((self.cursor.Pos.Y-12)/24)*24+12;
413-
FrameMan:DrawBoxPrimitive(screen, Vector(mapx, mapy), Vector(mapx+23, mapy+23), 120);
413+
PrimitiveMan:DrawBoxPrimitive(screen, Vector(mapx, mapy), Vector(mapx+23, mapy+23), 120);
414414

415415
-- add blocks to the build queue if the cursor is firing
416416
if self.cursor:IsPlayerControlled() then
@@ -445,9 +445,9 @@ function Update(self)
445445
templist[#templist+1] = self.buildlist[i];
446446
if self.displaygrid then
447447
if SceneMan:ShortestDistance(actor.Pos, Vector(self.buildlist[i][1],self.buildlist[i][2]), SceneMan.SceneWrapsX).Magnitude < self.builddistance then
448-
FrameMan:DrawBoxPrimitive(screen, Vector(self.buildlist[i][1],self.buildlist[i][2]), Vector(self.buildlist[i][1]+23,self.buildlist[i][2]+23), 5);
448+
PrimitiveMan:DrawBoxPrimitive(screen, Vector(self.buildlist[i][1],self.buildlist[i][2]), Vector(self.buildlist[i][1]+23,self.buildlist[i][2]+23), 5);
449449
else
450-
FrameMan:DrawBoxPrimitive(screen, Vector(self.buildlist[i][1],self.buildlist[i][2]), Vector(self.buildlist[i][1]+23,self.buildlist[i][2]+23), 13);
450+
PrimitiveMan:DrawBoxPrimitive(screen, Vector(self.buildlist[i][1],self.buildlist[i][2]), Vector(self.buildlist[i][1]+23,self.buildlist[i][2]+23), 13);
451451
end
452452
end
453453
end
@@ -470,8 +470,8 @@ function Update(self)
470470
by = by*3-1;
471471
bx = bx*3-1;
472472

473-
FrameMan:DrawLinePrimitive(screen, self.Pos, self.Pos + SceneMan:ShortestDistance(self.Pos, Vector(bx+self.buildlist[1][1]+2,by+self.buildlist[1][2]+2), SceneMan.SceneWrapsX ), 5);
474-
FrameMan:DrawBoxFillPrimitive(screen, Vector(bx+self.buildlist[1][1]+1,by+self.buildlist[1][2]+1),Vector(bx+self.buildlist[1][1]+3,by+self.buildlist[1][2]+3),254);
473+
PrimitiveMan:DrawLinePrimitive(screen, self.Pos, self.Pos + SceneMan:ShortestDistance(self.Pos, Vector(bx+self.buildlist[1][1]+2,by+self.buildlist[1][2]+2), SceneMan.SceneWrapsX ), 5);
474+
PrimitiveMan:DrawBoxFillPrimitive(screen, Vector(bx+self.buildlist[1][1]+1,by+self.buildlist[1][2]+1),Vector(bx+self.buildlist[1][1]+3,by+self.buildlist[1][2]+3),254);
475475

476476
for x = 1, 3 do
477477
for y = 1, 3 do

‎Base.rte/Devices/Tools/Constructor/Cursor.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function Update(self)
1313
self.ctrl = self:GetController();
1414

1515
local screen = ActivityMan:GetActivity():ScreenOfPlayer(self.ctrl.Player);
16-
FrameMan:DrawLinePrimitive(screen, self.Pos + Vector(0, 4), self.Pos + Vector(0, -4), 120);
17-
FrameMan:DrawLinePrimitive(screen, self.Pos + Vector(4, 0), self.Pos + Vector(-4, 0), 120);
16+
PrimitiveMan:DrawLinePrimitive(screen, self.Pos + Vector(0, 4), self.Pos + Vector(0, -4), 120);
17+
PrimitiveMan:DrawLinePrimitive(screen, self.Pos + Vector(4, 0), self.Pos + Vector(-4, 0), 120);
1818

1919
if self.ctrl:IsMouseControlled() == false then
2020
if self.ctrl:IsState(Controller.HOLD_UP) or self.ctrl:IsState(Controller.BODY_JUMP) then

‎Base.rte/Devices/Tools/GrappleGun/Grapple.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ function Update(self)
433433
end
434434
AudioMan:PlaySound("Base.rte/Devices/Tools/GrappleGun/Sounds/Return.wav", drawPos);
435435
end
436-
FrameMan:DrawLinePrimitive(startPos, drawPos, 249);
436+
PrimitiveMan:DrawLinePrimitive(startPos, drawPos, 249);
437437
elseif self.parentGun and IsHDFirearm(self.parentGun) then
438438
self.parent = self.parentGun;
439439
else

‎Base.rte/Devices/Tools/GrappleGun/GrappleGun.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function Update(self)
6868
end
6969
local startPos = (parent.Pos + parent.EyePos + self.Pos) / 3;
7070
local guidePos = startPos + Vector(parent.AimDistance + (parent.Vel.Magnitude), 0):RadRotate(parent:GetAimAngle(true));
71-
FrameMan:DrawBitmapPrimitive(ActivityMan:GetActivity():ScreenOfPlayer(controller.Player), guidePos, self.arrow, parent:GetAimAngle(true), frame);
71+
PrimitiveMan:DrawBitmapPrimitive(ActivityMan:GetActivity():ScreenOfPlayer(controller.Player), guidePos, self.arrow, parent:GetAimAngle(true), frame);
7272
end
7373
else
7474
self:Deactivate();

‎Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.lua

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,39 +59,39 @@ function Update(self)
5959
end
6060
end
6161
if self.guidePos ~= null then
62-
-- FrameMan:DrawBoxPrimitive(self.guidePos+Vector(-self.guideSize,-self.guideSize),self.guidePos+Vector(self.guideSize,self.guideSize),13);
63-
-- FrameMan:DrawCirclePrimitive(self.guidePos,self.guideSize,13);
62+
-- PrimitiveMan:DrawBoxPrimitive(self.guidePos+Vector(-self.guideSize,-self.guideSize),self.guidePos+Vector(self.guideSize,self.guideSize),13);
63+
-- PrimitiveMan:DrawCirclePrimitive(self.guidePos,self.guideSize,13);
6464
-- if self.guideLine.Magnitude-self.guideSize > 0 then
6565
-- local endPoint = self.guideLine:SetMagnitude(self.guideLine.Magnitude);
66-
-- FrameMan:DrawLinePrimitive(self.MuzzlePos,self.guideLinePoint,13);
66+
-- PrimitiveMan:DrawLinePrimitive(self.MuzzlePos,self.guideLinePoint,13);
6767
-- end
6868
local cornerPos = Vector(self.guidePos.X-self.guideSize,self.guidePos.Y-self.guideSize);
69-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
70-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
69+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
70+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
7171

7272
cornerPos = Vector(self.guidePos.X-self.guideSize,self.guidePos.Y+self.guideSize);
73-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
74-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
73+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
74+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
7575

7676
cornerPos = Vector(self.guidePos.X+self.guideSize,self.guidePos.Y+self.guideSize);
77-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
78-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
77+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
78+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
7979

8080
cornerPos = Vector(self.guidePos.X+self.guideSize,self.guidePos.Y-self.guideSize);
81-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
82-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
81+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
82+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
8383

8484
cornerPos = Vector(self.guidePos.X,self.guidePos.Y-self.guideSize);
85-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
85+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,-5),13);
8686

8787
cornerPos = Vector(self.guidePos.X-self.guideSize,self.guidePos.Y);
88-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
88+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(-5,0),13);
8989

9090
cornerPos = Vector(self.guidePos.X,self.guidePos.Y+self.guideSize);
91-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
91+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(0,5),13);
9292

9393
cornerPos = Vector(self.guidePos.X+self.guideSize,self.guidePos.Y);
94-
FrameMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
94+
PrimitiveMan:DrawLinePrimitive(cornerPos,cornerPos+Vector(5,0),13);
9595
end
9696
else
9797
self.guidePos = null;

‎Techion.rte/Devices/Weapons/Nucleo/NucleoShot.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function Update(self)
4646
else
4747
local raydirection = SceneMan:ShortestDistance(self.Pos,g_nucleocommunicationtable[self.Sharpness][i][2].Pos,SceneMan.SceneWrapsX)
4848
if MovableMan:IsParticle(g_nucleocommunicationtable[self.Sharpness][i][2]) and raydirection.Magnitude < self.linkRange then
49-
FrameMan:DrawLinePrimitive(self.Pos, g_nucleocommunicationtable[self.Sharpness][i][2].Pos, 5);
49+
PrimitiveMan:DrawLinePrimitive(self.Pos, g_nucleocommunicationtable[self.Sharpness][i][2].Pos, 5);
5050
local moid = SceneMan:CastMORay(self.Pos, raydirection, 0, self.Team, 0, true, 1);
5151
if moid ~= 255 then
5252
local hitPos = Vector();

0 commit comments

Comments
 (0)