Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GLControl #3386

Merged
merged 25 commits into from
May 11, 2020
Merged

GLControl #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
60a2e37
Refactored GPU acceleration, implemented OpelGlTextureBitmap
kekekeks Dec 20, 2019
021995e
Implemented GlControlBase
kekekeks Dec 22, 2019
df2cb9d
Fixed imports
kekekeks Dec 22, 2019
565ac31
Properly restore the previous EGL context
kekekeks Dec 23, 2019
ffface8
Fixed EGLDisplay initialization
kekekeks Dec 23, 2019
633ab61
Fixed eglWaitNative usage
kekekeks Dec 23, 2019
8115941
Make OpenGlControlBase GLES2-compatible
kekekeks Dec 23, 2019
731b233
Made OpenGlPage GLES2-compatible
kekekeks Dec 23, 2019
adf943c
I don't know anymore what I'm doing and why
kekekeks Dec 23, 2019
8d3b418
Merge remote-tracking branch 'origin/master' into glcontrol
kekekeks Mar 4, 2020
170eb56
Better error and cleanup handling
kekekeks Mar 4, 2020
d9387b4
Shader GLES compatibility fixes
kekekeks Mar 4, 2020
1dea1a3
GLES compat
kekekeks Mar 4, 2020
db3e278
OSX support
kekekeks Mar 4, 2020
3267c8f
Proper page position
kekekeks Mar 4, 2020
dd481fd
Bind texture before resizing. Also reset texture and renderbuffer to …
kekekeks Mar 8, 2020
e2bde71
Refactored GL version and context management
kekekeks May 4, 2020
166ce78
Merge branch 'master' into glcontrol
kekekeks May 4, 2020
ce01832
Support for conditional gl imports
kekekeks May 8, 2020
861b417
Moved non-mandatory gl functions to a demo-specific gl interface
kekekeks May 8, 2020
118dcdb
X11
kekekeks May 8, 2020
c8615cb
OpenGL 4.0 fix
kekekeks May 8, 2020
d3cde7c
Removed duplicated code
kekekeks May 11, 2020
d0fdce3
Merge remote-tracking branch 'origin/master' into glcontrol
kekekeks May 11, 2020
d9c5bbb
Updates for master
kekekeks May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions samples/ControlCatalog.NetCore/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Threading;
using Avalonia;
using Avalonia.ReactiveUI;
using Avalonia.Dialogs;
using Avalonia.OpenGL;

namespace ControlCatalog.NetCore
{
Expand Down
4 changes: 3 additions & 1 deletion samples/ControlCatalog/ControlCatalog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Update="**\*.xaml.cs">
Expand All @@ -17,6 +18,7 @@
<EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
<EmbeddedResource Include="Assets\Fonts\SourceSansPro-Italic.ttf" />
<EmbeddedResource Include="Assets\Fonts\SourceSansPro-Regular.ttf" />
<EmbeddedResource Include="Pages\teapot.bin" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/ControlCatalog/MainView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<TabItem Header="Menu"><pages:MenuPage/></TabItem>
<TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
<TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
<TabItem Header="OpenGL"><pages:OpenGlPage/></TabItem>
<TabItem Header="Pointers (Touch)"><pages:PointersPage/></TabItem>
<TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
<TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
Expand Down
29 changes: 29 additions & 0 deletions samples/ControlCatalog/Pages/OpenGlPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlCatalog.Pages.OpenGlPage"
xmlns:pages="clr-namespace:ControlCatalog.Pages">
<Grid>
<pages:OpenGlPageControl x:Name="GL"/>
<StackPanel>
<TextBlock Text="{Binding #GL.Info}"/>
</StackPanel>
<Grid ColumnDefinitions="*,Auto" Margin="20">
<StackPanel Grid.Column="1" MinWidth="300">
<TextBlock>Yaw</TextBlock>
<Slider Value="{Binding Yaw, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
<TextBlock>Pitch</TextBlock>
<Slider Value="{Binding Pitch, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
<TextBlock>Roll</TextBlock>
<Slider Value="{Binding Roll, Mode=TwoWay, ElementName=GL}" Maximum="10"/>
<StackPanel Orientation="Horizontal">
<TextBlock FontWeight="Bold" Foreground="#C000C0">D</TextBlock>
<TextBlock FontWeight="Bold" Foreground="#00C090">I</TextBlock>
<TextBlock FontWeight="Bold" Foreground="#90C000">S</TextBlock>
<TextBlock FontWeight="Bold" Foreground="#C09000">C</TextBlock>
<TextBlock FontWeight="Bold" Foreground="#00C090">O</TextBlock>
</StackPanel>
<Slider Value="{Binding Disco, Mode=TwoWay, ElementName=GL}" Maximum="1"/>
</StackPanel>
</Grid>
</Grid>
</UserControl>
Loading