Skip to content

Commit 71bbb83

Browse files
gucio321gucio321
committed
wrapper: rename wrapCType -> wrapPtrCType
1 parent bf3d109 commit 71bbb83

File tree

5 files changed

+52
-52
lines changed

5 files changed

+52
-52
lines changed

‎backend.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ func (w GLFWwindow) Run(loop func()) {
7777
}
7878

7979
func (w GLFWwindow) DisplaySize() (width int32, height int32) {
80-
widthArg, widthFin := wrapCType[C.int, int32](&width)
80+
widthArg, widthFin := wrapPtrCType[C.int, int32](&width)
8181
defer widthFin()
8282

83-
heightArg, heightFin := wrapCType[C.int, int32](&height)
83+
heightArg, heightFin := wrapPtrCType[C.int, int32](&height)
8484
defer heightFin()
8585

8686
C.igGLFWWindow_GetDisplaySize(w.handle(), widthArg, heightArg)

‎cimgui_funcs.go‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ func CheckboxFlags_IntPtr(label string, flags *int32, flags_value int32) bool {
13851385
labelArg, labelFin := wrapString(label)
13861386
defer labelFin()
13871387

1388-
flagsArg, flagsFin := wrapCType[C.int, int32](flags)
1388+
flagsArg, flagsFin := wrapPtrCType[C.int, int32](flags)
13891389
defer flagsFin()
13901390

13911391
return C.CheckboxFlags_IntPtr(labelArg, flagsArg, C.int(flags_value)) == C.bool(true)
@@ -1431,26 +1431,26 @@ func ColorConvertFloat4ToU32(in ImVec4) uint32 {
14311431
}
14321432

14331433
func ColorConvertHSVtoRGB(h float32, s float32, v float32, out_r *float32, out_g *float32, out_b *float32) {
1434-
out_rArg, out_rFin := wrapCType[C.float, float32](out_r)
1434+
out_rArg, out_rFin := wrapPtrCType[C.float, float32](out_r)
14351435
defer out_rFin()
14361436

1437-
out_gArg, out_gFin := wrapCType[C.float, float32](out_g)
1437+
out_gArg, out_gFin := wrapPtrCType[C.float, float32](out_g)
14381438
defer out_gFin()
14391439

1440-
out_bArg, out_bFin := wrapCType[C.float, float32](out_b)
1440+
out_bArg, out_bFin := wrapPtrCType[C.float, float32](out_b)
14411441
defer out_bFin()
14421442

14431443
C.ColorConvertHSVtoRGB(C.float(h), C.float(s), C.float(v), out_rArg, out_gArg, out_bArg)
14441444
}
14451445

14461446
func ColorConvertRGBtoHSV(r float32, g float32, b float32, out_h *float32, out_s *float32, out_v *float32) {
1447-
out_hArg, out_hFin := wrapCType[C.float, float32](out_h)
1447+
out_hArg, out_hFin := wrapPtrCType[C.float, float32](out_h)
14481448
defer out_hFin()
14491449

1450-
out_sArg, out_sFin := wrapCType[C.float, float32](out_s)
1450+
out_sArg, out_sFin := wrapPtrCType[C.float, float32](out_s)
14511451
defer out_sFin()
14521452

1453-
out_vArg, out_vFin := wrapCType[C.float, float32](out_v)
1453+
out_vArg, out_vFin := wrapPtrCType[C.float, float32](out_v)
14541454
defer out_vFin()
14551455

14561456
C.ColorConvertRGBtoHSV(C.float(r), C.float(g), C.float(b), out_hArg, out_sArg, out_vArg)
@@ -1557,7 +1557,7 @@ func Combo_StrV(label string, current_item *int32, items_separated_by_zeros stri
15571557
labelArg, labelFin := wrapString(label)
15581558
defer labelFin()
15591559

1560-
current_itemArg, current_itemFin := wrapCType[C.int, int32](current_item)
1560+
current_itemArg, current_itemFin := wrapPtrCType[C.int, int32](current_item)
15611561
defer current_itemFin()
15621562

15631563
items_separated_by_zerosArg, items_separated_by_zerosFin := wrapString(items_separated_by_zeros)
@@ -1622,7 +1622,7 @@ func DragFloatV(label string, v *float32, v_speed float32, v_min float32, v_max
16221622
labelArg, labelFin := wrapString(label)
16231623
defer labelFin()
16241624

1625-
vArg, vFin := wrapCType[C.float, float32](v)
1625+
vArg, vFin := wrapPtrCType[C.float, float32](v)
16261626
defer vFin()
16271627

16281628
formatArg, formatFin := wrapString(format)
@@ -1720,10 +1720,10 @@ func DragFloatRange2V(label string, v_current_min *float32, v_current_max *float
17201720
labelArg, labelFin := wrapString(label)
17211721
defer labelFin()
17221722

1723-
v_current_minArg, v_current_minFin := wrapCType[C.float, float32](v_current_min)
1723+
v_current_minArg, v_current_minFin := wrapPtrCType[C.float, float32](v_current_min)
17241724
defer v_current_minFin()
17251725

1726-
v_current_maxArg, v_current_maxFin := wrapCType[C.float, float32](v_current_max)
1726+
v_current_maxArg, v_current_maxFin := wrapPtrCType[C.float, float32](v_current_max)
17271727
defer v_current_maxFin()
17281728

17291729
formatArg, formatFin := wrapString(format)
@@ -1745,7 +1745,7 @@ func DragIntV(label string, v *int32, v_speed float32, v_min int32, v_max int32,
17451745
labelArg, labelFin := wrapString(label)
17461746
defer labelFin()
17471747

1748-
vArg, vFin := wrapCType[C.int, int32](v)
1748+
vArg, vFin := wrapPtrCType[C.int, int32](v)
17491749
defer vFin()
17501750

17511751
formatArg, formatFin := wrapString(format)
@@ -1843,10 +1843,10 @@ func DragIntRange2V(label string, v_current_min *int32, v_current_max *int32, v_
18431843
labelArg, labelFin := wrapString(label)
18441844
defer labelFin()
18451845

1846-
v_current_minArg, v_current_minFin := wrapCType[C.int, int32](v_current_min)
1846+
v_current_minArg, v_current_minFin := wrapPtrCType[C.int, int32](v_current_min)
18471847
defer v_current_minFin()
18481848

1849-
v_current_maxArg, v_current_maxFin := wrapCType[C.int, int32](v_current_max)
1849+
v_current_maxArg, v_current_maxFin := wrapPtrCType[C.int, int32](v_current_max)
18501850
defer v_current_maxFin()
18511851

18521852
formatArg, formatFin := wrapString(format)
@@ -2363,7 +2363,7 @@ func InputFloatV(label string, v *float32, step float32, step_fast float32, form
23632363
labelArg, labelFin := wrapString(label)
23642364
defer labelFin()
23652365

2366-
vArg, vFin := wrapCType[C.float, float32](v)
2366+
vArg, vFin := wrapPtrCType[C.float, float32](v)
23672367
defer vFin()
23682368

23692369
formatArg, formatFin := wrapString(format)
@@ -2449,7 +2449,7 @@ func InputIntV(label string, v *int32, step int32, step_fast int32, flags ImGuiI
24492449
labelArg, labelFin := wrapString(label)
24502450
defer labelFin()
24512451

2452-
vArg, vFin := wrapCType[C.int, int32](v)
2452+
vArg, vFin := wrapPtrCType[C.int, int32](v)
24532453
defer vFin()
24542454

24552455
return C.InputIntV(labelArg, vArg, C.int(step), C.int(step_fast), C.ImGuiInputTextFlags(flags)) == C.bool(true)
@@ -3004,7 +3004,7 @@ func RadioButton_IntPtr(label string, v *int32, v_button int32) bool {
30043004
labelArg, labelFin := wrapString(label)
30053005
defer labelFin()
30063006

3007-
vArg, vFin := wrapCType[C.int, int32](v)
3007+
vArg, vFin := wrapPtrCType[C.int, int32](v)
30083008
defer vFin()
30093009

30103010
return C.RadioButton_IntPtr(labelArg, vArg, C.int(v_button)) == C.bool(true)
@@ -3388,7 +3388,7 @@ func SliderAngleV(label string, v_rad *float32, v_degrees_min float32, v_degrees
33883388
labelArg, labelFin := wrapString(label)
33893389
defer labelFin()
33903390

3391-
v_radArg, v_radFin := wrapCType[C.float, float32](v_rad)
3391+
v_radArg, v_radFin := wrapPtrCType[C.float, float32](v_rad)
33923392
defer v_radFin()
33933393

33943394
formatArg, formatFin := wrapString(format)
@@ -3404,7 +3404,7 @@ func SliderFloatV(label string, v *float32, v_min float32, v_max float32, format
34043404
labelArg, labelFin := wrapString(label)
34053405
defer labelFin()
34063406

3407-
vArg, vFin := wrapCType[C.float, float32](v)
3407+
vArg, vFin := wrapPtrCType[C.float, float32](v)
34083408
defer vFin()
34093409

34103410
formatArg, formatFin := wrapString(format)
@@ -3489,7 +3489,7 @@ func SliderIntV(label string, v *int32, v_min int32, v_max int32, format string,
34893489
labelArg, labelFin := wrapString(label)
34903490
defer labelFin()
34913491

3492-
vArg, vFin := wrapCType[C.int, int32](v)
3492+
vArg, vFin := wrapPtrCType[C.int, int32](v)
34933493
defer vFin()
34943494

34953495
formatArg, formatFin := wrapString(format)
@@ -3831,7 +3831,7 @@ func VSliderFloatV(label string, size ImVec2, v *float32, v_min float32, v_max f
38313831
labelArg, labelFin := wrapString(label)
38323832
defer labelFin()
38333833

3834-
vArg, vFin := wrapCType[C.float, float32](v)
3834+
vArg, vFin := wrapPtrCType[C.float, float32](v)
38353835
defer vFin()
38363836

38373837
formatArg, formatFin := wrapString(format)
@@ -3847,7 +3847,7 @@ func VSliderIntV(label string, size ImVec2, v *int32, v_min int32, v_max int32,
38473847
labelArg, labelFin := wrapString(label)
38483848
defer labelFin()
38493849

3850-
vArg, vFin := wrapCType[C.int, int32](v)
3850+
vArg, vFin := wrapPtrCType[C.int, int32](v)
38513851
defer vFin()
38523852

38533853
formatArg, formatFin := wrapString(format)
@@ -4322,7 +4322,7 @@ func Combo_Str(label string, current_item *int32, items_separated_by_zeros strin
43224322
labelArg, labelFin := wrapString(label)
43234323
defer labelFin()
43244324

4325-
current_itemArg, current_itemFin := wrapCType[C.int, int32](current_item)
4325+
current_itemArg, current_itemFin := wrapPtrCType[C.int, int32](current_item)
43264326
defer current_itemFin()
43274327

43284328
items_separated_by_zerosArg, items_separated_by_zerosFin := wrapString(items_separated_by_zeros)
@@ -4351,7 +4351,7 @@ func DragFloat(label string, v *float32) bool {
43514351
labelArg, labelFin := wrapString(label)
43524352
defer labelFin()
43534353

4354-
vArg, vFin := wrapCType[C.float, float32](v)
4354+
vArg, vFin := wrapPtrCType[C.float, float32](v)
43554355
defer vFin()
43564356

43574357
return C.DragFloat(labelArg, vArg) == C.bool(true)
@@ -4412,10 +4412,10 @@ func DragFloatRange2(label string, v_current_min *float32, v_current_max *float3
44124412
labelArg, labelFin := wrapString(label)
44134413
defer labelFin()
44144414

4415-
v_current_minArg, v_current_minFin := wrapCType[C.float, float32](v_current_min)
4415+
v_current_minArg, v_current_minFin := wrapPtrCType[C.float, float32](v_current_min)
44164416
defer v_current_minFin()
44174417

4418-
v_current_maxArg, v_current_maxFin := wrapCType[C.float, float32](v_current_max)
4418+
v_current_maxArg, v_current_maxFin := wrapPtrCType[C.float, float32](v_current_max)
44194419
defer v_current_maxFin()
44204420

44214421
return C.DragFloatRange2(labelArg, v_current_minArg, v_current_maxArg) == C.bool(true)
@@ -4425,7 +4425,7 @@ func DragInt(label string, v *int32) bool {
44254425
labelArg, labelFin := wrapString(label)
44264426
defer labelFin()
44274427

4428-
vArg, vFin := wrapCType[C.int, int32](v)
4428+
vArg, vFin := wrapPtrCType[C.int, int32](v)
44294429
defer vFin()
44304430

44314431
return C.DragInt(labelArg, vArg) == C.bool(true)
@@ -4486,10 +4486,10 @@ func DragIntRange2(label string, v_current_min *int32, v_current_max *int32) boo
44864486
labelArg, labelFin := wrapString(label)
44874487
defer labelFin()
44884488

4489-
v_current_minArg, v_current_minFin := wrapCType[C.int, int32](v_current_min)
4489+
v_current_minArg, v_current_minFin := wrapPtrCType[C.int, int32](v_current_min)
44904490
defer v_current_minFin()
44914491

4492-
v_current_maxArg, v_current_maxFin := wrapCType[C.int, int32](v_current_max)
4492+
v_current_maxArg, v_current_maxFin := wrapPtrCType[C.int, int32](v_current_max)
44934493
defer v_current_maxFin()
44944494

44954495
return C.DragIntRange2(labelArg, v_current_minArg, v_current_maxArg) == C.bool(true)
@@ -4543,7 +4543,7 @@ func InputFloat(label string, v *float32) bool {
45434543
labelArg, labelFin := wrapString(label)
45444544
defer labelFin()
45454545

4546-
vArg, vFin := wrapCType[C.float, float32](v)
4546+
vArg, vFin := wrapPtrCType[C.float, float32](v)
45474547
defer vFin()
45484548

45494549
return C.InputFloat(labelArg, vArg) == C.bool(true)
@@ -4604,7 +4604,7 @@ func InputInt(label string, v *int32) bool {
46044604
labelArg, labelFin := wrapString(label)
46054605
defer labelFin()
46064606

4607-
vArg, vFin := wrapCType[C.int, int32](v)
4607+
vArg, vFin := wrapPtrCType[C.int, int32](v)
46084608
defer vFin()
46094609

46104610
return C.InputInt(labelArg, vArg) == C.bool(true)
@@ -4954,7 +4954,7 @@ func SliderAngle(label string, v_rad *float32) bool {
49544954
labelArg, labelFin := wrapString(label)
49554955
defer labelFin()
49564956

4957-
v_radArg, v_radFin := wrapCType[C.float, float32](v_rad)
4957+
v_radArg, v_radFin := wrapPtrCType[C.float, float32](v_rad)
49584958
defer v_radFin()
49594959

49604960
return C.SliderAngle(labelArg, v_radArg) == C.bool(true)
@@ -4964,7 +4964,7 @@ func SliderFloat(label string, v *float32, v_min float32, v_max float32) bool {
49644964
labelArg, labelFin := wrapString(label)
49654965
defer labelFin()
49664966

4967-
vArg, vFin := wrapCType[C.float, float32](v)
4967+
vArg, vFin := wrapPtrCType[C.float, float32](v)
49684968
defer vFin()
49694969

49704970
return C.SliderFloat(labelArg, vArg, C.float(v_min), C.float(v_max)) == C.bool(true)
@@ -5025,7 +5025,7 @@ func SliderInt(label string, v *int32, v_min int32, v_max int32) bool {
50255025
labelArg, labelFin := wrapString(label)
50265026
defer labelFin()
50275027

5028-
vArg, vFin := wrapCType[C.int, int32](v)
5028+
vArg, vFin := wrapPtrCType[C.int, int32](v)
50295029
defer vFin()
50305030

50315031
return C.SliderInt(labelArg, vArg, C.int(v_min), C.int(v_max)) == C.bool(true)
@@ -5164,7 +5164,7 @@ func VSliderFloat(label string, size ImVec2, v *float32, v_min float32, v_max fl
51645164
labelArg, labelFin := wrapString(label)
51655165
defer labelFin()
51665166

5167-
vArg, vFin := wrapCType[C.float, float32](v)
5167+
vArg, vFin := wrapPtrCType[C.float, float32](v)
51685168
defer vFin()
51695169

51705170
return C.VSliderFloat(labelArg, size.toC(), vArg, C.float(v_min), C.float(v_max)) == C.bool(true)
@@ -5174,7 +5174,7 @@ func VSliderInt(label string, size ImVec2, v *int32, v_min int32, v_max int32) b
51745174
labelArg, labelFin := wrapString(label)
51755175
defer labelFin()
51765176

5177-
vArg, vFin := wrapCType[C.int, int32](v)
5177+
vArg, vFin := wrapPtrCType[C.int, int32](v)
51785178
defer vFin()
51795179

51805180
return C.VSliderInt(labelArg, size.toC(), vArg, C.int(v_min), C.int(v_max)) == C.bool(true)

‎cimplot_funcs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ func Plot_BeginSubplotsV(title_id string, rows int32, cols int32, size ImVec2, f
255255
title_idArg, title_idFin := wrapString(title_id)
256256
defer title_idFin()
257257

258-
row_ratiosArg, row_ratiosFin := wrapCType[C.float, float32](row_ratios)
258+
row_ratiosArg, row_ratiosFin := wrapPtrCType[C.float, float32](row_ratios)
259259
defer row_ratiosFin()
260260

261-
col_ratiosArg, col_ratiosFin := wrapCType[C.float, float32](col_ratios)
261+
col_ratiosArg, col_ratiosFin := wrapPtrCType[C.float, float32](col_ratios)
262262
defer col_ratiosFin()
263263

264264
return C.Plot_BeginSubplotsV(title_idArg, C.int(rows), C.int(cols), size.toC(), C.ImPlotSubplotFlags(flags), row_ratiosArg, col_ratiosArg) == C.bool(true)
@@ -314,7 +314,7 @@ func Plot_ColormapSliderV(label string, t *float32, out *ImVec4, format string,
314314
labelArg, labelFin := wrapString(label)
315315
defer labelFin()
316316

317-
tArg, tFin := wrapCType[C.float, float32](t)
317+
tArg, tFin := wrapPtrCType[C.float, float32](t)
318318
defer tFin()
319319

320320
outArg, outFin := out.wrap()
@@ -1579,7 +1579,7 @@ func Plot_ColormapSlider(label string, t *float32) bool {
15791579
labelArg, labelFin := wrapString(label)
15801580
defer labelFin()
15811581

1582-
tArg, tFin := wrapCType[C.float, float32](t)
1582+
tArg, tFin := wrapPtrCType[C.float, float32](t)
15831583
defer tFin()
15841584

15851585
return C.Plot_ColormapSlider(labelArg, tArg) == C.bool(true)

‎cmd/codegen/arg_wrapper.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func floatW(arg ArgDef) (argType string, def string, varName string) {
4040

4141
func floatPtrW(arg ArgDef) (argType string, def string, varName string) {
4242
argType = "*float32"
43-
def = fmt.Sprintf(`%[1]sArg, %[1]sFin := wrapCType[C.float, float32](%[1]s)
43+
def = fmt.Sprintf(`%[1]sArg, %[1]sFin := wrapPtrCType[C.float, float32](%[1]s)
4444
defer %[1]sFin()`, arg.Name)
4545
varName = fmt.Sprintf("%sArg", arg.Name)
4646
return
@@ -83,14 +83,14 @@ func u8W(arg ArgDef) (argType string, def string, varName string) {
8383

8484
func u8PtrW(arg ArgDef) (argType string, def string, varName string) {
8585
argType = "*uint"
86-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[C.uint, byte](%[1]s)\ndefer %[1]sFin()", arg.Name)
86+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[C.uint, byte](%[1]s)\ndefer %[1]sFin()", arg.Name)
8787
varName = fmt.Sprintf("%sArg", arg.Name)
8888
return
8989
}
9090

9191
func u16PtrW(arg ArgDef) (argType string, def string, varName string) {
9292
argType = "*uint"
93-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[c.uint, uint16](%[1]s)\ndefer %[1]sFin()", arg.Name)
93+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[c.uint, uint16](%[1]s)\ndefer %[1]sFin()", arg.Name)
9494
varName = fmt.Sprintf("%sArg", arg.Name)
9595
return
9696
}
@@ -180,21 +180,21 @@ func intW(arg ArgDef) (argType string, def string, varName string) {
180180

181181
func int8PtrW(arg ArgDef) (argType string, def string, varName string) {
182182
argType = "*byte"
183-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[C.int, int8](%[1]s)\ndefer %[1]sFin()", arg.Name)
183+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[C.int, int8](%[1]s)\ndefer %[1]sFin()", arg.Name)
184184
varName = fmt.Sprintf("%sArg", arg.Name)
185185
return
186186
}
187187

188188
func int16PtrW(arg ArgDef) (argType string, def string, varName string) {
189189
argType = "*int"
190-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[C.int, int16](%[1]s)\ndefer %[1]sFin()", arg.Name)
190+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[C.int, int16](%[1]s)\ndefer %[1]sFin()", arg.Name)
191191
varName = fmt.Sprintf("%sArg", arg.Name)
192192
return
193193
}
194194

195195
func intPtrW(arg ArgDef) (argType string, def string, varName string) {
196196
argType = "*int32"
197-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[C.int, int32](%[1]s)\ndefer %[1]sFin()", arg.Name)
197+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[C.int, int32](%[1]s)\ndefer %[1]sFin()", arg.Name)
198198
varName = fmt.Sprintf("%sArg", arg.Name)
199199
return
200200
}
@@ -211,7 +211,7 @@ func uintW(arg ArgDef) (argType string, def string, varName string) {
211211

212212
func uintPtrW(arg ArgDef) (argType string, def string, varName string) {
213213
argType = "*uint32"
214-
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapCType[C.uint, uint32](%[1]s)\ndefer %[1]sFin()", arg.Name)
214+
def = fmt.Sprintf("%[1]sArg, %[1]sFin := wrapPtrCType[C.uint, uint32](%[1]s)\ndefer %[1]sFin()", arg.Name)
215215
varName = fmt.Sprintf("%sArg", arg.Name)
216216
return
217217
}

0 commit comments

Comments
 (0)