john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed many incompatible pointer warnings; add tcc specific debugging flags to makefile

Browse Source
This commit is contained in:
John Alanbrook
2022-12-14 19:01:42 +00:00
parent 60bf5ca7bc
commit 0b64d0872b
16 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/engine/editor/ed_project.c
View File

@@ -1,5 +1,8 @@
#include "ed_project.h"
#include <string.h>
#include <stdlib.h>
#include <vec.h>
#include "editor.h"
void editor_init_project(struct gameproject *gp)
@@ -17,8 +20,7 @@ void editor_init_project(struct gameproject *gp)
void editor_make_project(char *path)
{
FILE *f = path_open("w", "%s%s", path, "/project.yugh");
cur_project =
(struct gameproject *) malloc(sizeof(struct gameproject));
cur_project = malloc(sizeof(struct gameproject));
strncpy(cur_project->name, "New Game", 127);
strncpy(cur_project->path, path, 2048);
vec_add(projects, cur_project);
@@ -36,7 +38,7 @@ void editor_import_project(char *path)
if (!f)
return;
struct gameproject *gp = (struct gameproject *) malloc(sizeof(*gp));
struct gameproject *gp = malloc(sizeof(*gp));
fread(gp, sizeof(*gp), 1, f);
fclose(f);

21
source/engine/editor/editor.c
View File

@@ -27,6 +27,7 @@
#include <dirent.h>
#include <stdio.h>
#include <stdlib.h>
#include "nuke.h"
#include "log.h"
@@ -48,9 +49,9 @@ static bool renderAO = true;
static bool renderDynamicShadows = true;
// Debug render modes
static bool renderGizmos = false;
static bool showGrid = true;
static bool debugDrawPhysics = false;
static int renderGizmos = false;
static int showGrid = true;
static int debugDrawPhysics = false;
const char *allowed_extensions[] = {"jpg", "png", "rb", "wav", "mp3", };
@@ -81,8 +82,8 @@ static int grid1_width = 1;
static int grid1_span = 100;
static int grid2_width = 3;
static int grid2_span = 1000;
static bool grid1_draw = true;
static bool grid2_draw = true;
static int grid1_draw = true;
static int grid2_draw = true;
static float tex_scale = 1.f;
static struct TexAnimation tex_gui_anim = {0};
@@ -495,7 +496,7 @@ void editor_project_gui() {
*/
NK_MENU_START(level)
nuke_nel(1);
nuke_labelf(ctx, "Current level: %s", current_level[0] == '\0' ? "No level loaded." : current_level);
nuke_labelf("Current level: %s", current_level[0] == '\0' ? "No level loaded." : current_level);
nuke_nel(3);
if (nk_button_label(ctx, "New")) {
@@ -585,9 +586,9 @@ void editor_project_gui() {
NK_MENU_START(debug)
if (nk_tree_push(ctx, NK_TREE_NODE, "Debug Draws", NK_MINIMIZED)) {
nk_checkbox_label(ctx, "Gizmos", &renderGizmos);
nk_checkbox_label(ctx, "Grid", &showGrid);
nk_checkbox_label(ctx, "Physics", &debugDrawPhysics);
nuke_checkbox("Gizmos", &renderGizmos);
nuke_checkbox("Grid", &showGrid);
nuke_checkbox("Physics", &debugDrawPhysics);
nk_tree_pop(ctx);
}
@@ -596,7 +597,7 @@ void editor_project_gui() {
NK_MENU_START(hierarchy)
nk_layout_row_dynamic(ctx, 25, 1);
if (nk_button_label(ctx, "New Object")) {
if (nuke_btn("New Object")) {
MakeGameobject();
}