test commit

Author: mimaraka

curve_editor/ce_bitmap_canvas.cpp

@@ -0,0 +1,47 @@
+//----------------------------------------------------------------------------------
+//		Curve Editor
+//		ソースファイル（ビットマップキャンバス）
+//		Visual C++ 2022
+//----------------------------------------------------------------------------------
+
+#include "ce_header.hpp"
+
+
+
+//---------------------------------------------------------------------
+//		初期化
+//---------------------------------------------------------------------
+void ce::Bitmap_Canvas::init(HWND hw)
+{
+	hwnd = hw;
+	HDC hdc = GetDC(hw);
+	hdc_memory = CreateCompatibleDC(hdc);
+	bitmap = CreateCompatibleBitmap(hdc, CE_MAX_W, CE_MAX_H);
+	SelectObject(hdc_memory, bitmap);
+	ReleaseDC(hw, hdc);
+}
+
+
+
+//---------------------------------------------------------------------
+//		終了
+//---------------------------------------------------------------------
+void ce::Bitmap_Canvas::exit()
+{
+	DeleteDC(hdc_memory);
+	DeleteObject(bitmap);
+}
+
+
+
+//---------------------------------------------------------------------
+//		ビットマップをバッファから画面に転送
+//---------------------------------------------------------------------
+void ce::Bitmap_Canvas::transfer(LPRECT rect)
+{
+	PAINTSTRUCT ps;
+	HDC hdc = BeginPaint(hwnd, &ps);
+	BitBlt(hdc, 0, 0, rect->right, rect->bottom, hdc_memory, 0, 0, SRCCOPY);
+	EndPaint(hwnd, &ps);
+	DeleteDC(hdc);
+}

curve_editor/ce_curve_value.cpp

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------
 //		Curve Editor
 //		ソースファイル (Valueモードのカーブの関数)
-//		VC++ 2022
+//		Visual C++ 2022
 //----------------------------------------------------------------------------------
 
 #include "ce_header.hpp"

curve_editor/ce_dlgproc.cpp

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------
 //		Curve Editor
-//		ソースファイル (ダイアログのプロシージャ)
-//		VC++ 2022
+//		ソースファイル (ダイアログプロシージャ)
+//		Visual C++ 2022
 //----------------------------------------------------------------------------------
 
 #include "ce_header.hpp"

curve_editor/ce_func.cpp

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------
 //		Curve Editor
-//		ソースファイル (関数)
-//		(Visual C++ 2022)
+//		ソースファイル (その他の関数)
+//		Visual C++ 2022
 //----------------------------------------------------------------------------------
 
 #include "ce_header.hpp"

curve_editor/ce_func_graphics.cpp

@@ -144,24 +144,42 @@ void d2d_draw_bezier(ID2D1SolidColorBrush* pBrush,
 //---------------------------------------------------------------------
 void d2d_draw_handle(ID2D1SolidColorBrush* pBrush, ce::Double_Point st, ce::Double_Point ed)
 {
-	ce::Double_Point st_new = subtract_length(ed, st, CE_SUBTRACT_LENGTH);
+	ce::Double_Point st_new = subtract_length(ed, st, CE_SUBTRACT_LENGTH_2);
 	ce::Double_Point ed_new = subtract_length(st, ed, CE_SUBTRACT_LENGTH);
+
+	ID2D1StrokeStyle* pStyle = NULL;
+
+	g_d2d1_factory->CreateStrokeStyle(
+		D2D1::StrokeStyleProperties(
+			D2D1_CAP_STYLE_ROUND,
+			D2D1_CAP_STYLE_ROUND,
+			D2D1_CAP_STYLE_ROUND,
+			D2D1_LINE_JOIN_MITER,
+			10.0f,
+			D2D1_DASH_STYLE_SOLID,
+			0.0f),
+		NULL, NULL,
+		&pStyle
+	);
+
 	g_render_target->DrawLine(
 		D2D1::Point2F(st_new.x, st_new.y),
 		D2D1::Point2F(ed_new.x, ed_new.y),
 		pBrush, CE_HANDLE_TH
 	);
+
 	g_render_target->DrawEllipse(
 		D2D1::Ellipse(
 			D2D1::Point2F(ed.x, ed.y),
 			CE_HANDLE_SIZE, CE_HANDLE_SIZE),
 		pBrush, CE_HANDLE_SIRCLE_LINE
 	);
-	g_render_target->DrawEllipse(
+
+	g_render_target->FillEllipse(
 		D2D1::Ellipse(
 			D2D1::Point2F(st.x, st.y),
 			CE_POINT_SIZE, CE_POINT_SIZE),
-		pBrush, CE_POINT_SIZE * 1.7
+			pBrush
 	);
 }
 
@@ -175,6 +193,7 @@ void draw_main(HWND hwnd, HDC hdc_mem, LPRECT rect_wnd, LPRECT rect_sepr)
 	HDC hdc;
 	static ID2D1SolidColorBrush* pBrush = NULL;
 	ID2D1StrokeStyle* pStyle = NULL;
+
 	g_d2d1_factory->CreateStrokeStyle(
 		D2D1::StrokeStyleProperties(
 			D2D1_CAP_STYLE_ROUND,

curve_editor/ce_header.hpp

@@ -1,11 +1,16 @@
 //----------------------------------------------------------------------------------
 //		Curve Editor
 //		ヘッダファイル
-//		(Visual C++ 2022)
+//		Visual C++ 2022
 //----------------------------------------------------------------------------------
 
 #pragma once
 
+
+
+//----------------------------------------------------------------------------------
+//		include
+//----------------------------------------------------------------------------------
 #include <windows.h>
 #include <windowsx.h>
 #include <wininet.h>
@@ -17,6 +22,8 @@
 #include "ce_macro.hpp"
 #include "resource.h"
 
+#pragma comment(lib, "d2d1.lib")
+
 
 
 //----------------------------------------------------------------------------------
@@ -255,6 +262,19 @@ namespace ce {
 			HMENU menu				//メニューハンドルまたは子ウィンドウ ID
 		);
 	};
+
+
+	class Bitmap_Canvas {
+	private:
+		HBITMAP bitmap;
+		HWND hwnd;
+	public:
+		HDC hdc_memory;
+
+		void init(HWND hw);
+		void exit();
+		void transfer(LPRECT rect);
+	};
 }