Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shapes #213

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Shapes #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e540e93
initial line module and testbench
May 24, 2024
0950a83
cleanup old sprite engine files
May 24, 2024
02ccd13
simplify logic into state machine
May 24, 2024
f3ce42f
rename to vector engine
May 24, 2024
83d57e3
add framebuffer visual to graphics tb
May 24, 2024
c2bc53d
update project file
May 24, 2024
0018042
colored lines work
May 24, 2024
bb4cf0b
Merge branch 'main' into vector-line
May 29, 2024
42b7ea8
fix merge bugs and update tb
May 29, 2024
8941df7
working fpga bin
May 29, 2024
3c76088
add line lua func
rohitrathnam May 30, 2024
6cd803e
fix offset logic
May 30, 2024
bf1553d
add color offset to text function
rohitrathnam May 30, 2024
f6095ea
pallette working
rohitrathnam May 31, 2024
6e0bcb0
add arc
rohitrathnam Jun 3, 2024
584ac3c
add rectangle
rohitrathnam Jun 3, 2024
f0f2519
uniform lua error messages
rohitrathnam Jun 3, 2024
e71635e
Merge branch 'sprite-color' into shapes
rohitrathnam Jun 3, 2024
611e03a
update merged fpga bin
Jun 3, 2024
af2d206
add filled rectangle
rohitrathnam Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
250 changes: 228 additions & 22 deletions source/application/lua_libraries/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ static uint32_t utf8_decode(const char *string, size_t *index)

