(#965) edit_field_render -> edit_field_render_screen

diff --git a/src/game/level/level_editor.c b/src/game/level/level_editor.c
index 50b80b2b645fd9b394cc9ee8588038b1b67948d7..1d4f8166860d11a49f1e86d650ec9de61ae822d8 100644 (file)
--- a/src/game/level/level_editor.c
+++ b/src/game/level/level_editor.c
@@ -335,7 +335,7 @@ int level_editor_render(const LevelEditor *level_editor,
             return -1;
         }
 
-        if (edit_field_render(
+        if (edit_field_render_screen(
                 level_editor->edit_field_filename,
                 camera,
                 vec(position.x + save_as_width, position.y)) < 0) {

diff --git a/src/game/level/level_editor/label_layer.c b/src/game/level/level_editor/label_layer.c
index cf85a223d856a499e819232a9cd8eea190b7431a..bf743ac3a8ec015e29f9eb8837b4bdf330e0e2a2 100644 (file)
--- a/src/game/level/level_editor/label_layer.c
+++ b/src/game/level/level_editor/label_layer.c
@@ -185,7 +185,7 @@ int label_layer_render(const LabelLayer *label_layer,
     for (size_t i = 0; i < n; ++i) {
         if (label_layer->state == LABEL_LAYER_EDIT_TEXT) {
             // TODO(#965): LabelLayer Edit Field should be rendered inside of the world
-            if (edit_field_render(
+            if (edit_field_render_screen(
                     label_layer->edit_field,
                     camera,
                     camera_point(camera, positions[i])) < 0) {

diff --git a/src/game/level/level_editor/point_layer.c b/src/game/level/level_editor/point_layer.c
index ac5b4f0e44b5ca17151989c788842c3ab82aac69..ea8a37a6f97d60bc5726a174372f2ef2f83e6b7e 100644 (file)
--- a/src/game/level/level_editor/point_layer.c
+++ b/src/game/level/level_editor/point_layer.c
@@ -173,7 +173,7 @@ int point_layer_render(const PointLayer *point_layer,
 
     if (point_layer->state == POINT_LAYER_EDIT_ID) {
         /* TODO(#855): PointLayer edit field is not scaled on zoom */
-        if (edit_field_render(
+        if (edit_field_render_screen(
                 point_layer->edit_field,
                 camera,
                 camera_point(camera, points[point_layer->selected])) < 0) {

diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c
index ac80028df5945981c1103c9a2043b833125c4cf1..c0b7bdddc4a477ef91b87f1e345229bb1c059b9d 100644 (file)
--- a/src/game/level/level_editor/rect_layer.c
+++ b/src/game/level/level_editor/rect_layer.c
@@ -454,7 +454,7 @@ int rect_layer_render(const RectLayer *layer, Camera *camera, int active)
 
     // ID renaming Edit Field
     if (layer->state == RECT_LAYER_ID_RENAME) {
-        if (edit_field_render(layer->id_edit_field, camera, vec(400.0f, 400.0f)) < 0) {
+        if (edit_field_render_screen(layer->id_edit_field, camera, vec(400.0f, 400.0f)) < 0) {
             return -1;
         }
     }

diff --git a/src/ui/console.c b/src/ui/console.c
index 78f14934501391fa60bf88cee1658afd498b073c..f9ee27f22e685e20920514bcbd0401757ab9baae 100644 (file)
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -230,14 +230,14 @@ int console_render(const Console *console,
     }
 
     if (console_log_render(console->console_log,
-                   renderer,
-                   vec(0.0f, y)) < 0) {
+                           renderer,
+                           vec(0.0f, y)) < 0) {
         return -1;
     }
 
-    if (edit_field_render(console->edit_field,
-                          camera,
-                          vec(0.0f, y + CONSOLE_LOG_HEIGHT)) < 0) {
+    if (edit_field_render_screen(console->edit_field,
+                                 camera,
+                                 vec(0.0f, y + CONSOLE_LOG_HEIGHT)) < 0) {
         return -1;
     }
 

diff --git a/src/ui/edit_field.c b/src/ui/edit_field.c
index 0bf5ea52aa09a609cc017601d1a06af439d19d5c..cb47ae5f6b90a0364f5cbd69cb1b64c28ce5651f 100644 (file)
--- a/src/ui/edit_field.c
+++ b/src/ui/edit_field.c
@@ -58,9 +58,9 @@ void destroy_edit_field(Edit_field *edit_field)
     RETURN_LT0(edit_field->lt);
 }
 
-int edit_field_render(const Edit_field *edit_field,
-                      Camera *camera,
-                      Point screen_position)
+int edit_field_render_screen(const Edit_field *edit_field,
+                             Camera *camera,
+                             Point screen_position)
 {
     trace_assert(edit_field);
     trace_assert(camera);
@@ -91,6 +91,17 @@ int edit_field_render(const Edit_field *edit_field,
     return 0;
 }
 
+int edit_field_render_world(const Edit_field *edit_field,
+                            Camera *camera,
+                            Point world_position)
+{
+    trace_assert(edit_field);
+    trace_assert(camera);
+    (void) world_position;
+
+    return 0;
+}
+
 const char *edit_field_as_text(const Edit_field *edit_field)
 {
     trace_assert(edit_field);

diff --git a/src/ui/edit_field.h b/src/ui/edit_field.h
index a51a3eda3c26fad6085ece979211eb6724027634..a72f7613679d679179cecad9cb90192cd8a44f8d 100644 (file)
--- a/src/ui/edit_field.h
+++ b/src/ui/edit_field.h
@@ -13,9 +13,13 @@ Edit_field *create_edit_field(Vec font_size,
                               Color font_color);
 void destroy_edit_field(Edit_field *edit_field);
 
-int edit_field_render(const Edit_field *edit_field,
-                      Camera *camera,
-                      Point screen_position);
+int edit_field_render_screen(const Edit_field *edit_field,
+                             Camera *camera,
+                             Point screen_position);
+
+int edit_field_render_world(const Edit_field *edit_field,
+                            Camera *camera,
+                            Point world_position);
 
 int edit_field_event(Edit_field *edit_field, const SDL_Event *event);