):Void
{
- nme_gl_vertex_attrib4fv(indx, values);
+ lime_gl_vertex_attrib4fv(indx, values);
}
public static function vertexAttribPointer(indx:Int, size:Int, type:Int, normalized:Bool, stride:Int, offset:Int):Void
{
- nme_gl_vertex_attrib_pointer(indx, size, type, normalized, stride, offset);
+ lime_gl_vertex_attrib_pointer(indx, size, type, normalized, stride, offset);
}
public static function viewport(x:Int, y:Int, width:Int, height:Int):Void
{
- nme_gl_viewport(x, y, width, height);
+ lime_gl_viewport(x, y, width, height);
}
@@ -1149,7 +1149,7 @@ class GL {
private static function get_drawingBufferHeight() { return 640; }//Lib.current.stage.stageHeight; }
private static function get_drawingBufferWidth() { return 960; } //Lib.current.stage.stageWidth; }
- private static function get_version():Int { return nme_gl_version(); }
+ private static function get_version():Int { return lime_gl_version(); }
@@ -1159,136 +1159,136 @@ class GL {
- private static var nme_gl_active_texture = load("nme_gl_active_texture", 1);
- private static var nme_gl_attach_shader = load("nme_gl_attach_shader", 2);
- private static var nme_gl_bind_attrib_location = load("nme_gl_bind_attrib_location", 3);
- private static var nme_gl_bind_bitmap_data_texture = load("nme_gl_bind_bitmap_data_texture", 1);
- private static var nme_gl_bind_buffer = load("nme_gl_bind_buffer", 2);
- private static var nme_gl_bind_framebuffer = load("nme_gl_bind_framebuffer", 2);
- private static var nme_gl_bind_renderbuffer = load("nme_gl_bind_renderbuffer", 2);
- private static var nme_gl_bind_texture = load("nme_gl_bind_texture", 2);
- private static var nme_gl_blend_color = load("nme_gl_blend_color", 4);
- private static var nme_gl_blend_equation = load("nme_gl_blend_equation", 1);
- private static var nme_gl_blend_equation_separate = load("nme_gl_blend_equation_separate", 2);
- private static var nme_gl_blend_func = load("nme_gl_blend_func", 2);
- private static var nme_gl_blend_func_separate = load("nme_gl_blend_func_separate", 4);
- private static var nme_gl_buffer_data = load("nme_gl_buffer_data", 5);
- private static var nme_gl_buffer_sub_data = load("nme_gl_buffer_sub_data", 5);
- private static var nme_gl_check_framebuffer_status = load("nme_gl_check_framebuffer_status", 1);
- private static var nme_gl_clear = load("nme_gl_clear", 1);
- private static var nme_gl_clear_color = load("nme_gl_clear_color", 4);
- private static var nme_gl_clear_depth = load("nme_gl_clear_depth", 1);
- private static var nme_gl_clear_stencil = load("nme_gl_clear_stencil", 1);
- private static var nme_gl_color_mask = load("nme_gl_color_mask", 4);
- private static var nme_gl_compile_shader = load("nme_gl_compile_shader", 1);
- private static var nme_gl_compressed_tex_image_2d = load("nme_gl_compressed_tex_image_2d", -1);
- private static var nme_gl_compressed_tex_sub_image_2d = load("nme_gl_compressed_tex_sub_image_2d", -1);
- private static var nme_gl_copy_tex_image_2d = load("nme_gl_copy_tex_image_2d", -1);
- private static var nme_gl_copy_tex_sub_image_2d = load("nme_gl_copy_tex_sub_image_2d", -1);
- private static var nme_gl_create_buffer = load("nme_gl_create_buffer", 0);
- private static var nme_gl_create_framebuffer = load("nme_gl_create_framebuffer", 0);
- private static var nme_gl_create_program = load("nme_gl_create_program", 0);
- private static var nme_gl_create_render_buffer = load("nme_gl_create_render_buffer", 0);
- private static var nme_gl_create_shader = load("nme_gl_create_shader", 1);
- private static var nme_gl_create_texture = load("nme_gl_create_texture", 0);
- private static var nme_gl_delete_buffer = load("nme_gl_delete_buffer", 1);
- private static var nme_gl_delete_program = load("nme_gl_delete_program", 1);
- private static var nme_gl_delete_shader = load("nme_gl_delete_shader", 1);
- private static var nme_gl_delete_texture = load("nme_gl_delete_texture", 1);
- private static var nme_gl_depth_func = load("nme_gl_depth_func", 1);
- private static var nme_gl_depth_mask = load("nme_gl_depth_mask", 1);
- private static var nme_gl_depth_range = load("nme_gl_depth_range", 2);
- private static var nme_gl_detach_shader = load("nme_gl_detach_shader", 2);
- private static var nme_gl_disable = load("nme_gl_disable", 1);
- private static var nme_gl_disable_vertex_attrib_array = load("nme_gl_disable_vertex_attrib_array", 1);
- private static var nme_gl_draw_arrays = load("nme_gl_draw_arrays", 3);
- private static var nme_gl_draw_elements = load("nme_gl_draw_elements", 4);
- private static var nme_gl_enable = load("nme_gl_enable", 1);
- private static var nme_gl_enable_vertex_attrib_array = load("nme_gl_enable_vertex_attrib_array", 1);
- private static var nme_gl_finish = load("nme_gl_finish", 0);
- private static var nme_gl_flush = load("nme_gl_flush", 0);
- private static var nme_gl_framebuffer_renderbuffer = load("nme_gl_framebuffer_renderbuffer", 4);
- private static var nme_gl_framebuffer_texture2D = load("nme_gl_framebuffer_texture2D", 5);
- private static var nme_gl_front_face = load("nme_gl_front_face", 1);
- private static var nme_gl_generate_mipmap = load("nme_gl_generate_mipmap", 1);
- private static var nme_gl_get_active_attrib = load("nme_gl_get_active_attrib", 2);
- private static var nme_gl_get_active_uniform = load("nme_gl_get_active_uniform", 2);
- private static var nme_gl_get_attrib_location = load("nme_gl_get_attrib_location", 2);
- private static var nme_gl_get_buffer_paramerter = load("nme_gl_get_buffer_paramerter", 2);
- private static var nme_gl_get_context_attributes = load("nme_gl_get_context_attributes", 0);
- private static var nme_gl_get_error = load("nme_gl_get_error", 0);
- private static var nme_gl_get_framebuffer_attachment_parameter = load("nme_gl_get_framebuffer_attachment_parameter", 3);
- private static var nme_gl_get_parameter = load("nme_gl_get_parameter", 1);
- // private static var nme_gl_get_extension = load("nme_gl_get_extension", 1);
- private static var nme_gl_get_program_info_log = load("nme_gl_get_program_info_log", 1);
- private static var nme_gl_get_program_parameter = load("nme_gl_get_program_parameter", 2);
- private static var nme_gl_get_render_buffer_parameter = load("nme_gl_get_render_buffer_parameter", 2);
- private static var nme_gl_get_shader_info_log = load("nme_gl_get_shader_info_log", 1);
- private static var nme_gl_get_shader_parameter = load("nme_gl_get_shader_parameter", 2);
- private static var nme_gl_get_shader_precision_format = load("nme_gl_get_shader_precision_format", 2);
- private static var nme_gl_get_shader_source = load("nme_gl_get_shader_source", 1);
- private static var nme_gl_get_supported_extensions = load("nme_gl_get_supported_extensions", 1);
- private static var nme_gl_get_tex_parameter = load("nme_gl_get_tex_parameter", 2);
- private static var nme_gl_get_uniform = load("nme_gl_get_uniform", 2);
- private static var nme_gl_get_uniform_location = load("nme_gl_get_uniform_location", 2);
- private static var nme_gl_get_vertex_attrib = load("nme_gl_get_vertex_attrib", 2);
- private static var nme_gl_get_vertex_attrib_offset = load("nme_gl_get_vertex_attrib_offset", 2);
- private static var nme_gl_hint = load("nme_gl_hint", 2);
- private static var nme_gl_is_buffer = load("nme_gl_is_buffer", 1);
- private static var nme_gl_is_enabled = load("nme_gl_is_enabled", 1);
- private static var nme_gl_is_framebuffer = load("nme_gl_is_framebuffer", 1);
- private static var nme_gl_is_program = load("nme_gl_is_program", 1);
- private static var nme_gl_is_renderbuffer = load("nme_gl_is_renderbuffer", 1);
- private static var nme_gl_is_shader = load("nme_gl_is_shader", 1);
- private static var nme_gl_is_texture = load("nme_gl_is_texture", 1);
- private static var nme_gl_line_width = load("nme_gl_line_width", 1);
- private static var nme_gl_link_program = load("nme_gl_link_program", 1);
- private static var nme_gl_pixel_storei = load("nme_gl_pixel_storei", 2);
- private static var nme_gl_polygon_offset = load("nme_gl_polygon_offset", 2);
- private static var nme_gl_renderbuffer_storage = load("nme_gl_renderbuffer_storage", 4);
- private static var nme_gl_sample_coverage = load("nme_gl_sample_coverage", 2);
- private static var nme_gl_scissor = load("nme_gl_scissor", 4);
- private static var nme_gl_shader_source = load("nme_gl_shader_source", 2);
- private static var nme_gl_stencil_func = load("nme_gl_stencil_func", 3);
- private static var nme_gl_stencil_func_separate = load("nme_gl_stencil_func_separate", 4);
- private static var nme_gl_stencil_mask = load("nme_gl_stencil_mask", 1);
- private static var nme_gl_stencil_mask_separate = load("nme_gl_stencil_mask_separate", 2);
- private static var nme_gl_stencil_op = load("nme_gl_stencil_op", 3);
- private static var nme_gl_stencil_op_separate = load("nme_gl_stencil_op_separate", 4);
- private static var nme_gl_tex_image_2d = load("nme_gl_tex_image_2d", -1);
- private static var nme_gl_tex_parameterf = load("nme_gl_tex_parameterf", 3);
- private static var nme_gl_tex_parameteri = load("nme_gl_tex_parameteri", 3);
- private static var nme_gl_tex_sub_image_2d = load("nme_gl_tex_sub_image_2d", -1);
- private static var nme_gl_uniform1f = load("nme_gl_uniform1f", 2);
- private static var nme_gl_uniform1fv = load("nme_gl_uniform1fv", 2);
- private static var nme_gl_uniform1i = load("nme_gl_uniform1i", 2);
- private static var nme_gl_uniform1iv = load("nme_gl_uniform1iv", 2);
- private static var nme_gl_uniform2f = load("nme_gl_uniform2f", 3);
- private static var nme_gl_uniform2fv = load("nme_gl_uniform2fv", 2);
- private static var nme_gl_uniform2i = load("nme_gl_uniform2i", 3);
- private static var nme_gl_uniform2iv = load("nme_gl_uniform2iv", 2);
- private static var nme_gl_uniform3f = load("nme_gl_uniform3f", 4);
- private static var nme_gl_uniform3fv = load("nme_gl_uniform3fv", 2);
- private static var nme_gl_uniform3i = load("nme_gl_uniform3i", 4);
- private static var nme_gl_uniform3iv = load("nme_gl_uniform3iv", 2);
- private static var nme_gl_uniform4f = load("nme_gl_uniform4f", 5);
- private static var nme_gl_uniform4fv = load("nme_gl_uniform4fv", 2);
- private static var nme_gl_uniform4i = load("nme_gl_uniform4i", 5);
- private static var nme_gl_uniform4iv = load("nme_gl_uniform4iv", 2);
- private static var nme_gl_uniform_matrix = load("nme_gl_uniform_matrix", 4);
- private static var nme_gl_use_program = load("nme_gl_use_program", 1);
- private static var nme_gl_validate_program = load("nme_gl_validate_program", 1);
- private static var nme_gl_version = load("nme_gl_version", 0);
- private static var nme_gl_vertex_attrib1f = load("nme_gl_vertex_attrib1f", 2);
- private static var nme_gl_vertex_attrib1fv = load("nme_gl_vertex_attrib1fv", 2);
- private static var nme_gl_vertex_attrib2f = load("nme_gl_vertex_attrib2f", 3);
- private static var nme_gl_vertex_attrib2fv = load("nme_gl_vertex_attrib2fv", 2);
- private static var nme_gl_vertex_attrib3f = load("nme_gl_vertex_attrib3f", 4);
- private static var nme_gl_vertex_attrib3fv = load("nme_gl_vertex_attrib3fv", 2);
- private static var nme_gl_vertex_attrib4f = load("nme_gl_vertex_attrib4f", 5);
- private static var nme_gl_vertex_attrib4fv = load("nme_gl_vertex_attrib4fv", 2);
- private static var nme_gl_vertex_attrib_pointer = load("nme_gl_vertex_attrib_pointer", -1);
- private static var nme_gl_viewport = load("nme_gl_viewport", 4);
+ private static var lime_gl_active_texture = load("lime_gl_active_texture", 1);
+ private static var lime_gl_attach_shader = load("lime_gl_attach_shader", 2);
+ private static var lime_gl_bind_attrib_location = load("lime_gl_bind_attrib_location", 3);
+ private static var lime_gl_bind_bitmap_data_texture = load("lime_gl_bind_bitmap_data_texture", 1);
+ private static var lime_gl_bind_buffer = load("lime_gl_bind_buffer", 2);
+ private static var lime_gl_bind_framebuffer = load("lime_gl_bind_framebuffer", 2);
+ private static var lime_gl_bind_renderbuffer = load("lime_gl_bind_renderbuffer", 2);
+ private static var lime_gl_bind_texture = load("lime_gl_bind_texture", 2);
+ private static var lime_gl_blend_color = load("lime_gl_blend_color", 4);
+ private static var lime_gl_blend_equation = load("lime_gl_blend_equation", 1);
+ private static var lime_gl_blend_equation_separate = load("lime_gl_blend_equation_separate", 2);
+ private static var lime_gl_blend_func = load("lime_gl_blend_func", 2);
+ private static var lime_gl_blend_func_separate = load("lime_gl_blend_func_separate", 4);
+ private static var lime_gl_buffer_data = load("lime_gl_buffer_data", 5);
+ private static var lime_gl_buffer_sub_data = load("lime_gl_buffer_sub_data", 5);
+ private static var lime_gl_check_framebuffer_status = load("lime_gl_check_framebuffer_status", 1);
+ private static var lime_gl_clear = load("lime_gl_clear", 1);
+ private static var lime_gl_clear_color = load("lime_gl_clear_color", 4);
+ private static var lime_gl_clear_depth = load("lime_gl_clear_depth", 1);
+ private static var lime_gl_clear_stencil = load("lime_gl_clear_stencil", 1);
+ private static var lime_gl_color_mask = load("lime_gl_color_mask", 4);
+ private static var lime_gl_compile_shader = load("lime_gl_compile_shader", 1);
+ private static var lime_gl_compressed_tex_image_2d = load("lime_gl_compressed_tex_image_2d", -1);
+ private static var lime_gl_compressed_tex_sub_image_2d = load("lime_gl_compressed_tex_sub_image_2d", -1);
+ private static var lime_gl_copy_tex_image_2d = load("lime_gl_copy_tex_image_2d", -1);
+ private static var lime_gl_copy_tex_sub_image_2d = load("lime_gl_copy_tex_sub_image_2d", -1);
+ private static var lime_gl_create_buffer = load("lime_gl_create_buffer", 0);
+ private static var lime_gl_create_framebuffer = load("lime_gl_create_framebuffer", 0);
+ private static var lime_gl_create_program = load("lime_gl_create_program", 0);
+ private static var lime_gl_create_render_buffer = load("lime_gl_create_render_buffer", 0);
+ private static var lime_gl_create_shader = load("lime_gl_create_shader", 1);
+ private static var lime_gl_create_texture = load("lime_gl_create_texture", 0);
+ private static var lime_gl_delete_buffer = load("lime_gl_delete_buffer", 1);
+ private static var lime_gl_delete_program = load("lime_gl_delete_program", 1);
+ private static var lime_gl_delete_shader = load("lime_gl_delete_shader", 1);
+ private static var lime_gl_delete_texture = load("lime_gl_delete_texture", 1);
+ private static var lime_gl_depth_func = load("lime_gl_depth_func", 1);
+ private static var lime_gl_depth_mask = load("lime_gl_depth_mask", 1);
+ private static var lime_gl_depth_range = load("lime_gl_depth_range", 2);
+ private static var lime_gl_detach_shader = load("lime_gl_detach_shader", 2);
+ private static var lime_gl_disable = load("lime_gl_disable", 1);
+ private static var lime_gl_disable_vertex_attrib_array = load("lime_gl_disable_vertex_attrib_array", 1);
+ private static var lime_gl_draw_arrays = load("lime_gl_draw_arrays", 3);
+ private static var lime_gl_draw_elements = load("lime_gl_draw_elements", 4);
+ private static var lime_gl_enable = load("lime_gl_enable", 1);
+ private static var lime_gl_enable_vertex_attrib_array = load("lime_gl_enable_vertex_attrib_array", 1);
+ private static var lime_gl_finish = load("lime_gl_finish", 0);
+ private static var lime_gl_flush = load("lime_gl_flush", 0);
+ private static var lime_gl_framebuffer_renderbuffer = load("lime_gl_framebuffer_renderbuffer", 4);
+ private static var lime_gl_framebuffer_texture2D = load("lime_gl_framebuffer_texture2D", 5);
+ private static var lime_gl_front_face = load("lime_gl_front_face", 1);
+ private static var lime_gl_generate_mipmap = load("lime_gl_generate_mipmap", 1);
+ private static var lime_gl_get_active_attrib = load("lime_gl_get_active_attrib", 2);
+ private static var lime_gl_get_active_uniform = load("lime_gl_get_active_uniform", 2);
+ private static var lime_gl_get_attrib_location = load("lime_gl_get_attrib_location", 2);
+ private static var lime_gl_get_buffer_paramerter = load("lime_gl_get_buffer_paramerter", 2);
+ private static var lime_gl_get_context_attributes = load("lime_gl_get_context_attributes", 0);
+ private static var lime_gl_get_error = load("lime_gl_get_error", 0);
+ private static var lime_gl_get_framebuffer_attachment_parameter = load("lime_gl_get_framebuffer_attachment_parameter", 3);
+ private static var lime_gl_get_parameter = load("lime_gl_get_parameter", 1);
+ // private static var lime_gl_get_extension = load("lime_gl_get_extension", 1);
+ private static var lime_gl_get_program_info_log = load("lime_gl_get_program_info_log", 1);
+ private static var lime_gl_get_program_parameter = load("lime_gl_get_program_parameter", 2);
+ private static var lime_gl_get_render_buffer_parameter = load("lime_gl_get_render_buffer_parameter", 2);
+ private static var lime_gl_get_shader_info_log = load("lime_gl_get_shader_info_log", 1);
+ private static var lime_gl_get_shader_parameter = load("lime_gl_get_shader_parameter", 2);
+ private static var lime_gl_get_shader_precision_format = load("lime_gl_get_shader_precision_format", 2);
+ private static var lime_gl_get_shader_source = load("lime_gl_get_shader_source", 1);
+ private static var lime_gl_get_supported_extensions = load("lime_gl_get_supported_extensions", 1);
+ private static var lime_gl_get_tex_parameter = load("lime_gl_get_tex_parameter", 2);
+ private static var lime_gl_get_uniform = load("lime_gl_get_uniform", 2);
+ private static var lime_gl_get_uniform_location = load("lime_gl_get_uniform_location", 2);
+ private static var lime_gl_get_vertex_attrib = load("lime_gl_get_vertex_attrib", 2);
+ private static var lime_gl_get_vertex_attrib_offset = load("lime_gl_get_vertex_attrib_offset", 2);
+ private static var lime_gl_hint = load("lime_gl_hint", 2);
+ private static var lime_gl_is_buffer = load("lime_gl_is_buffer", 1);
+ private static var lime_gl_is_enabled = load("lime_gl_is_enabled", 1);
+ private static var lime_gl_is_framebuffer = load("lime_gl_is_framebuffer", 1);
+ private static var lime_gl_is_program = load("lime_gl_is_program", 1);
+ private static var lime_gl_is_renderbuffer = load("lime_gl_is_renderbuffer", 1);
+ private static var lime_gl_is_shader = load("lime_gl_is_shader", 1);
+ private static var lime_gl_is_texture = load("lime_gl_is_texture", 1);
+ private static var lime_gl_line_width = load("lime_gl_line_width", 1);
+ private static var lime_gl_link_program = load("lime_gl_link_program", 1);
+ private static var lime_gl_pixel_storei = load("lime_gl_pixel_storei", 2);
+ private static var lime_gl_polygon_offset = load("lime_gl_polygon_offset", 2);
+ private static var lime_gl_renderbuffer_storage = load("lime_gl_renderbuffer_storage", 4);
+ private static var lime_gl_sample_coverage = load("lime_gl_sample_coverage", 2);
+ private static var lime_gl_scissor = load("lime_gl_scissor", 4);
+ private static var lime_gl_shader_source = load("lime_gl_shader_source", 2);
+ private static var lime_gl_stencil_func = load("lime_gl_stencil_func", 3);
+ private static var lime_gl_stencil_func_separate = load("lime_gl_stencil_func_separate", 4);
+ private static var lime_gl_stencil_mask = load("lime_gl_stencil_mask", 1);
+ private static var lime_gl_stencil_mask_separate = load("lime_gl_stencil_mask_separate", 2);
+ private static var lime_gl_stencil_op = load("lime_gl_stencil_op", 3);
+ private static var lime_gl_stencil_op_separate = load("lime_gl_stencil_op_separate", 4);
+ private static var lime_gl_tex_image_2d = load("lime_gl_tex_image_2d", -1);
+ private static var lime_gl_tex_parameterf = load("lime_gl_tex_parameterf", 3);
+ private static var lime_gl_tex_parameteri = load("lime_gl_tex_parameteri", 3);
+ private static var lime_gl_tex_sub_image_2d = load("lime_gl_tex_sub_image_2d", -1);
+ private static var lime_gl_uniform1f = load("lime_gl_uniform1f", 2);
+ private static var lime_gl_uniform1fv = load("lime_gl_uniform1fv", 2);
+ private static var lime_gl_uniform1i = load("lime_gl_uniform1i", 2);
+ private static var lime_gl_uniform1iv = load("lime_gl_uniform1iv", 2);
+ private static var lime_gl_uniform2f = load("lime_gl_uniform2f", 3);
+ private static var lime_gl_uniform2fv = load("lime_gl_uniform2fv", 2);
+ private static var lime_gl_uniform2i = load("lime_gl_uniform2i", 3);
+ private static var lime_gl_uniform2iv = load("lime_gl_uniform2iv", 2);
+ private static var lime_gl_uniform3f = load("lime_gl_uniform3f", 4);
+ private static var lime_gl_uniform3fv = load("lime_gl_uniform3fv", 2);
+ private static var lime_gl_uniform3i = load("lime_gl_uniform3i", 4);
+ private static var lime_gl_uniform3iv = load("lime_gl_uniform3iv", 2);
+ private static var lime_gl_uniform4f = load("lime_gl_uniform4f", 5);
+ private static var lime_gl_uniform4fv = load("lime_gl_uniform4fv", 2);
+ private static var lime_gl_uniform4i = load("lime_gl_uniform4i", 5);
+ private static var lime_gl_uniform4iv = load("lime_gl_uniform4iv", 2);
+ private static var lime_gl_uniform_matrix = load("lime_gl_uniform_matrix", 4);
+ private static var lime_gl_use_program = load("lime_gl_use_program", 1);
+ private static var lime_gl_validate_program = load("lime_gl_validate_program", 1);
+ private static var lime_gl_version = load("lime_gl_version", 0);
+ private static var lime_gl_vertex_attrib1f = load("lime_gl_vertex_attrib1f", 2);
+ private static var lime_gl_vertex_attrib1fv = load("lime_gl_vertex_attrib1fv", 2);
+ private static var lime_gl_vertex_attrib2f = load("lime_gl_vertex_attrib2f", 3);
+ private static var lime_gl_vertex_attrib2fv = load("lime_gl_vertex_attrib2fv", 2);
+ private static var lime_gl_vertex_attrib3f = load("lime_gl_vertex_attrib3f", 4);
+ private static var lime_gl_vertex_attrib3fv = load("lime_gl_vertex_attrib3fv", 2);
+ private static var lime_gl_vertex_attrib4f = load("lime_gl_vertex_attrib4f", 5);
+ private static var lime_gl_vertex_attrib4fv = load("lime_gl_vertex_attrib4fv", 2);
+ private static var lime_gl_vertex_attrib_pointer = load("lime_gl_vertex_attrib_pointer", -1);
+ private static var lime_gl_viewport = load("lime_gl_viewport", 4);
}
diff --git a/lime/utils/Assets.hx b/lime/utils/Assets.hx
index db0e02ad4..efab4b0a8 100644
--- a/lime/utils/Assets.hx
+++ b/lime/utils/Assets.hx
@@ -23,7 +23,7 @@ import lime.utils.ByteArray;
* embedded images, fonts, sounds and other resource files.
*
* The contents are populated automatically when an application
- * is compiled using the NME command-line tools, based on the
+ * is compiled using the lime command-line tools, based on the
* contents of the *.nmml project file.
*
* For most platforms, the assets are included in the same directory
diff --git a/lime/utils/JNI.hx b/lime/utils/JNI.hx
index 32584c981..13a5c0e88 100644
--- a/lime/utils/JNI.hx
+++ b/lime/utils/JNI.hx
@@ -19,7 +19,7 @@ class JNI {
if (!initialized) {
initialized = true;
- var method = Lib.load ("nme", "nme_jni_init_callback", 1);
+ var method = Lib.load ("lime", "lime_jni_init_callback", 1);
method (onCallback);
}
@@ -47,7 +47,7 @@ class JNI {
init ();
- var method = new JNIMethod (nme_jni_create_method (className, memberName, signature, false));
+ var method = new JNIMethod (lime_jni_create_method (className, memberName, signature, false));
return method.getMemberMethod (useArray);
}
@@ -57,7 +57,7 @@ class JNI {
init ();
- var method = new JNIMethod (nme_jni_create_method (className, memberName, signature, true));
+ var method = new JNIMethod (lime_jni_create_method (className, memberName, signature, true));
return method.getStaticMethod (useArray);
}
@@ -70,7 +70,7 @@ class JNI {
- private static var nme_jni_create_method = Lib.load ("nme", "nme_jni_create_method", 4);
+ private static var lime_jni_create_method = Lib.load ("lime", "lime_jni_create_method", 4);
}
@@ -91,14 +91,14 @@ class JNIMethod {
public function callMember (args:Array):Dynamic {
var jobject = args.shift ();
- return nme_jni_call_member (method, jobject, args);
+ return lime_jni_call_member (method, jobject, args);
}
public function callStatic (args:Array):Dynamic {
- return nme_jni_call_static (method, args);
+ return lime_jni_call_static (method, args);
}
@@ -140,8 +140,8 @@ class JNIMethod {
- private static var nme_jni_call_member = Libs.load ("nme", "nme_jni_call_member", 3);
- private static var nme_jni_call_static = Libs.load ("nme", "nme_jni_call_static", 2);
+ private static var lime_jni_call_member = Libs.load ("lime", "lime_jni_call_member", 3);
+ private static var lime_jni_call_static = Libs.load ("lime", "lime_jni_call_static", 2);
}
diff --git a/lime/utils/Libs.hx b/lime/utils/Libs.hx
index 879e1daff..a5ef0e723 100644
--- a/lime/utils/Libs.hx
+++ b/lime/utils/Libs.hx
@@ -48,11 +48,11 @@ class Libs {
#if neko
private static function loadNekoAPI ():Void {
- var init = load ("nme", "neko_init", 5);
+ var init = load ("lime", "neko_init", 5);
if (init != null) {
- loaderTrace ("Found nekoapi @ " + __moduleNames.get ("nme"));
+ loaderTrace ("Found nekoapi @ " + __moduleNames.get ("lime"));
init (function(s) return new String (s), function (len:Int) { var r = []; if (len > 0) r[len - 1] = null; return r; }, null, true, false);
} else {
@@ -215,7 +215,7 @@ class Libs {
loaderTrace ("Result : " + result);
#if neko
- if (library == "nme") {
+ if (library == "lime") {
loadNekoAPI ();
}
#end
diff --git a/lime/utils/WeakRef.hx b/lime/utils/WeakRef.hx
index 131224286..661357e37 100644
--- a/lime/utils/WeakRef.hx
+++ b/lime/utils/WeakRef.hx
@@ -15,7 +15,7 @@ class WeakRef {
if (makeWeak) {
- weakRef = nme_weak_ref_create (this, object);
+ weakRef = lime_weak_ref_create (this, object);
hardRef = null;
} else {
@@ -42,7 +42,7 @@ class WeakRef {
}
- var result = nme_weak_ref_get (weakRef);
+ var result = lime_weak_ref_get (weakRef);
if (result == null) {
weakRef = -1;
@@ -71,8 +71,8 @@ class WeakRef {
// Native Methods
- private static var nme_weak_ref_create:Dynamic = Libs.load ("nme", "nme_weak_ref_create", 2);
- private static var nme_weak_ref_get:Dynamic = Libs.load ("nme", "nme_weak_ref_get", 1);
+ private static var lime_weak_ref_create:Dynamic = Libs.load ("lime", "lime_weak_ref_create", 2);
+ private static var lime_weak_ref_get:Dynamic = Libs.load ("lime", "lime_weak_ref_get", 1);
}
\ No newline at end of file
diff --git a/lime/utils/html5/ByteArray.hx b/lime/utils/html5/ByteArray.hx
index 4079b6933..1f1dc11ce 100644
--- a/lime/utils/html5/ByteArray.hx
+++ b/lime/utils/html5/ByteArray.hx
@@ -35,7 +35,7 @@ class ByteArray implements ArrayAccess {
public function new():Void {
- _nmeResizeBuffer(allocated);
+ _limeResizeBuffer(allocated);
//this.byteView = untyped __new__("Uint8Array", allocated);
//this.data = untyped __new__("DataView", this.byteView.buffer);
@@ -80,7 +80,7 @@ class ByteArray implements ArrayAccess {
}
- private function _nmeResizeBuffer(len:Int):Void {
+ private function _limeResizeBuffer(len:Int):Void {
var oldByteView:Uint8Array = this.byteView;
var newByteView:Uint8Array = untyped __new__("Uint8Array", len);
@@ -113,7 +113,7 @@ class ByteArray implements ArrayAccess {
static public function fromBytes(inBytes:Bytes)
{
var result = new ByteArray();
- result.nmeFromBytes(inBytes);
+ result.limeFromBytes(inBytes);
return result;
}
@@ -121,7 +121,7 @@ class ByteArray implements ArrayAccess {
return data.buffer;
}
- private inline function nmeFromBytes(inBytes:Bytes):Void
+ private inline function limeFromBytes(inBytes:Bytes):Void
{
byteView = untyped __new__("Uint8Array", inBytes.getData());
length = byteView.length;
@@ -129,7 +129,7 @@ class ByteArray implements ArrayAccess {
}
- public inline function nmeGet(pos:Int):Int {
+ public inline function limeGet(pos:Int):Int {
var data:Dynamic = data;
return data.getUint8(pos);
@@ -137,14 +137,14 @@ class ByteArray implements ArrayAccess {
}
- public inline function nmeGetBuffer() {
+ public inline function limeGetBuffer() {
return data.buffer;
}
- public static function nmeOfBuffer(buffer:ArrayBuffer):ByteArray {
+ public static function limeOfBuffer(buffer:ArrayBuffer):ByteArray {
var bytes = new ByteArray();
bytes.length = bytes.allocated ;//= buffer.byteLength; todo
@@ -155,7 +155,7 @@ class ByteArray implements ArrayAccess {
}
- public inline function nmeSet(pos:Int, v:Int):Void {
+ public inline function limeSet(pos:Int, v:Int):Void {
var data:Dynamic = data;
data.setUint8(pos, v);
@@ -502,9 +502,9 @@ class ByteArray implements ArrayAccess {
private inline function set_length(value:Int):Int {
if (allocated < value)
- _nmeResizeBuffer(allocated = Std.int(Math.max(value, allocated * 2)));
+ _limeResizeBuffer(allocated = Std.int(Math.max(value, allocated * 2)));
else if (allocated > value)
- _nmeResizeBuffer(allocated = value);
+ _limeResizeBuffer(allocated = value);
length = value;
return value;
}
diff --git a/lime/utils/html5/URLLoader.hx b/lime/utils/html5/URLLoader.hx
index bf3b14f6a..804aec8e5 100644
--- a/lime/utils/html5/URLLoader.hx
+++ b/lime/utils/html5/URLLoader.hx
@@ -154,7 +154,7 @@ class URLLoader { //extends EventDispatcher {
switch (dataFormat) {
- case BINARY: uri = data.nmeGetBuffer();
+ case BINARY: uri = data.limeGetBuffer();
default: uri = data.readUTFBytes(data.length);
}
@@ -253,7 +253,7 @@ class URLLoader { //extends EventDispatcher {
switch (dataFormat) {
- case BINARY: this.data = ByteArray.nmeOfBuffer(content);
+ case BINARY: this.data = ByteArray.limeOfBuffer(content);
default: this.data = Std.string(content);
}
diff --git a/lime/utils/native/ByteArray.hx b/lime/utils/native/ByteArray.hx
index 33230779a..ac780db05 100644
--- a/lime/utils/native/ByteArray.hx
+++ b/lime/utils/native/ByteArray.hx
@@ -6,7 +6,7 @@ import lime.utils.Libs;
import haxe.io.Bytes;
import haxe.io.BytesData;
-// import nme.errors.EOFError; // Ensure that the neko->haxe callbacks are initialized
+// import lime.errors.EOFError; // Ensure that the neko->haxe callbacks are initialized
import lime.utils.CompressionAlgorithm;
import lime.utils.IDataInput;
@@ -71,7 +71,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
#end
}
- #if !no_nme_io
+ #if !no_lime_io
/** @private */ static function __init__() {
var factory = function(inLen:Int) { return new ByteArray(inLen); };
var resize = function(inArray:ByteArray, inLen:Int)
@@ -86,7 +86,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
var slen = function(inArray:ByteArray) { return inArray == null ? 0 : inArray.length; }
#if !lime_html5
- var init = Libs.load("nme", "nme_byte_array_init", 4);
+ var init = Libs.load("lime", "lime_byte_array_init", 4);
init(factory, slen, resize, bytes);
#end //lime_html5
}
@@ -135,7 +135,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
if (algorithm == CompressionAlgorithm.LZMA)
{
- result = Bytes.ofData(nme_lzma_encode( cast src.getData()) );
+ result = Bytes.ofData(lime_lzma_encode( cast src.getData()) );
} else
{
@@ -191,7 +191,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
static public function fromBytes(inBytes:Bytes)
{
var result = new ByteArray( -1);
- result.nmeFromBytes(inBytes);
+ result.limeFromBytes(inBytes);
return result;
}
@@ -211,7 +211,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
#end //!lime_html5
- private inline function nmeFromBytes(inBytes:Bytes):Void
+ private inline function limeFromBytes(inBytes:Bytes):Void
{
b = inBytes.b;
length = inBytes.length;
@@ -277,10 +277,10 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
return 0.0;
}
- #if !no_nme_io
+ #if !no_lime_io
static public function readFile(inString:String):ByteArray
{
- return nme_byte_array_read_file(inString);
+ return lime_byte_array_read_file(inString);
}
#end
@@ -446,7 +446,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
if (algorithm == CompressionAlgorithm.LZMA)
{
- result = Bytes.ofData(nme_lzma_decode(src.getData()));
+ result = Bytes.ofData(lime_lzma_decode(src.getData()));
} else
{
@@ -522,10 +522,10 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
#end //!lime_html5
}
- #if !no_nme_io
+ #if !no_lime_io
public function writeFile(inString:String):Void
{
- nme_byte_array_overwrite_file(inString, this);
+ lime_byte_array_overwrite_file(inString, this);
}
#end
@@ -621,12 +621,12 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess #if
/** @private */ private static var _double_of_bytes = Libs.load("std", "double_of_bytes", 2);
/** @private */ private static var _float_bytes = Libs.load("std", "float_bytes", 2);
/** @private */ private static var _float_of_bytes = Libs.load("std", "float_of_bytes", 2);
- #if !no_nme_io
- private static var nme_byte_array_overwrite_file = Libs.load("nme","nme_byte_array_overwrite_file", 2);
- private static var nme_byte_array_read_file = Libs.load("nme", "nme_byte_array_read_file", 1);
+ #if !no_lime_io
+ private static var lime_byte_array_overwrite_file = Libs.load("lime","lime_byte_array_overwrite_file", 2);
+ private static var lime_byte_array_read_file = Libs.load("lime", "lime_byte_array_read_file", 1);
#end
- private static var nme_lzma_encode = Libs.load("nme", "nme_lzma_encode", 1);
- private static var nme_lzma_decode = Libs.load("nme", "nme_lzma_decode", 1);
+ private static var lime_lzma_encode = Libs.load("lime", "lime_lzma_encode", 1);
+ private static var lime_lzma_decode = Libs.load("lime", "lime_lzma_decode", 1);
}
#else
diff --git a/project/Build.xml b/project/Build.xml
index 0d8a5e5dc..362412543 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -17,14 +17,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -49,21 +49,21 @@
-
-
+
+
-
+
-
+
-
+
@@ -145,7 +145,7 @@
-
+
@@ -271,12 +271,12 @@
-
+
-
-
+
+
@@ -344,12 +344,12 @@
-
+
-
-
+
+
@@ -358,8 +358,8 @@
-
-
+
+
@@ -427,7 +427,7 @@
-
+
@@ -440,7 +440,7 @@
-
+
@@ -462,7 +462,7 @@
-
+
@@ -494,7 +494,7 @@
-
+
diff --git a/project/include/Audio.h b/project/include/Audio.h
index eee255bb0..918e95fe1 100644
--- a/project/include/Audio.h
+++ b/project/include/Audio.h
@@ -23,7 +23,7 @@
//#define LOG_SOUND(args...) { }
-namespace nme
+namespace lime
{
class AudioSample
{
diff --git a/project/include/ByteArray.h b/project/include/ByteArray.h
index e65cdc72d..16ba2f550 100644
--- a/project/include/ByteArray.h
+++ b/project/include/ByteArray.h
@@ -1,11 +1,11 @@
-#ifndef NME_BYTE_ARRAY_H
-#define NME_BYTE_ARRAY_H
+#ifndef LIME_BYTE_ARRAY_H
+#define LIME_BYTE_ARRAY_H
#include "Object.h"
#include "QuickVec.h"
#include "Utils.h"
-namespace nme
+namespace lime
{
diff --git a/project/include/CachedExtent.h b/project/include/CachedExtent.h
index 55ef75dc3..bf876751b 100644
--- a/project/include/CachedExtent.h
+++ b/project/include/CachedExtent.h
@@ -1,10 +1,10 @@
-#ifndef NME_CACHED_EXTENT_H
-#define NME_CACHED_EXTENT_H
+#ifndef LIME_CACHED_EXTENT_H
+#define LIME_CACHED_EXTENT_H
#include
#include
-namespace nme
+namespace lime
{
extern int gCachedExtentID;
@@ -40,6 +40,6 @@ private:
CachedExtent mExtentCache[3];
};
-} // end namespace NME
+} // end namespace lime
#endif
diff --git a/project/include/Display.h b/project/include/Display.h
index 7f319d826..aefcaf270 100644
--- a/project/include/Display.h
+++ b/project/include/Display.h
@@ -1,5 +1,5 @@
-#ifndef NME_DISPLAY_H
-#define NME_DISPLAY_H
+#ifndef LIME_DISPLAY_H
+#define LIME_DISPLAY_H
#include
#include
@@ -9,7 +9,7 @@
#include
#include
-namespace nme
+namespace lime
{
enum
@@ -570,6 +570,6 @@ void CreateMainFrame( FrameCreationCallback inOnFrame, int inWidth,int inHeight,
unsigned int inFlags, const char *inTitle, Surface *inIcon );
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/ExternalInterface.h b/project/include/ExternalInterface.h
index 9310a9fc4..ff33e59b2 100644
--- a/project/include/ExternalInterface.h
+++ b/project/include/ExternalInterface.h
@@ -6,7 +6,7 @@
#include
-namespace nme
+namespace lime
{
extern vkind gObjectKind;
diff --git a/project/include/Filters.h b/project/include/Filters.h
index f60d5f21c..916143866 100644
--- a/project/include/Filters.h
+++ b/project/include/Filters.h
@@ -4,7 +4,7 @@
#include "QuickVec.h"
#include "Geom.h"
-namespace nme
+namespace lime
{
class Surface;
@@ -95,6 +95,6 @@ Surface *FilterBitmap(const FilterList &inList, Surface *inBitmap,
Rect GetFilteredObjectRect(const FilterList &inList,const Rect &inRect);
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Font.h b/project/include/Font.h
index 20b0487e2..3c43b1ea1 100644
--- a/project/include/Font.h
+++ b/project/include/Font.h
@@ -1,5 +1,5 @@
-#ifndef NME_FONT_H
-#define NME_FONT_H
+#ifndef LIME_FONT_H
+#define LIME_FONT_H
#include
#include
@@ -10,7 +10,7 @@
#include
#include
-namespace nme
+namespace lime
{
struct TextLineMetrics
@@ -205,6 +205,6 @@ class FontCache
{
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Geom.h b/project/include/Geom.h
index cc1086529..728b19ee9 100644
--- a/project/include/Geom.h
+++ b/project/include/Geom.h
@@ -1,5 +1,5 @@
-#ifndef NME_GEOM_H
-#define NME_GEOM_H
+#ifndef LIME_GEOM_H
+#define LIME_GEOM_H
#include
#include
@@ -8,7 +8,7 @@
#define M_PI 3.14159265358979323846
#endif
-namespace nme
+namespace lime
{
enum GlyphRotation { gr0, gr90, gr180, gr270 };
@@ -446,6 +446,6 @@ struct Tri
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Graphics.h b/project/include/Graphics.h
index acfd26fae..38aea3bae 100644
--- a/project/include/Graphics.h
+++ b/project/include/Graphics.h
@@ -1,5 +1,5 @@
-#ifndef NME_GRAPHICS_H
-#define NME_GRAPHICS_H
+#ifndef LIME_GRAPHICS_H
+#define LIME_GRAPHICS_H
#include
#include
@@ -10,7 +10,7 @@
typedef unsigned int uint32;
typedef unsigned char uint8;
-namespace nme
+namespace lime
{
enum GraphicsAPIType { gatBase, gatInternal, gatQuartz, gatCairo, gatOpenGL, gatOpenGLES };
@@ -580,7 +580,7 @@ public:
virtual bool Hits(const RenderState &inState) { return false; }
- #ifdef NME_DIRECTFB
+ #ifdef LIME_DIRECTFB
static Renderer *CreateHardware(const class GraphicsJob &inJob,const GraphicsPath &inPath,HardwareContext &inHardware);
#endif
@@ -601,7 +601,7 @@ struct GraphicsJob
GraphicsStroke *mStroke;
IGraphicsFill *mFill;
GraphicsTrianglePath *mTriangles;
- #ifdef NME_DIRECTFB
+ #ifdef LIME_DIRECTFB
class Renderer *mHardwareRenderer;
#endif
class Renderer *mSoftwareRenderer;
@@ -718,6 +718,6 @@ private:
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Input.h b/project/include/Input.h
index ceb677214..aee96d1ea 100644
--- a/project/include/Input.h
+++ b/project/include/Input.h
@@ -1,7 +1,7 @@
#ifndef INPUT_H
#define INPUT_H
-namespace nme
+namespace lime
{
bool GetAcceleration(double &outX, double &outY, double &outZ);
diff --git a/project/include/KeyCodes.h b/project/include/KeyCodes.h
index a38e68acc..72402fc65 100644
--- a/project/include/KeyCodes.h
+++ b/project/include/KeyCodes.h
@@ -1,7 +1,7 @@
#ifndef KEY_CODES_H
#define KEY_CODES_H
-namespace nme
+namespace lime
{
enum KeyCode
diff --git a/project/include/NMEThread.h b/project/include/LimeThread.h
similarity index 84%
rename from project/include/NMEThread.h
rename to project/include/LimeThread.h
index 61f6f5849..63283e872 100644
--- a/project/include/NMEThread.h
+++ b/project/include/LimeThread.h
@@ -1,5 +1,5 @@
-#ifndef NME_THREAD_H
-#define NME_THREAD_H
+#ifndef LIME_THREAD_H
+#define LIME_THREAD_H
#ifndef HX_WINDOWS
#ifndef EPPC
@@ -11,7 +11,7 @@
#undef max
#endif
-namespace nme
+namespace lime
{
#ifndef HX_WINDOWS
#ifdef EPPC
diff --git a/project/include/Lzma.h b/project/include/Lzma.h
index 886205d1f..b61368951 100644
--- a/project/include/Lzma.h
+++ b/project/include/Lzma.h
@@ -1,9 +1,9 @@
-#ifndef NME_LZMA_H
-#define NME_LZMA_H
+#ifndef LIME_LZMA_H
+#define LIME_LZMA_H
#include
-namespace nme {
+namespace lime {
class Lzma {
public:
diff --git a/project/include/Matrix.h b/project/include/Matrix.h
index 8a90af3f3..08aab46a4 100644
--- a/project/include/Matrix.h
+++ b/project/include/Matrix.h
@@ -1,10 +1,10 @@
-#ifndef NME_MATRIX_H
-#define NME_MATRIX_H
+#ifndef LIME_MATRIX_H
+#define LIME_MATRIX_H
#include
#include
-namespace nme {
+namespace lime {
class Matrix
{
@@ -86,6 +86,6 @@ public:
typedef Matrix Matrix3D;
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Object.h b/project/include/Object.h
index f5f67387a..55f4acf07 100644
--- a/project/include/Object.h
+++ b/project/include/Object.h
@@ -1,7 +1,7 @@
-#ifndef NME_OBJECT_H
-#define NME_OBJECT_H
+#ifndef LIME_OBJECT_H
+#define LIME_OBJECT_H
-namespace nme
+namespace lime
{
class Object
@@ -18,7 +18,7 @@ protected:
int mRefCount;
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Pixel.h b/project/include/Pixel.h
index 9d584f07f..cc8ccddce 100644
--- a/project/include/Pixel.h
+++ b/project/include/Pixel.h
@@ -1,12 +1,12 @@
-#ifndef NME_PIXEL_H
-#define NME_PIXEL_H
+#ifndef LIME_PIXEL_H
+#define LIME_PIXEL_H
// The order or RGB or BGR is determined to the primary surface's
// native order - this allows most transfers to be donw without swapping R & B
// When rendering from a source to a dest, the source is swapped to match in
// the blending code.
-namespace nme
+namespace lime
{
extern bool gC0IsRed;
@@ -289,6 +289,6 @@ inline void QBlendAlpha(Uint8 &ioDest, Uint8 inSrc)
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/QuickVec.h b/project/include/QuickVec.h
index b2f6ee69d..5925233ff 100644
--- a/project/include/QuickVec.h
+++ b/project/include/QuickVec.h
@@ -1,5 +1,5 @@
-#ifndef NME_QUICK_VEC
-#define NME_QUICK_VEC
+#ifndef LIME_QUICK_VEC
+#define LIME_QUICK_VEC
#include
#ifdef EPPC
@@ -9,7 +9,7 @@
#endif
#include
-namespace nme
+namespace lime
{
template
@@ -448,6 +448,6 @@ public:
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Scale9.h b/project/include/Scale9.h
index b57153b36..67fe3bd8a 100644
--- a/project/include/Scale9.h
+++ b/project/include/Scale9.h
@@ -1,10 +1,10 @@
-#ifndef NME_SCALE9_H
-#define NME_SCALE9_H
+#ifndef LIME_SCALE9_H
+#define LIME_SCALE9_H
#include
#include
-namespace nme
+namespace lime
{
class Scale9
@@ -99,7 +99,7 @@ public:
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Sound.h b/project/include/Sound.h
index 18474a9ed..c1264c526 100644
--- a/project/include/Sound.h
+++ b/project/include/Sound.h
@@ -6,7 +6,7 @@
#include "Object.h"
#include "ByteArray.h"
-namespace nme
+namespace lime
{
struct SoundTransform
@@ -57,7 +57,7 @@ public:
virtual SoundChannel *openChannel(double startTime, int loops, const SoundTransform &inTransform) = 0;
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/TextField.h b/project/include/TextField.h
index 168658b41..63149998e 100644
--- a/project/include/TextField.h
+++ b/project/include/TextField.h
@@ -1,5 +1,5 @@
-#ifndef NME_TEXT_FIELD_H
-#define NME_TEXT_FIELD_H
+#ifndef LIME_TEXT_FIELD_H
+#define LIME_TEXT_FIELD_H
#include "Utils.h"
#include "Graphics.h"
@@ -9,7 +9,7 @@
class TiXmlNode;
-namespace nme
+namespace lime
{
@@ -217,7 +217,7 @@ private:
int mSelectKeyDown;
};
-} // end namespace nme
+} // end namespace lime
#endif
diff --git a/project/include/Tilesheet.h b/project/include/Tilesheet.h
index 1271cf8a0..18893a90b 100644
--- a/project/include/Tilesheet.h
+++ b/project/include/Tilesheet.h
@@ -1,10 +1,10 @@
-#ifndef NME_TILESHEET_H
-#define NME_TILESHEET_H
+#ifndef LIME_TILESHEET_H
+#define LIME_TILESHEET_H
#include
#include
-namespace nme
+namespace lime
{
struct Tile
diff --git a/project/include/URL.h b/project/include/URL.h
index a7906739b..d253e6ffa 100644
--- a/project/include/URL.h
+++ b/project/include/URL.h
@@ -1,5 +1,5 @@
-#ifndef NME_URL_H
-#define NME_URL_H
+#ifndef LIME_URL_H
+#define LIME_URL_H
#include "Object.h"
#include "ByteArray.h"
@@ -8,7 +8,7 @@
#include
-namespace nme
+namespace lime
{
enum URLState
diff --git a/project/include/Utils.h b/project/include/Utils.h
index f3faa382a..992d07168 100644
--- a/project/include/Utils.h
+++ b/project/include/Utils.h
@@ -1,5 +1,5 @@
-#ifndef NME_UTILS_H
-#define NME_UTILS_H
+#ifndef LIME_UTILS_H
+#define LIME_UTILS_H
#include
#include
@@ -15,12 +15,12 @@
#include
#ifdef VERBOSE
-#define VLOG(args...) __android_log_print(ANDROID_LOG_INFO, "NME",args)
+#define VLOG(args...) __android_log_print(ANDROID_LOG_INFO, "lime",args)
#else
#define VLOG(args...)
#endif
-#define ELOG(args...) __android_log_print(ANDROID_LOG_ERROR, "NME",args)
+#define ELOG(args...) __android_log_print(ANDROID_LOG_ERROR, "lime",args)
#elif defined(TIZEN)
@@ -77,7 +77,7 @@ inline void DontLog(const char *inFormat,...) { }
-namespace nme
+namespace lime
{
extern std::string gAssetBase;
@@ -187,11 +187,11 @@ FILE *OpenOverwrite(const char *inName); // [ddc]
extern int gFixedOrientation;
#elif defined(HX_MACOS)
-} // close namespace nme
+} // close namespace lime
extern "C" FILE *OpenRead(const char *inName);
extern "C" bool GetBundleFilename(const char *inName, char *outBuffer,int inBufSize);
extern "C" FILE *OpenOverwrite(const char *inName);
-namespace nme {
+namespace lime {
#else
#define OpenRead(x) fopen(x,"rb")
#define OpenOverwrite(x) fopen(x,"wb") // [ddc]
diff --git a/project/include/Video.h b/project/include/Video.h
index a7b137fbd..e608ff38e 100644
--- a/project/include/Video.h
+++ b/project/include/Video.h
@@ -3,7 +3,7 @@
#include "Display.h"
-namespace nme {
+namespace lime {
class Video : public DisplayObject {
public:
diff --git a/project/include/platform/tizen/TizenApplication.h b/project/include/platform/tizen/TizenApplication.h
index 903def6ec..88afc82d2 100644
--- a/project/include/platform/tizen/TizenApplication.h
+++ b/project/include/platform/tizen/TizenApplication.h
@@ -13,7 +13,7 @@
#include
-namespace nme {
+namespace lime {
class TizenApplication : public Tizen::App::UiApp, public Tizen::System::IScreenEventListener, public Tizen::Ui::IKeyEventListener, public Tizen::Base::Runtime::ITimerEventListener {
diff --git a/project/include/platform/tizen/TizenFrame.h b/project/include/platform/tizen/TizenFrame.h
index 9ffd7737c..26d9824e0 100644
--- a/project/include/platform/tizen/TizenFrame.h
+++ b/project/include/platform/tizen/TizenFrame.h
@@ -6,7 +6,7 @@
#include "platform/tizen/TizenStage.h"
-namespace nme {
+namespace lime {
class TizenFrame : public Frame {
diff --git a/project/include/platform/tizen/TizenStage.h b/project/include/platform/tizen/TizenStage.h
index 729fcba12..4402929e3 100644
--- a/project/include/platform/tizen/TizenStage.h
+++ b/project/include/platform/tizen/TizenStage.h
@@ -7,7 +7,7 @@
#include "renderer/common/HardwareContext.h"
-namespace nme {
+namespace lime {
class TizenStage : public Stage {
diff --git a/project/include/platform/tizen/TizenUIApp.h b/project/include/platform/tizen/TizenUIApp.h
index 3f6391aa1..2f78a0584 100644
--- a/project/include/platform/tizen/TizenUIApp.h
+++ b/project/include/platform/tizen/TizenUIApp.h
@@ -15,7 +15,7 @@
//#include "GlRendererTemplate.h"
-namespace nme {
+namespace lime {
class TizenUIApp : public Tizen::App::UiApp, public Tizen::System::IScreenEventListener, public Tizen::Ui::IKeyEventListener {
diff --git a/project/include/platform/tizen/TizenUIFrame.h b/project/include/platform/tizen/TizenUIFrame.h
index 4397a8605..a42ef6410 100644
--- a/project/include/platform/tizen/TizenUIFrame.h
+++ b/project/include/platform/tizen/TizenUIFrame.h
@@ -11,7 +11,7 @@
#include
-namespace nme {
+namespace lime {
class TizenUIFrame : public Tizen::Ui::Controls::Frame {
diff --git a/project/include/renderer/common/AutoSurfaceRender.h b/project/include/renderer/common/AutoSurfaceRender.h
index 2e9c86f43..0b55c7989 100644
--- a/project/include/renderer/common/AutoSurfaceRender.h
+++ b/project/include/renderer/common/AutoSurfaceRender.h
@@ -5,7 +5,7 @@
#include "renderer/common/Surface.h"
-namespace nme {
+namespace lime {
class AutoSurfaceRender {
diff --git a/project/include/renderer/common/BitmapCache.h b/project/include/renderer/common/BitmapCache.h
index 60b09c49f..53dcdef70 100644
--- a/project/include/renderer/common/BitmapCache.h
+++ b/project/include/renderer/common/BitmapCache.h
@@ -6,7 +6,7 @@
#include "renderer/common/Surface.h"
-namespace nme {
+namespace lime {
class BitmapCache {
diff --git a/project/include/renderer/common/BlendMode.h b/project/include/renderer/common/BlendMode.h
index ceb531565..ee074b16d 100644
--- a/project/include/renderer/common/BlendMode.h
+++ b/project/include/renderer/common/BlendMode.h
@@ -6,7 +6,7 @@
#include "renderer/common/BitmapCache.h"
-namespace nme {
+namespace lime {
struct NullMask
diff --git a/project/include/renderer/common/HardwareContext.h b/project/include/renderer/common/HardwareContext.h
index 54bf137e7..d4a6e9310 100644
--- a/project/include/renderer/common/HardwareContext.h
+++ b/project/include/renderer/common/HardwareContext.h
@@ -6,7 +6,7 @@
#include
-namespace nme {
+namespace lime {
class HardwareContext : public Object {
diff --git a/project/include/renderer/common/HardwareSurface.h b/project/include/renderer/common/HardwareSurface.h
index 2890f980c..df3bc0bdf 100644
--- a/project/include/renderer/common/HardwareSurface.h
+++ b/project/include/renderer/common/HardwareSurface.h
@@ -6,7 +6,7 @@
#include "renderer/common/HardwareContext.h"
-namespace nme {
+namespace lime {
class HardwareSurface : public Surface {
diff --git a/project/include/renderer/common/SimpleSurface.h b/project/include/renderer/common/SimpleSurface.h
index 2d39b3cf3..dc4dcb140 100644
--- a/project/include/renderer/common/SimpleSurface.h
+++ b/project/include/renderer/common/SimpleSurface.h
@@ -5,7 +5,7 @@
#include "renderer/common/Surface.h"
-namespace nme {
+namespace lime {
class SimpleSurface : public Surface {
diff --git a/project/include/renderer/common/Surface.h b/project/include/renderer/common/Surface.h
index cc53e795a..03673f6ec 100644
--- a/project/include/renderer/common/Surface.h
+++ b/project/include/renderer/common/Surface.h
@@ -9,7 +9,7 @@
#include "renderer/common/HardwareContext.h"
-namespace nme {
+namespace lime {
void HintColourOrder (bool inRedFirst);
@@ -65,7 +65,7 @@ namespace nme {
void Bind (HardwareContext &inHardware, int inSlot = 0);
int BytesPP () const { return Format () == pfAlpha ? 1 : 4; }
- bool Encode (nme::ByteArray *outBytes, bool inPNG, double inQuality);
+ bool Encode (lime::ByteArray *outBytes, bool inPNG, double inQuality);
Texture *GetOrCreateTexture (HardwareContext &inHardware);
Texture *GetTexture () { return mTexture; }
Surface *IncRef () { mRefCount++; return this; }
diff --git a/project/include/renderer/common/Texture.h b/project/include/renderer/common/Texture.h
index e41919d34..527140d09 100644
--- a/project/include/renderer/common/Texture.h
+++ b/project/include/renderer/common/Texture.h
@@ -2,7 +2,7 @@
#define RENDERER_TEXTURE_H
-namespace nme {
+namespace lime {
extern int gTextureContextVersion;
diff --git a/project/include/renderer/opengl/Egl.h b/project/include/renderer/opengl/Egl.h
index 73d9a511e..a42c7547b 100644
--- a/project/include/renderer/opengl/Egl.h
+++ b/project/include/renderer/opengl/Egl.h
@@ -1,10 +1,10 @@
-#ifndef NME_OPENGL_EGL
-#define NME_OPENGL_EGL
+#ifndef LIME_OPENGL_EGL
+#define LIME_OPENGL_EGL
-void nmeEGLDestroy();
-void nmeEGLSwapBuffers();
-bool nmeEGLResize(void *inX11Window, int &ioWidth, int &ioHeight);
-bool nmeEGLCreate(void *inX11Window, int &ioWidth, int &ioHeight,
+void limeEGLDestroy();
+void limeEGLSwapBuffers();
+bool limeEGLResize(void *inX11Window, int &ioWidth, int &ioHeight);
+bool limeEGLCreate(void *inX11Window, int &ioWidth, int &ioHeight,
int inOGLESVersion,
int inDepthBits,
int inStencilBits,
diff --git a/project/include/renderer/opengl/OGL.h b/project/include/renderer/opengl/OGL.h
index c54e42eda..8048b4f41 100644
--- a/project/include/renderer/opengl/OGL.h
+++ b/project/include/renderer/opengl/OGL.h
@@ -3,9 +3,9 @@
#if defined(BLACKBERRY) || defined(ANDROID) || defined(WEBOS) || defined(GPH) || defined(RASPBERRYPI) || defined(EMSCRIPTEN)
-#define NME_GLES
+#define LIME_GLES
-#ifdef NME_FORCE_GLES1
+#ifdef LIME_FORCE_GLES1
#include
#include
@@ -15,7 +15,7 @@
#include
#include
#define ALLOW_OGL2
-#define NME_FORCE_GLES2
+#define LIME_FORCE_GLES2
#endif
@@ -29,9 +29,9 @@ using namespace Tizen::Graphics::Opengl;
//#include
//#define ALLOW_OGL2
-//#define NME_FORCE_GLES2
-#define NME_FORCE_GLES1
-#define NME_GLES
+//#define LIME_FORCE_GLES2
+#define LIME_FORCE_GLES1
+#define LIME_GLES
#elif defined(IPHONE)
@@ -43,7 +43,7 @@ using namespace Tizen::Graphics::Opengl;
//typedef CAEAGLLayer *WinDC;
//typedef EAGLContext *GLCtx;
-#define NME_GLES
+#define LIME_GLES
#elif !defined(HX_WINDOWS)
@@ -178,7 +178,7 @@ typedef void *GLCtx;
#ifdef GPH
-#define NME_DITHER
+#define LIME_DITHER
#endif
#include
@@ -195,7 +195,7 @@ typedef void *GLCtx;
#undef DECLARE_EXTENSION
#endif
-namespace nme
+namespace lime
{
Texture *OGLCreateTexture(Surface *inSurface,unsigned int inFlags);
@@ -241,7 +241,7 @@ public:
void InitOGL2Extensions();
-} // end namespace nme
+} // end namespace lime
#endif // INCLUDED_OGL_H
diff --git a/project/include/renderer/opengl/OpenGL2Context.h b/project/include/renderer/opengl/OpenGL2Context.h
index 15585b484..cc0602331 100644
--- a/project/include/renderer/opengl/OpenGL2Context.h
+++ b/project/include/renderer/opengl/OpenGL2Context.h
@@ -5,7 +5,7 @@
#include "OpenGLContext.h"
-namespace nme {
+namespace lime {
class OpenGL2Context : public OpenGLContext {
diff --git a/project/include/renderer/opengl/OpenGLContext.h b/project/include/renderer/opengl/OpenGLContext.h
index dbcc4b0a2..55d86f731 100644
--- a/project/include/renderer/opengl/OpenGLContext.h
+++ b/project/include/renderer/opengl/OpenGLContext.h
@@ -2,12 +2,12 @@
#define RENDERER_OPENGL_CONTEXT_H
-#include
+#include
#include "renderer/opengl/OGL.h"
#include "renderer/common/HardwareContext.h"
-namespace nme {
+namespace lime {
class OpenGLContext : public HardwareContext {
diff --git a/project/include/renderer/opengl/OpenGLProgram.h b/project/include/renderer/opengl/OpenGLProgram.h
index 27aefb975..a51228aec 100644
--- a/project/include/renderer/opengl/OpenGLProgram.h
+++ b/project/include/renderer/opengl/OpenGLProgram.h
@@ -5,7 +5,7 @@
#include "renderer/opengl/OGL.h"
-namespace nme {
+namespace lime {
class OpenGLProgram : public GPUProg {
diff --git a/project/include/renderer/opengl/OpenGLTexture.h b/project/include/renderer/opengl/OpenGLTexture.h
index e1dff443f..c09476bfd 100644
--- a/project/include/renderer/opengl/OpenGLTexture.h
+++ b/project/include/renderer/opengl/OpenGLTexture.h
@@ -6,7 +6,7 @@
#include "renderer/common/Texture.h"
-namespace nme {
+namespace lime {
class OpenGLTexture : public Texture {
diff --git a/project/src/backend/directfb/DirectFBHardware.cpp b/project/src/backend/directfb/DirectFBHardware.cpp
index fcdb1aed9..889671595 100644
--- a/project/src/backend/directfb/DirectFBHardware.cpp
+++ b/project/src/backend/directfb/DirectFBHardware.cpp
@@ -4,7 +4,7 @@
#include
-namespace nme
+namespace lime
{
@@ -687,4 +687,4 @@ bool HardwareContext::Hits(const RenderState &inState, const HardwareCalls &inCa
-} // end namespace nme
+} // end namespace lime
diff --git a/project/src/backend/directfb/DirectFBKeyInputEventConvert.cpp b/project/src/backend/directfb/DirectFBKeyInputEventConvert.cpp
index 7b02d6ca7..04b4dcc19 100644
--- a/project/src/backend/directfb/DirectFBKeyInputEventConvert.cpp
+++ b/project/src/backend/directfb/DirectFBKeyInputEventConvert.cpp
@@ -7,7 +7,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
// the 'left' version
bool left = true;
- // First set the NME Event's value to the key id
+ // First set the lime Event's value to the key id
// Handle a - z
if ((src.key_id >= DIKI_A) && (src.key_id <= DIKI_Z)) {
@@ -57,7 +57,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
break;
case DIKI_NUM_LOCK:
case DIKI_SCROLL_LOCK:
- // Unknown to NME
+ // Unknown to lime
return false;
case DIKI_ESCAPE:
dest.value = keyESCAPE;
@@ -106,7 +106,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
break;
case DIKI_PRINT:
case DIKI_PAUSE:
- // Unknown to NME
+ // Unknown to lime
return false;
case DIKI_QUOTE_LEFT: /* TLDE */
dest.value = keyQUOTE;
@@ -142,7 +142,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
dest.value = keySLASH;
break;
case DIKI_LESS_SIGN: /* 103rd */
- // Unknown to NME
+ // Unknown to lime
return false;
case DIKI_KP_DIV:
dest.value = keyNUMPAD_DIVIDE;
@@ -171,7 +171,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
case DIKI_KP_F4:
case DIKI_KP_EQUAL:
case DIKI_KP_SEPARATOR:
- // Unknown to NME
+ // Unknown to lime
return false;
case DIKI_KP_DECIMAL:
dest.value = keyNUMPAD_DECIMAL;
@@ -198,7 +198,7 @@ bool DirectFBKeyInputEventConvert(const DFBInputEvent &src, Event &dest)
dest.flags |= efCommandDown;
}
- // Finally set the NME Event's code to the "symbol"
+ // Finally set the lime Event's code to the "symbol"
dest.code = src.key_symbol;
return true;
diff --git a/project/src/backend/directfb/DirectFBStage.cpp b/project/src/backend/directfb/DirectFBStage.cpp
index e0bbc86ea..39301bd09 100644
--- a/project/src/backend/directfb/DirectFBStage.cpp
+++ b/project/src/backend/directfb/DirectFBStage.cpp
@@ -6,7 +6,7 @@
#include
-namespace nme
+namespace lime
{
diff --git a/project/src/backend/glfw/GLFWStage.cpp b/project/src/backend/glfw/GLFWStage.cpp
index cd6a9cd21..65dd6d127 100644
--- a/project/src/backend/glfw/GLFWStage.cpp
+++ b/project/src/backend/glfw/GLFWStage.cpp
@@ -5,7 +5,7 @@
#include "renderer/common/HardwareContext.h"
#include
-namespace nme
+namespace lime
{
class GLFWFrame;
diff --git a/project/src/backend/sdl/SDLSound.cpp b/project/src/backend/sdl/SDLSound.cpp
index 04b41c0e2..c2f0f402e 100644
--- a/project/src/backend/sdl/SDLSound.cpp
+++ b/project/src/backend/sdl/SDLSound.cpp
@@ -6,7 +6,7 @@
#include
-namespace nme
+namespace lime
{
bool gSDLIsInit = false;
diff --git a/project/src/backend/sdl/SDLStage.cpp b/project/src/backend/sdl/SDLStage.cpp
index b5270e016..add5bd687 100644
--- a/project/src/backend/sdl/SDLStage.cpp
+++ b/project/src/backend/sdl/SDLStage.cpp
@@ -28,7 +28,7 @@
#include
#endif
-#ifdef NME_MIXER
+#ifdef LIME_MIXER
#include
#endif
@@ -70,7 +70,7 @@ void done_win32()
#endif
-namespace nme
+namespace lime
{
static int sgDesktopWidth = 0;
@@ -371,11 +371,11 @@ public:
if(SDL_GetWMInfo(&sysInfo)>0)
{
void *window = (void *)(size_t)sysInfo.info.x11.window;
- nmeEGLResize(window, inWidth, inHeight);
+ limeEGLResize(window, inWidth, inHeight);
}
#endif
- //nme_resize_id ++;
+ //lime_resize_id ++;
mOpenGLContext->DecRef();
mOpenGLContext = HardwareContext::CreateOpenGL(0, 0, sgIsOGL2);
mOpenGLContext->SetWindowSize(inWidth, inHeight);
@@ -434,7 +434,7 @@ public:
h = mSDLSurface->h;
if (mIsOpenGL)
{
- //nme_resize_id ++;
+ //lime_resize_id ++;
mOpenGLContext->DecRef();
mOpenGLContext = HardwareContext::CreateOpenGL(0, 0, sgIsOGL2);
mOpenGLContext->SetWindowSize(w, h);
@@ -534,7 +534,7 @@ public:
if (mIsOpenGL)
{
#ifdef RASPBERRYPI
- nmeEGLSwapBuffers();
+ limeEGLSwapBuffers();
#else
SDL_GL_SwapBuffers();
#endif
@@ -1056,7 +1056,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
gSDLIsInit = true;
- #ifdef NME_MIXER
+ #ifdef LIME_MIXER
#ifdef WEBOS
int chunksize = 256;
@@ -1134,12 +1134,12 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
sgIsOGL2 = false;
#ifdef RASPBERRYPI
- bool nmeEgl = true;
+ bool limeEgl = true;
#else
- bool nmeEgl = false;
+ bool limeEgl = false;
#endif
- if (opengl && !nmeEgl)
+ if (opengl && !limeEgl)
{
int aa_tries = (inFlags & wfHW_AA) ? ( (inFlags & wfHW_AA_HIRES) ? 2 : 1 ) : 0;
@@ -1161,7 +1161,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
int oglLevelPasses = 1;
- #if !defined(NME_FORCE_GLES1) && (defined(WEBOS) || defined(BLACKBERRY) || defined(EMSCRIPTEN))
+ #if !defined(LIME_FORCE_GLES1) && (defined(WEBOS) || defined(BLACKBERRY) || defined(EMSCRIPTEN))
// Try 2 then 1 ?
if ( (inFlags & wfAllowShaders) && !(inFlags & wfRequireShaders) )
oglLevelPasses = 2;
@@ -1171,7 +1171,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
for(int oglPass = 0; oglPass< oglLevelPasses && !is_opengl; oglPass++)
{
- #ifdef NME_FORCE_GLES1
+ #ifdef LIME_FORCE_GLES1
int level = 1;
#else
int level = (inFlags & wfRequireShaders) ? 2 : (inFlags & wfAllowShaders) ? 2-oglPass : 1;
@@ -1240,7 +1240,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
if (!screen)
{
- if (!opengl || !nmeEgl)
+ if (!opengl || !limeEgl)
sdl_flags |= SDL_DOUBLEBUF;
screen = SDL_SetVideoMode( use_w, use_h, 32, sdl_flags );
@@ -1260,7 +1260,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame,int inWidth,int inHeight,
use_w = screen->w;
use_h = screen->h;
- bool ok = nmeEGLCreate( 0, use_w, use_h,
+ bool ok = limeEGLCreate( 0, use_w, use_h,
sgIsOGL2,
(inFlags & wfDepthBuffer) ? 16 : 0,
(inFlags & wfStencilBuffer) ? 8 : 0,
@@ -1403,7 +1403,7 @@ void ResumeAnimation() {}
void StopAnimation()
{
- #ifdef NME_MIXER
+ #ifdef LIME_MIXER
Mix_CloseAudio();
#endif
#ifdef WEBOS
@@ -1524,7 +1524,7 @@ Frame *CreateTopLevelWindow(int inWidth,int inHeight,unsigned int inFlags, wchar
*/
-} // end namespace nme
+} // end namespace lime
#if 0
@@ -1578,7 +1578,7 @@ Frame *CreateTopLevelWindow(int inWidth,int inHeight,unsigned int inFlags, wchar
-value nme_get_mouse_position()
+value lime_get_mouse_position()
{
int x,y;
diff --git a/project/src/backend/sdl2/SDL2Stage.cpp b/project/src/backend/sdl2/SDL2Stage.cpp
index dd217cbcc..9c3066e1b 100644
--- a/project/src/backend/sdl2/SDL2Stage.cpp
+++ b/project/src/backend/sdl2/SDL2Stage.cpp
@@ -8,12 +8,12 @@
#include
#include