static int lua_display_assign_color(lua_State *L)
{
lua_Integer pallet_index = luaL_checkinteger(L, 1) - 1;
lua_Integer palette_index = luaL_checkinteger(L, 1);
lua_Integer red = luaL_checkinteger(L, 2);
lua_Integer green = luaL_checkinteger(L, 3);
lua_Integer blue = luaL_checkinteger(L, 4);

if (pallet_index < 0 || pallet_index > 15)
if (palette_index < 1 || palette_index > 15)
{
luaL_error(L, "pallet_index must be between 1 and 16");
luaL_error(L, "palette_index must be between 1 and 15");
}

if (red < 0 || red > 255)
Expand All @@ -101,7 +101,7 @@ static int lua_display_assign_color(lua_State *L)
double cb = floor(-0.169 * red - 0.331 * green + 0.5 * blue + 128);
double cr = floor(0.5 * red - 0.419 * green - 0.081 * blue + 128);

uint8_t data[4] = {(uint8_t)pallet_index,
uint8_t data[4] = {(uint8_t)palette_index,
(uint8_t)y,
(uint8_t)cb,
(uint8_t)cr};
Expand All @@ -113,14 +113,14 @@ static int lua_display_assign_color(lua_State *L)

static int lua_display_assign_color_ycbcr(lua_State *L)
{
lua_Integer pallet_index = luaL_checkinteger(L, 1) - 1;
lua_Integer palette_index = luaL_checkinteger(L, 1) - 1;
lua_Integer y = luaL_checkinteger(L, 2);
lua_Integer cb = luaL_checkinteger(L, 3);
lua_Integer cr = luaL_checkinteger(L, 4);

if (pallet_index < 0 || pallet_index > 15)
if (palette_index < 1 || palette_index > 15)
{
luaL_error(L, "pallet_index must be between 1 and 16");
luaL_error(L, "palette_index must be between 1 and 15");
}

if (y < 0 || y > 255)
Expand All @@ -138,7 +138,7 @@ static int lua_display_assign_color_ycbcr(lua_State *L)
luaL_error(L, "Cr component must be between 0 and 255");
}

uint8_t data[4] = {(uint8_t)pallet_index,
uint8_t data[4] = {(uint8_t)palette_index,
(uint8_t)y,
(uint8_t)cb,
(uint8_t)cr};
Expand All @@ -157,35 +157,31 @@ static void draw_sprite(lua_State *L,
const uint8_t *pixel_data,
size_t pixel_data_length)
{
if (x_position < 1 || x_position > 640)
if (x_position < 0 || x_position > 639)
{
luaL_error(L, "x_position must be between 1 and 640 pixels");
luaL_error(L, "x_position must be between 0 and 639 pixels");
}

if (y_position < 1 || y_position > 400)
if (y_position < 0 || y_position > 399)
{
luaL_error(L, "y_position must be between 1 and 400 pixels");
luaL_error(L, "y_position must be between 0 and 399 pixels");
}

if (width < 1 || width > 640)
if (width < 0 || width > 639)
{
luaL_error(L, "width must be between 1 and 640 pixels");
luaL_error(L, "width must be between 0 and 639 pixels");
}

if (total_colors != 2 && total_colors != 4 && total_colors != 16)
{
luaL_error(L, "total_colors must be either 2, 4 or 16");
}

if (palette_offset < 0 || palette_offset > 15)
if (palette_offset < 0 || palette_offset > 14)
{
luaL_error(L, "palette_offset must be between 0 and 15");
luaL_error(L, "palette_offset must be between 0 and 14");
}

// Remove Lua 1 based offset before sending
x_position--;
y_position--;

uint8_t meta_data[8] = {(uint32_t)x_position >> 8,
(uint32_t)x_position,
(uint32_t)y_position >> 8,
Expand Down Expand Up @@ -228,13 +224,13 @@ static int lua_display_bitmap(lua_State *L)

static int lua_display_text(lua_State *L)
{
// TODO color options
// TODO justification options
// TODO character spacing

const char *string = luaL_checkstring(L, 1);
lua_Integer x_position = luaL_checkinteger(L, 2);
lua_Integer y_position = luaL_checkinteger(L, 3);
lua_Integer palette_offset = luaL_checkinteger(L, 4);
lua_Integer character_spacing = 4;

for (size_t index = 0; index < strlen(string);)
Expand Down Expand Up @@ -276,7 +272,7 @@ static int lua_display_text(lua_State *L)
y_position,
sprite_metadata[entry].width,
sprite_metadata[entry].colors,
0, // TODO
palette_offset,
sprite_data + data_offset,
data_length);

Expand All @@ -291,6 +287,204 @@ static int lua_display_text(lua_State *L)
return 0;
}

static void draw_line(uint32_t x_0, uint32_t y_0, uint32_t x_1, uint32_t y_1, uint32_t color)
{
uint8_t line_data[9] = {
(uint32_t) x_0 >> 8,
(uint32_t) x_0,
(uint32_t) y_0 >> 8,
(uint32_t) y_0,
(uint32_t) x_1 >> 8,
(uint32_t) x_1,
(uint32_t) y_1 >> 8,
(uint32_t) y_1,
(uint8_t) color
};

spi_write(FPGA, 0x13, line_data, sizeof(line_data));
}

static int lua_display_line(lua_State *L)
{
lua_Integer x_0 = luaL_checkinteger(L, 1);
if (x_0 < 0 || x_0 > 639) {
luaL_error(L, "x_0 must be between 0 and 639 pixels");
}

lua_Integer y_0 = luaL_checkinteger(L, 2);
if (y_0 < 0 || y_0 > 399) {
luaL_error(L, "y_0 must be between 0 and 399 pixels");
}

lua_Integer x_1 = luaL_checkinteger(L, 3);
if (x_1 < 0 || x_1 > 639) {
luaL_error(L, "x_1 must be between 0 and 639 pixels");
}

lua_Integer y_1 = luaL_checkinteger(L, 4);
if (y_1 < 0 || y_1 > 399) {
luaL_error(L, "y_1 must be between 0 and 399 pixels");
}

lua_Integer palette_offset = luaL_checkinteger(L, 5);
if (palette_offset < 0 || palette_offset > 14) {
luaL_error(L, "palette_offset must be between 0 and 14");
}

draw_line(x_0, y_0, x_1, y_1, palette_offset);

return 0;
}

static int lua_display_rectangle(lua_State *L)
{
lua_Integer x_0 = luaL_checkinteger(L, 1);
if (x_0 < 0 || x_0 > 639) {
luaL_error(L, "x_0 must be between 0 and 639 pixels");
}

lua_Integer y_0 = luaL_checkinteger(L, 2);
if (y_0 < 0 || y_0 > 399) {
luaL_error(L, "y_0 must be between 0 and 399 pixels");
}

lua_Integer x_1 = luaL_checkinteger(L, 3);
if (x_1 < 0 || x_1 > 639) {
luaL_error(L, "x_1 must be between 0 and 639 pixels");
}

lua_Integer y_1 = luaL_checkinteger(L, 4);
if (y_1 < 0 || y_1 > 399) {
luaL_error(L, "y_1 must be between 0 and 399 pixels");
}

lua_Integer palette_offset = luaL_checkinteger(L, 5);
if (palette_offset < 0 || palette_offset > 14) {
luaL_error(L, "palette_offset must be between 0 and 14");
}

draw_line(x_0, y_0, x_0, y_1, palette_offset);
draw_line(x_0, y_0, x_1, y_0, palette_offset);
draw_line(x_0, y_1, x_1, y_1, palette_offset);
draw_line(x_1, y_0, x_1, y_1, palette_offset);

return 0;
}

static int lua_display_filled_rectangle(lua_State *L)
{
lua_Integer x_0 = luaL_checkinteger(L, 1);
if (x_0 < 0 || x_0 > 639) {
luaL_error(L, "x_0 must be between 0 and 639 pixels");
}

lua_Integer y_0 = luaL_checkinteger(L, 2);
if (y_0 < 0 || y_0 > 399) {
luaL_error(L, "y_0 must be between 0 and 399 pixels");
}

lua_Integer x_1 = luaL_checkinteger(L, 3);
if (x_1 < 0 || x_1 > 639) {
luaL_error(L, "x_1 must be between 0 and 639 pixels");
}

lua_Integer y_1 = luaL_checkinteger(L, 4);
if (y_1 < 0 || y_1 > 399) {
luaL_error(L, "y_1 must be between 0 and 399 pixels");
}

lua_Integer palette_offset = luaL_checkinteger(L, 5);
if (palette_offset < 0 || palette_offset > 14) {
luaL_error(L, "palette_offset must be between 0 and 14");
}

// round up to nearest byte
uint32_t num_bytes = (uint32_t) round((abs(x_1 - x_0) * abs(y_1 - y_0) / 8.0) + 0.5);
uint8_t *pixel_data = malloc(num_bytes);

memset(pixel_data, 0xff, num_bytes);

uint32_t x_position = x_0 < x_1 ? x_0 : x_1;
uint32_t y_position = y_0 < y_1 ? y_0 : y_1;
uint32_t width = abs(y_1 - y_0);

draw_sprite(
L,
x_position,
y_position,
width,
SPRITE_2_COLORS,
palette_offset,
pixel_data,
num_bytes
);

return 0;
}

static void draw_arc(uint32_t x_centre, uint32_t y_centre, uint32_t radius,
double theta_0, double theta_1,
uint32_t number_of_segments, uint32_t palette_offset)
{
uint32_t x_0, y_0, x_1, y_1;
double angle = theta_0;
double d_theta = (theta_1 - theta_0) / number_of_segments;

x_1 = (uint32_t) round ((double)x_centre + (double)radius * cos(angle));
y_1 = (uint32_t) round ((double)y_centre + (double)radius * sin(angle));

for (uint8_t i = 1; i <= number_of_segments; i++) {
x_0 = x_1; y_0 = y_1;
angle = angle + d_theta;
x_1 = (uint32_t) round ((double)x_centre + (double)radius * cos(angle));
y_1 = (uint32_t) round ((double)y_centre + (double)radius * sin(angle));
draw_line(x_0, y_0, x_1, y_1, palette_offset);
}
}

static int lua_display_arc(lua_State *L)
{
lua_Integer x_centre = luaL_checkinteger(L, 1);
if (x_centre < 0 || x_centre > 399) {
luaL_error(L, "x_centre must be between 0 and 399 pixels");
}

lua_Integer y_centre = luaL_checkinteger(L, 2);
if (y_centre < 0 || y_centre > 639) {
luaL_error(L, "y_centre must be between 0 and 639 pixels");
}

lua_Integer radius = luaL_checkinteger(L, 3);
if (radius < 0 || radius > 639) {
luaL_error(L, "radius must be between 0 and 639 pixels");
}

lua_Number theta_0 = luaL_checknumber(L, 4);
if (theta_0 < 0 || theta_0 > 2*M_PI) {
luaL_error(L, "theta_0 must be between 0 and %f radians", 2*M_PI);
}

lua_Number theta_1 = luaL_checknumber(L, 5);
if (theta_1 < 0 || theta_1 > 2*M_PI) {
luaL_error(L, "theta_1 must be between 0 and %f radians", 2*M_PI);
}

lua_Integer number_of_segments = luaL_checkinteger(L, 6);
if (number_of_segments < 1 || number_of_segments > 16) {
luaL_error(L, "number of segments must be between 1 and 16");
}

lua_Integer palette_offset = luaL_checkinteger(L, 7);
if (palette_offset < 0 || palette_offset > 14) {
luaL_error(L, "palette_offset must be between 0 and 14");
}

draw_arc(x_centre, y_centre, radius, theta_0, theta_1,
number_of_segments, palette_offset);

return 0;
}

static int lua_display_show(lua_State *L)
{
spi_write(FPGA, 0x14, NULL, 0);
Expand Down Expand Up @@ -366,6 +560,18 @@ void lua_open_display_library(lua_State *L)
lua_pushcfunction(L, lua_display_text);
lua_setfield(L, -2, "text");

lua_pushcfunction(L, lua_display_line);
lua_setfield(L, -2, "line");

lua_pushcfunction(L, lua_display_rectangle);
lua_setfield(L, -2, "rectangle");

lua_pushcfunction(L, lua_display_filled_rectangle);
lua_setfield(L, -2, "filled_rectangle");

lua_pushcfunction(L, lua_display_arc);
lua_setfield(L, -2, "arc");

lua_pushcfunction(L, lua_display_show);
lua_setfield(L, -2, "show");

Expand Down
2 changes: 1 addition & 1 deletion source/application/luaport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void run_lua(bool factory_reset)
}

// Show splash screen
status = luaL_dostring(L, "frame.display.text('FRAME', 280, 176);"
status = luaL_dostring(L, "frame.display.text('FRAME', 280, 176, 0);"
"frame.display.show();");

if (status != LUA_OK)
Expand Down
Loading