diff --git a/Goldman-Bold.ttf b/Goldman-Bold.ttf new file mode 100644 index 0000000..6b4e871 Binary files /dev/null and b/Goldman-Bold.ttf differ diff --git a/Goldman-Regular.ttf b/Goldman-Regular.ttf new file mode 100644 index 0000000..e82a6b5 Binary files /dev/null and b/Goldman-Regular.ttf differ diff --git a/add-outline.png b/Main_UI/add-outline.png similarity index 100% rename from add-outline.png rename to Main_UI/add-outline.png diff --git a/main.py b/main.py index 000b686..f4c0553 100644 --- a/main.py +++ b/main.py @@ -20,12 +20,12 @@ SCREEN_WIDTH, SCREEN_HEIGHT = screen.get_size() # Fonts -font_heading = pg.font.Font(None, 48) -font_button = pg.font.Font(None, 36) +font_heading = pg.font.Font("Goldman-Bold.ttf", 32) +font_button = pg.font.Font("Goldman-Regular.ttf", 25) # Load Icon Image try: - icon_image = pg.image.load("add-outline.png") + icon_image = pg.image.load("Main_UI/add-outline.png") icon_image = pg.transform.scale(icon_image, (30, 30)) except pg.error: @@ -186,7 +186,7 @@ def recreate_bones(): #list_holders=char.Body.holders.values() holder=char.Body.holders["holder_"+str(i)] bone_x=holder.position[0]+holder.scale[0]/2 - char.Rig.add_bone(pg.Vector2(bone_x-3,holder.position[1]+10),(30,holder.scale.y-20)) + char.Rig.add_bone(pg.Vector2(bone_x-3,holder.position[1]+10),(15,holder.scale.y-20)) # Create scrollable sidebar @@ -194,15 +194,13 @@ def recreate_bones(): # Create initial headings headings = [ - Text("Character", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 20), - Text("Holder", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 80), + Text("Character", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 25), + Text("Holder", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 90), Text("Rig", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 365), Text("Sprite", font_heading, (244, 238, 224), SCREEN_WIDTH - 325, 500), + Text("Animation", font_heading, (244, 238, 224), SCREEN_WIDTH - 1510 , 25), ] -for heading in headings: - sidebar.add_element(heading) - # Create button text objects button_text1 = Text("New Holder", font_button, (244, 238, 224), 0, 0) button_text2 = Text("Add Bones", font_button, (244, 238, 224), 0, 0) @@ -287,17 +285,25 @@ def recreate_bones(): j += (screen.get_height()) / 12 panel.draw_rectangle(screen) panel.draw_lines(screen,15,30,(255,255,255)) - - pg.draw.line(screen, WHITE , (383, 750), (0, 750), 3) + + sidebar.draw(screen) + + pg.draw.line(screen, WHITE , (383, screen.get_height() - 125), (0, screen.get_height() - 125), 3) pg.draw.line(screen, WHITE , (383, screen.get_height() - 200), (383, screen.get_height()), 3) - pg.draw.line(screen, WHITE , (1200, screen.get_height() - 200), (1200, screen.get_height()), 3) - + pg.draw.line(screen, WHITE , (1185, screen.get_height() - 1200), (1185, screen.get_height()), 3) + pg.draw.line(screen, WHITE , (1184, screen.get_height() - 1200), (1184, screen.get_height()), 3) + pg.draw.line(screen, WHITE , (0, screen.get_height() - 880), (screen.get_width(), screen.get_height() - 880), 3) + + pg.draw.rect(screen, (79, 69, 87), (0, 0, screen.get_width() - 350 , screen.get_height() - 880)) + + for heading in headings: + heading.draw(screen, heading.rect.topleft) pause = pause_button.get_rect(center = (120, screen.get_height() - 165)) play = play_button.get_rect(center = (258, screen.get_height()-165)) record = record_button.get_rect(center = (190, screen.get_height()-165)) - fastforward = fast_forward_button.get_rect(center = (330,screen.get_height()-165)) - rewind = rewind_button.get_rect(center = (50,screen.get_height()-165)) + fastforward = fast_forward_button.get_rect(center = (50,screen.get_height()-165)) + rewind = rewind_button.get_rect(center = (330,screen.get_height()-165)) screen.blit(pause_button,pause) @@ -325,8 +331,7 @@ def recreate_bones(): #print(char.Body.holders.keys()) # flip() the display to put your work on screen - sidebar.draw(screen) - char.Body.add_frame_part(screen,char.Rig) + char.Body.add_frame_part(screen, char.Rig) char.Rig.display_bones(screen) pg.display.flip()