Set triangle color and raise minimum length for longest side
This commit is contained in:
+1
-1
@@ -548,7 +548,7 @@ static void alarm_window_load() {
|
|||||||
layer_add_child(window_layer, s_alarm_highlight_layer);
|
layer_add_child(window_layer, s_alarm_highlight_layer);
|
||||||
|
|
||||||
// triangle
|
// triangle
|
||||||
s_triangle_layer = triangle_layer_create(GRect(0, s_top_bar_grect.size.h + 1, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (s_top_bar_grect.size.h * 2)));
|
s_triangle_layer = triangle_layer_create(GRect(0, s_top_bar_grect.size.h + 1, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (s_top_bar_grect.size.h * 2)), GColorBlack);
|
||||||
layer_add_child(window_layer, s_triangle_layer->layer);
|
layer_add_child(window_layer, s_triangle_layer->layer);
|
||||||
|
|
||||||
schedule_fallback_alarm();
|
schedule_fallback_alarm();
|
||||||
|
|||||||
+5
-2
@@ -50,11 +50,14 @@ static void triangle_layer_update_proc(Layer *layer, GContext *ctx) {
|
|||||||
graphics_draw_line(ctx, GPoint(end_x, base_y), GPoint(apex_x, apex_y));
|
graphics_draw_line(ctx, GPoint(end_x, base_y), GPoint(apex_x, apex_y));
|
||||||
}
|
}
|
||||||
|
|
||||||
TriangleLayer *triangle_layer_create(GRect frame) {
|
TriangleLayer *triangle_layer_create(GRect frame, GColor color) {
|
||||||
TriangleLayer *tri = malloc(sizeof(TriangleLayer));
|
TriangleLayer *tri = malloc(sizeof(TriangleLayer));
|
||||||
if (!tri)
|
if (!tri)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
// set color
|
||||||
|
tri->color = color;
|
||||||
|
|
||||||
// determine angles
|
// determine angles
|
||||||
uint8_t r1, r2;
|
uint8_t r1, r2;
|
||||||
do {
|
do {
|
||||||
@@ -83,7 +86,7 @@ TriangleLayer *triangle_layer_create(GRect frame) {
|
|||||||
max_sin = sin_C;
|
max_sin = sin_C;
|
||||||
|
|
||||||
// longest side randomly chosen
|
// longest side randomly chosen
|
||||||
#define MIN_SIDE 10
|
#define MIN_SIDE 20
|
||||||
uint16_t max_side = (frame.size.w < frame.size.h) ? frame.size.w : frame.size.h;
|
uint16_t max_side = (frame.size.w < frame.size.h) ? frame.size.w : frame.size.h;
|
||||||
max_side = max_side - 12; // basic margin
|
max_side = max_side - 12; // basic margin
|
||||||
uint16_t largest_side = MIN_SIDE + (rand() % (max_side - MIN_SIDE + 1));
|
uint16_t largest_side = MIN_SIDE + (rand() % (max_side - MIN_SIDE + 1));
|
||||||
|
|||||||
+1
-1
@@ -16,5 +16,5 @@ typedef struct {
|
|||||||
uint16_t side_c;
|
uint16_t side_c;
|
||||||
} __attribute__((__packed__)) TriangleLayer;
|
} __attribute__((__packed__)) TriangleLayer;
|
||||||
|
|
||||||
TriangleLayer *triangle_layer_create(GRect frame);
|
TriangleLayer *triangle_layer_create(GRect frame, GColor color);
|
||||||
void triangle_layer_destroy(TriangleLayer *tri);
|
void triangle_layer_destroy(TriangleLayer *tri);
|
||||||
|
|||||||
Reference in New Issue
Block a user