mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-15 21:19:55 -04:00
Editor translate works while paused
This commit is contained in:
@@ -687,6 +687,7 @@ void render_object_for_player(s32 cameraId) {
|
||||
CM_DrawObjects(cameraId);
|
||||
CM_DrawParticles(cameraId);
|
||||
CM_RenderCourseObjects(cameraId);
|
||||
CM_DrawEditor();
|
||||
|
||||
// switch (gCurrentCourseId) {
|
||||
// case COURSE_MARIO_RACEWAY:
|
||||
|
||||
@@ -19,8 +19,6 @@ extern "C" {
|
||||
#include "main.h"
|
||||
#include "defines.h"
|
||||
#include "actors.h"
|
||||
#include "math_util.h"
|
||||
#include "math_util_2.h"
|
||||
#include "camera.h"
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include <libultraship.h>
|
||||
#include <libultra/gbi.h>
|
||||
#include "engine/objects/Flagpole.h"
|
||||
#include "ObjectPicker.h"
|
||||
|
||||
class ObjectPicker;
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <libultraship.h>
|
||||
#include <libultra/gbi.h>
|
||||
#include "Collision.h"
|
||||
#include "engine/objects/Flagpole.h"
|
||||
|
||||
class Gizmo {
|
||||
public:
|
||||
|
||||
@@ -20,8 +20,6 @@ extern "C" {
|
||||
#include "main.h"
|
||||
#include "defines.h"
|
||||
#include "actors.h"
|
||||
#include "math_util.h"
|
||||
#include "math_util_2.h"
|
||||
#include "camera.h"
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <libultraship.h>
|
||||
#include <libultra/gbi.h>
|
||||
#include "Collision.h"
|
||||
#include "engine/objects/Flagpole.h"
|
||||
#include "Gizmo.h"
|
||||
|
||||
class ObjectPicker {
|
||||
|
||||
@@ -836,6 +836,7 @@ void race_logic_loop(void) {
|
||||
}
|
||||
}
|
||||
func_8005A070();
|
||||
CM_TickEditor();
|
||||
profiler_log_thread5_time(LEVEL_SCRIPT_EXECUTE);
|
||||
sNumVBlanks = 0;
|
||||
gNumScreens = 0;
|
||||
|
||||
+7
-1
@@ -393,7 +393,6 @@ void CM_TickObjects() {
|
||||
if (gWorldInstance.CurrentCourse) {
|
||||
gWorldInstance.TickObjects();
|
||||
}
|
||||
gEditor.Tick();
|
||||
}
|
||||
|
||||
// A couple objects such as lakitu are ticked inside of process_game_tick which support 60fps.
|
||||
@@ -408,6 +407,13 @@ void CM_DrawObjects(s32 cameraId) {
|
||||
if (gWorldInstance.CurrentCourse) {
|
||||
gWorldInstance.DrawObjects(cameraId);
|
||||
}
|
||||
}
|
||||
|
||||
void CM_TickEditor() {
|
||||
gEditor.Tick();
|
||||
}
|
||||
|
||||
void CM_DrawEditor() {
|
||||
gEditor.Draw();
|
||||
}
|
||||
|
||||
|
||||
@@ -70,6 +70,9 @@ void CM_TickObjects();
|
||||
void CM_TickObjects60fps();
|
||||
void CM_DrawObjects(s32 cameraId);
|
||||
|
||||
void CM_TickEditor();
|
||||
void CM_TickDraw();
|
||||
|
||||
void CM_TickParticles(void);
|
||||
void CM_DrawParticles(s32 cameraId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user