Главная Обзор Помощь
Вход
0xc3
/
karl2d
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

palette demo

Karl Zylinski 2 месяцев назад
Родитель
a470d92294
Сommit
e6687e19d2
4 измененных файлов с 119 добавлено и 4 удалено
Единый вид Показать статистику Diff
  1. 10 0
      .sublime/karl2d.sublime-project
  2. 2 2
      examples/build_web_example/web_entry_templates/index_template.html
  3. 105 0
      examples/palette/palette.odin
  4. 2 2
      window_win32.odin

+ 10 - 0
.sublime/karl2d.sublime-project
Просмотреть файл 

@@ -131,6 +131,16 @@
 
 					"shell_cmd": "odin run build_web_example -- gamepad",
 
 					"shell_cmd": "odin run build_web_example -- gamepad",
 
 					"working_dir": "$project_path/../examples",
 
 					"working_dir": "$project_path/../examples",
 
 				},
 
 				},
 
+				{
 
+					"name": "palette",
 
+					"shell_cmd": "odin run . -vet -strict-style -keep-executable -debug",
 
+					"working_dir": "$project_path/../examples/palette",
 
+				},
 
+				{
 
+					"name": "palette (web)",
 
+					"shell_cmd": "odin run build_web_example -- palette",
 
+					"working_dir": "$project_path/../examples",
 
+				},
 
 				{
 
 				{
 
 					"name": "api_doc_builder",
 
 					"name": "api_doc_builder",
 
 					"shell_cmd": "odin run api_doc_builder",
 
 					"shell_cmd": "odin run api_doc_builder",

+ 2 - 2
examples/build_web_example/web_entry_templates/index_template.html
Просмотреть файл 

@@ -5,8 +5,8 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 
 		<title>Karl2D Minimal</title>
 
 		<title>Karl2D Minimal</title>
 
 	</head>
 
 	</head>
 
-	<body id="body" style="height: 100%; padding: 0; margin: 0; overflow: hidden; background-color: black;" oncontextmenu="return false;">
 
-		<canvas id="webgl-canvas"></canvas>
 
+	<body id="body" style="height: 100%; padding: 0; margin: 0; overflow: hidden; background-color: black;">
 
+		<canvas id="webgl-canvas" oncontextmenu="return false;"></canvas>
 
 	
 	
 		<script type="text/javascript" src="odin.js"></script>
 
 		<script type="text/javascript" src="odin.js"></script>
 
 		<script type="text/javascript">
 
 		<script type="text/javascript">

+ 105 - 0
examples/palette/palette.odin
Просмотреть файл 

@@ -0,0 +1,105 @@
 
+package karl2d_palette
 
+
 
+import k2 "../.."
 
+import "core:log"
 
+import "core:fmt"
 
+
 
+_ :: fmt
 
+
 
+tex: k2.Texture
 
+
 
+init :: proc() {
 
+	k2.init(1470, 1530, "Karl2D Palette Demo")
 
+}
 
+
 
+step :: proc() -> bool {
 
+	k2.new_frame()
 
+	k2.process_events()
 
+	k2.clear(k2.WHITE)
 
+	k2.draw_rect({0, 0, f32(k2.get_screen_width() / 2), f32(k2.get_screen_height())}, k2.BLACK)
 
+
 
+	colors := [?]k2.Color {
 
+		k2.BLACK,
 
+		k2.WHITE,
 
+		k2.GRAY,
 
+		k2.DARK_GRAY,
 
+		k2.BLUE,
 
+		k2.DARK_BLUE,
 
+		k2.LIGHT_BLUE,
 
+		k2.GREEN,
 
+		k2.DARK_GREEN,
 
+		k2.LIGHT_GREEN,
 
+		k2.RED,
 
+		k2.LIGHT_RED,
 
+		k2.DARK_RED,
 
+		k2.LIGHT_PURPLE,
 
+		k2.YELLOW,
 
+		k2.LIGHT_YELLOW,
 
+		k2.MAGENTA,
 
+	}
 
+
 
+	color_names := [?]string {
 
+		"BLACK",
 
+		"WHITE",
 
+		"GRAY",
 
+		"DARK_GRAY",
 
+		"BLUE",
 
+		"DARK_BLUE",
 
+		"LIGHT_BLUE",
 
+		"GREEN",
 
+		"DARK_GREEN",
 
+		"LIGHT_GREEN",
 
+		"RED",
 
+		"LIGHT_RED",
 
+		"DARK_RED",
 
+		"LIGHT_PURPLE",
 
+		"YELLOW",
 
+		"LIGHT_YELLOW",
 
+		"MAGENTA",
 
+	}
 
+
 
+	x := f32(290)
 
+	y := f32(0)
 
+	PAD :: 20
 
+	SW :: 50
 
+	SH :: 50
 
+
 
+	for bg, i in colors {
 
+		k2.draw_rect({x, y, 890, SH+PAD*2}, bg)
 
+
 
+		k2.draw_text(color_names[i], {x + 890+PAD, y+25}, 40, bg)
 
+
 
+		color_name_width := k2.measure_text(color_names[i], 40)
 
+		k2.draw_text(color_names[i], {290-color_name_width.x-PAD, y+25}, 40, bg)
 
+
 
+		for c in colors {
 
+			k2.draw_rect({x + PAD, y + PAD, SW, SH}, c)
 
+			x += SW
 
+		}
 
+
 
+		x = 290
 
+		y += SH + PAD*2
 
+	}
 
+
 
+	k2.present()
 
+	free_all(context.temp_allocator)
 
+
 
+	return !k2.shutdown_wanted()
 
+}
 
+
 
+shutdown :: proc() {
 
+	k2.destroy_texture(tex)
 
+	k2.shutdown()
 
+}
 
+
 
+main :: proc() {
 
+	context.logger = log.create_console_logger()
 
+	init()
 
+
 
+	run := true
 
+	for run {
 
+		run = step() 
+	}
 
+
 
+	shutdown()
 
+}

+ 2 - 2
window_win32.odin
Просмотреть файл 

@@ -273,11 +273,11 @@ Win32_State :: struct {
 
 
 
 style_from_flags :: proc(flags: Window_Flags) -> win32.DWORD {
 
 style_from_flags :: proc(flags: Window_Flags) -> win32.DWORD {
 
 	style := win32.WS_OVERLAPPED | win32.WS_CAPTION | win32.WS_SYSMENU |
 
 	style := win32.WS_OVERLAPPED | win32.WS_CAPTION | win32.WS_SYSMENU |
 
-	         win32.WS_MINIMIZEBOX | win32.WS_MAXIMIZEBOX | win32.WS_VISIBLE |
 
+	         win32.WS_MINIMIZEBOX | win32.WS_VISIBLE |
 
 	         win32.CS_OWNDC
 
 	         win32.CS_OWNDC
 
 
 
 	if .Resizable in flags {
 
 	if .Resizable in flags {
 
-		style |= win32.WS_THICKFRAME
 
+		style |= win32.WS_THICKFRAME & win32.WS_MAXIMIZEBOX
 
 	}
 
 	}
 
 
 
 	return style
 
 	return style