Compare commits

..

No commits in common. "2c94efb79689e8b2d3f55921bdf175c52c90c07d" and "dfd888a80a473ac0167a5cdd7d7ca6bc30056223" have entirely different histories.

4 changed files with 9 additions and 20 deletions

View File

@ -7,11 +7,9 @@ with open(sys.argv[1], 'r') if sys.argv[1] != "-" else sys.stdin as f:
api = json.loads(api_source)
def to_lua_type_annot(typedesc):
if type(typedesc) is dict:
return r'{ %s }' % ','.join('%s: %s' % (f["name"], to_lua_type_annot(f["type"])) for f in typedesc["fields"])
basetype = typedesc.rsplit(' *', 1)[0]
if typedesc == "char *":
def to_lua_type_annot(typename):
basetype = typename.rsplit(' *', 1)[0]
if typename == "char *":
return "string"
elif basetype == "float":
return "number"
@ -29,9 +27,7 @@ def to_lua_type_annot(typedesc):
return r"{ x: number, y: number, w: number, h: number }"
else:
return "unknown"
# raise BaseException("Unhandled type for annotation: %s" % typedesc)
print("error(\"townengine lua api file is not supposed to be imported!\")")
# raise BaseException("Unhandled type for annotation: %s" % typename)
type_annotations, enum_annotations = {}, {}
type_annotations["ctx"] = r"{ %s, udata: table }" % \
@ -49,14 +45,9 @@ for annot in enum_annotations:
procedure_annotations = {}
for procedure, procedure_desc in api["procedures"].items():
procedure_annotations[procedure] = {}
procedure_annotations[procedure]["params"] = r"{ %s }" % \
procedure_annotations[procedure] = r"{ %s }" % \
', '.join("%s: %s" % (p["name"], to_lua_type_annot(p["type"]) + '?' * ("default" in p)) for p in procedure_desc["params"])
if "return" in procedure_desc:
procedure_annotations[procedure]["return"] = to_lua_type_annot(procedure_desc["return"])
for annot in procedure_annotations:
print("---@param args " + procedure_annotations[annot]["params"])
if "return" in procedure_annotations[annot]:
print("---@return " + procedure_annotations[annot]["return"])
print("---@param args " + procedure_annotations[annot])
print("function %s(args) end" % annot)

View File

@ -25,9 +25,7 @@ Matrix4 camera_look_at_matrix;
double depth_range_low, depth_range_high;
void render_clear(void) {
draw_camera((Vec3){0, 0, 0}, (Vec3){0, 0, 1}, (Vec3){0, 1, 0}, 1.57079632679f, 1);
void render_queue_clear(void) {
text_cache_reset_arena(&ctx.text_cache);
/* since i don't intend to free the queues, */

View File

@ -230,7 +230,7 @@ bool render_init(void);
void render(void);
/* clears all render queues */
void render_clear(void);
void render_queue_clear(void);
/* fills two existing arrays with the geometry data of a circle */
/* the size of indices must be at least 3 times the number of vertices */

View File

@ -211,7 +211,7 @@ static void main_loop(void) {
while (ctx.frame_accumulator >= ctx.desired_frametime) {
frames += 1;
/* TODO: disable rendering pushes on not-last ? */
render_clear();
render_queue_clear();
poll_events();
if (ctx.window_size_has_changed)
update_viewport();