Skip to content

Commit

Permalink
CI: revert to beta3 because rc1 breaks headless
Browse files Browse the repository at this point in the history
  • Loading branch information
pkdawson committed Jul 26, 2024
1 parent e7108a3 commit bb4669b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gdext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:


env:
vcpkg_tag: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01 # 2024.04.26
vcpkg_tag: 1de2026f28ead93ff1773e6e680387643e914ea1 # 2024.07.12

jobs:
windows:
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
gdver: ["4.2.2", "4.3.0-rc.1"]
gdver: ["4.2.2", "4.3.0-beta.3"]
include:
- os: ubuntu-latest
name: 🐧GdsGameProject
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
gdver: ["4.2.2", "4.3.0-rc.1"]
gdver: ["4.2.2", "4.3.0-beta.3"]
include:
- os: ubuntu-latest
name: 🐧🧪GDScript
Expand Down Expand Up @@ -415,7 +415,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
gdver: ["4.2.2", "4.3.0-rc.1"]
gdver: ["4.2.2", "4.3.0-beta.3"]
include:
- os: ubuntu-latest
name: 🐧🧪C#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/godot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
gdver: ["4.2.2", "4.3.0-rc.1"]
gdver: ["4.2.2", "4.3.0-beta.3"]
include:
- os: ubuntu-latest
name: 🐧🧪C# Only
Expand Down
64 changes: 32 additions & 32 deletions doc/examples/GdsDemo/demo.gd
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@ var anim_counter := 0
var wc_topmost: ImGuiWindowClassPtr

func _ready():
var io := ImGui.GetIO()
io.ConfigFlags |= ImGui.ConfigFlags_ViewportsEnable
var io := ImGui.GetIO()
io.ConfigFlags |= ImGui.ConfigFlags_ViewportsEnable

wc_topmost = ImGuiWindowClassPtr.new()
wc_topmost.ViewportFlagsOverrideSet = ImGui.ViewportFlags_TopMost | ImGui.ViewportFlags_NoAutoMerge
wc_topmost = ImGuiWindowClassPtr.new()
wc_topmost.ViewportFlagsOverrideSet = ImGui.ViewportFlags_TopMost | ImGui.ViewportFlags_NoAutoMerge

var style := ImGui.GetStyle()
style.Colors[ImGui.Col_PlotHistogram] = Color.REBECCA_PURPLE
style.Colors[ImGui.Col_PlotHistogramHovered] = Color.SLATE_BLUE
var style := ImGui.GetStyle()
style.Colors[ImGui.Col_PlotHistogram] = Color.REBECCA_PURPLE
style.Colors[ImGui.Col_PlotHistogramHovered] = Color.SLATE_BLUE

func _process(_delta: float) -> void:
ImGui.ShowDemoWindow()

ImGui.Begin("hello")
ImGui.Text("hello from GDScript")
ImGui.DragFloat("myfloat", myfloat)
ImGui.Text(str(myfloat[0]))
ImGui.InputText("mystr", mystr, 32)
ImGui.Text(mystr[0])

ImGui.PlotHistogram("histogram", values, values.size())
ImGui.PlotLines("lines", values, values.size())
ImGui.ListBox("choices", current_item, items, items.size())
ImGui.Combo("combo", current_item, items)
ImGui.Text("choice = %s" % items[current_item[0]])
ImGui.End()

ImGui.SetNextWindowClass(wc_topmost)
ImGui.SetNextWindowSize(Vector2(200, 200), ImGui.Cond_Once)
ImGui.Begin("topmost viewport window")
ImGui.TextWrapped("when this is a viewport window outside the main window, it will stay on top")
ImGui.End()
ImGui.ShowDemoWindow()

ImGui.Begin("hello")
ImGui.Text("hello from GDScript")
ImGui.DragFloat("myfloat", myfloat)
ImGui.Text(str(myfloat[0]))
ImGui.InputText("mystr", mystr, 32)
ImGui.Text(mystr[0])

ImGui.PlotHistogram("histogram", values, values.size())
ImGui.PlotLines("lines", values, values.size())
ImGui.ListBox("choices", current_item, items, items.size())
ImGui.Combo("combo", current_item, items)
ImGui.Text("choice = %s" % items[current_item[0]])
ImGui.End()

ImGui.SetNextWindowClass(wc_topmost)
ImGui.SetNextWindowSize(Vector2(200, 200), ImGui.Cond_Once)
ImGui.Begin("topmost viewport window")
ImGui.TextWrapped("when this is a viewport window outside the main window, it will stay on top")
ImGui.End()

func _physics_process(_delta: float) -> void:
anim_counter += 1
if anim_counter >= 10:
anim_counter = 0
values.push_back(values.pop_front())
anim_counter += 1
if anim_counter >= 10:
anim_counter = 0
values.push_back(values.pop_front())

0 comments on commit bb4669b

Please sign in to comment.