mirror of
https://github.com/raylib-cs/raylib-cs
synced 2025-04-03 11:09:40 -04:00
Review and cleanup
- General cleanup. - Fixed missing functions from raymath. - Nuget info part of project file.
This commit is contained in:
parent
a9da337c0e
commit
fc0527a2ef
3
.gitignore
vendored
3
.gitignore
vendored
@ -16,11 +16,13 @@
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
*.exe
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Build results
|
||||
[Bb]in/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
@ -29,6 +31,7 @@ bld/
|
||||
[Dd]ebug
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
[Ee]xamples/
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
.vs/
|
||||
|
||||
@ -3,10 +3,25 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<RootNamespace>Bindings</RootNamespace>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<Description>Testing C# bindings for raylib, a simple and easy-to-use library to learn videogames programming.</Description>
|
||||
<PackageLicenseUrl>https://github.com/ChrisDill/Raylib-cs/blob/master/LICENSE</PackageLicenseUrl>
|
||||
<PackageIconUrl>https://github.com/ChrisDill/Raylib-cs/blob/master/Logo/raylib-cs.ico</PackageIconUrl>
|
||||
<Copyright>Copyright 2018</Copyright>
|
||||
<PackageProjectUrl>https://github.com/ChrisDill/Raylib-cs</PackageProjectUrl>
|
||||
<PackageReleaseNotes>Made for raylib 2.0</PackageReleaseNotes>
|
||||
<PackageTags>raylib csharp binding opengl gamedev</PackageTags>
|
||||
<RepositoryUrl>https://github.com/ChrisDill/Raylib-cs</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<OutputPath>bin\Debug</OutputPath>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Memory" Version="4.5.1" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
* Original - https://github.com/raysan5/raylib/blob/master/src/raylib.h
|
||||
*
|
||||
**********************************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@ -431,9 +430,6 @@ namespace Raylib
|
||||
public Texture2D depth;
|
||||
}
|
||||
|
||||
// RenderTexture type, same as RenderTexture2D
|
||||
// typedef RenderTexture2D RenderTexture;
|
||||
|
||||
// Font character info
|
||||
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
|
||||
public struct CharInfo
|
||||
@ -512,6 +508,7 @@ namespace Raylib
|
||||
public int vertexCount;
|
||||
public int triangleCount;
|
||||
|
||||
public Span<float> Vertices => new Span<float>(vertices.ToPointer(), vertexCount * 3);
|
||||
public IntPtr vertices;
|
||||
public IntPtr texcoords;
|
||||
public IntPtr texcoords2;
|
||||
@ -553,9 +550,9 @@ namespace Raylib
|
||||
public Color color;
|
||||
public float value;
|
||||
}
|
||||
|
||||
public unsafe struct _MaterialMap_e_FixedBuffer
|
||||
{
|
||||
|
||||
public MaterialMap maps0;
|
||||
public MaterialMap maps1;
|
||||
public MaterialMap maps2;
|
||||
@ -578,17 +575,13 @@ namespace Raylib
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Material type (generic)
|
||||
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
|
||||
public struct Material
|
||||
{
|
||||
|
||||
|
||||
|
||||
public Shader shader;
|
||||
|
||||
public _MaterialMap_e_FixedBuffer maps;
|
||||
|
||||
public IntPtr param;
|
||||
}
|
||||
|
||||
|
||||
@ -24,7 +24,12 @@ namespace Raylib
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
// extensions
|
||||
public Vector2(float value)
|
||||
{
|
||||
this.x = value;
|
||||
this.y = value;
|
||||
}
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return (obj is Vector2) && Equals((Vector2)obj);
|
||||
@ -39,36 +44,25 @@ namespace Raylib
|
||||
{
|
||||
return "Vector2(" + x + " " + y + ")";
|
||||
}
|
||||
|
||||
public static bool operator ==(Vector2 v1, Vector2 v2)
|
||||
|
||||
public static Vector2 Zero
|
||||
{
|
||||
return (v1.x == v2.x && v1.y == v2.y);
|
||||
get { return Raylib.Vector2Zero(); }
|
||||
}
|
||||
|
||||
public static bool operator !=(Vector2 v1, Vector2 v2)
|
||||
public static Vector2 One
|
||||
{
|
||||
return !(v1 == v2);
|
||||
get { return Raylib.Vector2One(); }
|
||||
}
|
||||
|
||||
public static bool operator >(Vector2 v1, Vector2 v2)
|
||||
public static Vector2 UnitX
|
||||
{
|
||||
return v1.x > v2.x && v1.y > v2.y;
|
||||
get { return new Vector2(1, 0); }
|
||||
}
|
||||
|
||||
public static bool operator <(Vector2 v1, Vector2 v2)
|
||||
public static Vector2 UnitY
|
||||
{
|
||||
return v1.x < v2.x && v1.y < v2.y;
|
||||
}
|
||||
|
||||
// utility for c functions Vector2Zero() -> Vector2.Zero() etc
|
||||
public static Vector2 Zero()
|
||||
{
|
||||
return Raylib.Vector2Zero();
|
||||
}
|
||||
|
||||
public static Vector2 One()
|
||||
{
|
||||
return Raylib.Vector2One();
|
||||
get { return new Vector2(0, 1); }
|
||||
}
|
||||
|
||||
public static float Length(Vector2 v)
|
||||
@ -91,12 +85,12 @@ namespace Raylib
|
||||
return Raylib.Vector2Angle(v1, v2);
|
||||
}
|
||||
|
||||
public static Vector2 Scale(Vector2 v, float scale)
|
||||
public static Vector2 Scale(Vector2 v, float scale)
|
||||
{
|
||||
return Raylib.Vector2Scale(v, scale);
|
||||
}
|
||||
|
||||
public static Vector2 Negate(Vector2 v)
|
||||
public static Vector2 Negate(Vector2 v)
|
||||
{
|
||||
return Raylib.Vector2Negate(v);
|
||||
}
|
||||
@ -105,30 +99,70 @@ namespace Raylib
|
||||
{
|
||||
return Raylib.Vector2Divide(v, div);
|
||||
}
|
||||
|
||||
|
||||
public static Vector2 Normalize(Vector2 v)
|
||||
{
|
||||
{
|
||||
return Raylib.Vector2Normalize(v);
|
||||
}
|
||||
|
||||
// operators
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Add")]
|
||||
public static extern Vector2 operator +(Vector2 v1, Vector2 v3);
|
||||
#region Public Static Operators
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Subtract")]
|
||||
public static extern Vector2 operator -(Vector2 v1, Vector2 v3);
|
||||
public static bool operator ==(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return (v1.x == v2.x && v1.y == v2.y);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2MultiplyV")]
|
||||
public static extern Vector2 operator *(Vector2 v1, Vector2 v3);
|
||||
public static bool operator !=(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return !(v1 == v2);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Scale")]
|
||||
public static extern Vector2 operator *(Vector2 v1, float scale);
|
||||
public static bool operator >(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return v1.x > v2.x && v1.y > v2.y;
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Divide")]
|
||||
public static extern Vector2 operator /(Vector2 v1, Vector2 v3);
|
||||
public static bool operator <(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return v1.x < v2.x && v1.y < v2.y;
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Negate")]
|
||||
public static extern Vector2 operator -(Vector2 v1);
|
||||
public static Vector2 operator +(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return Raylib.Vector2Add(v1, v2);
|
||||
}
|
||||
|
||||
public static Vector2 operator -(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return Raylib.Vector2Subtract(v1, v2);
|
||||
}
|
||||
|
||||
public static Vector2 operator *(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return Raylib.Vector2Multiplyv(v1, v2);
|
||||
}
|
||||
|
||||
public static Vector2 operator *(Vector2 v, float scale)
|
||||
{
|
||||
return Raylib.Vector2Scale(v, scale);
|
||||
}
|
||||
|
||||
public static Vector2 operator /(Vector2 v1, Vector2 v2)
|
||||
{
|
||||
return Raylib.Vector2DivideV(v1, v2);
|
||||
}
|
||||
|
||||
public static Vector2 operator /(Vector2 v1, float div)
|
||||
{
|
||||
return Raylib.Vector2Divide(v1, div);
|
||||
}
|
||||
|
||||
public static Vector2 operator -(Vector2 v1)
|
||||
{
|
||||
return Raylib.Vector2Negate(v1);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
// Vector3 type
|
||||
@ -145,6 +179,14 @@ namespace Raylib
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
public Vector3(float value)
|
||||
{
|
||||
this.x = value;
|
||||
this.y = value;
|
||||
this.z = value;
|
||||
}
|
||||
|
||||
// extensions
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return (obj is Vector3) && Equals((Vector3)obj);
|
||||
@ -160,6 +202,33 @@ namespace Raylib
|
||||
return "Vector3(" + x + " " + y + " " + z + ")";
|
||||
}
|
||||
|
||||
public static Vector3 Zero
|
||||
{
|
||||
get { return Raylib.Vector3Zero(); }
|
||||
}
|
||||
|
||||
public static Vector3 One
|
||||
{
|
||||
get { return Raylib.Vector3One(); }
|
||||
}
|
||||
|
||||
public static Vector3 UnitX
|
||||
{
|
||||
get { return new Vector3(1, 0, 0); }
|
||||
}
|
||||
|
||||
public static Vector3 UnitY
|
||||
{
|
||||
get { return new Vector3(0, 1, 0); }
|
||||
}
|
||||
|
||||
public static Vector3 UnitZ
|
||||
{
|
||||
get { return new Vector3(0, 0, 1); }
|
||||
}
|
||||
|
||||
#region Public Static Operators
|
||||
|
||||
public static bool operator ==(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return (v1.x == v2.x && v1.y == v2.y && v1.z == v2.z);
|
||||
@ -170,65 +239,52 @@ namespace Raylib
|
||||
return !(v1 == v2);
|
||||
}
|
||||
|
||||
/*public bool operator >(Vector2 v1, Vector2 v2)
|
||||
public static bool operator >(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return v1.x > v2.x && v1.y > v2.y;
|
||||
return v1.x > v2.x && v1.y > v2.y && v1.z > v2.z;
|
||||
}
|
||||
|
||||
public static bool operator <(Vector2 v1, Vector2 v2)
|
||||
public static bool operator <(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return v1.x < v2.x && v1.y < v2.y;
|
||||
}*/
|
||||
return v1.x < v2.x && v1.y < v2.y && v1.z < v2.z;
|
||||
}
|
||||
|
||||
// utility for c functions Vector3Zero -> Zero etc
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Zero")]
|
||||
public static extern Vector3 Zero();
|
||||
public static Vector3 operator +(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return Raylib.Vector3Add(v1, v2);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3One")]
|
||||
public static extern Vector3 One();
|
||||
public static Vector3 operator -(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return Raylib.Vector3Subtract(v1, v2);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Add")]
|
||||
public static extern Vector3 operator +(Vector3 v1, Vector3 v3);
|
||||
public static Vector3 operator *(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return Raylib.Vector3MultiplyV(v1, v2);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Subtract")]
|
||||
public static extern Vector3 operator -(Vector3 v1, Vector3 v3);
|
||||
public static Vector3 operator *(Vector3 v, float scale)
|
||||
{
|
||||
return Raylib.Vector3Scale(v, scale);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Length")]
|
||||
public static extern float Length(Vector3 v);
|
||||
public static Vector3 operator /(Vector3 v1, Vector3 v2)
|
||||
{
|
||||
return Raylib.Vector3DivideV(v1, v2);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3DotProduct")]
|
||||
public static extern float DotProduct(Vector3 v1, Vector3 v3);
|
||||
public static Vector3 operator /(Vector3 v1, float div)
|
||||
{
|
||||
return Raylib.Vector3Divide(v1, div);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Distance")]
|
||||
public static extern float Distance(Vector3 v1, Vector3 v3);
|
||||
public static Vector3 operator -(Vector3 v1)
|
||||
{
|
||||
return Raylib.Vector3Negate(v1);
|
||||
}
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Angle")]
|
||||
public static extern float Angle(Vector3 v1, Vector3 v3);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Scale")]
|
||||
public static extern Vector3 Scale(Vector3 v, float scale);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Negate")]
|
||||
public static extern Vector3 Negate(Vector3 v);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Divide")]
|
||||
public static extern Vector3 Divide(Vector3 v, float div);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Normalize")]
|
||||
public static extern Vector3 Normalize(Vector3 v);
|
||||
|
||||
// operators
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3MultiplyV")]
|
||||
public static extern Vector3 operator *(Vector3 v1, Vector3 v3);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Multiply")]
|
||||
public static extern Vector3 operator *(Vector3 v1, float scale);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Divide")]
|
||||
public static extern Vector3 operator /(Vector3 v1, Vector3 v3);
|
||||
|
||||
[DllImport(Raylib.nativeLibName, EntryPoint = "Vector3Negate")]
|
||||
public static extern Vector3 operator -(Vector3 v1);
|
||||
#endregion
|
||||
}
|
||||
|
||||
// Vector4 type
|
||||
@ -247,6 +303,14 @@ namespace Raylib
|
||||
this.w = w;
|
||||
}
|
||||
|
||||
public Vector4(float value)
|
||||
{
|
||||
this.x = value;
|
||||
this.y = value;
|
||||
this.z = value;
|
||||
this.w = value;
|
||||
}
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return (obj is Vector4) && Equals((Vector4)obj);
|
||||
@ -336,9 +400,13 @@ namespace Raylib
|
||||
public static extern float Vector2Angle(Vector2 v1, Vector2 v2);
|
||||
|
||||
// Scale vector (multiply by value)
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2Scale(Vector2 v, float scale);
|
||||
|
||||
// Multiply vector by a vector
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2Multiplyv(Vector2 v1, Vector2 v2);
|
||||
|
||||
// Negate vector
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2Negate(Vector2 v);
|
||||
@ -347,6 +415,10 @@ namespace Raylib
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2Divide(Vector2 v, float div);
|
||||
|
||||
// Divide vector by a vector
|
||||
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2DivideV(Vector2 v1, Vector2 v2);
|
||||
|
||||
// Normalize provided vector
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector2 Vector2Normalize(Vector2 v);
|
||||
@ -403,6 +475,14 @@ namespace Raylib
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector3 Vector3Negate(Vector3 v);
|
||||
|
||||
// Divide vector by a float value
|
||||
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector3 Vector3Divide(Vector3 v, float div);
|
||||
|
||||
// Divide vector by a vector
|
||||
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector3 Vector3DivideV(Vector3 v1, Vector3 v2);
|
||||
|
||||
// Normalize provided vector
|
||||
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern Vector3 Vector3Normalize(Vector3 v);
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -3,7 +3,7 @@ using System.IO;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace Raylibcs
|
||||
namespace Generator
|
||||
{
|
||||
static class Generator
|
||||
{
|
||||
@ -36,10 +36,6 @@ namespace Raylibcs
|
||||
{
|
||||
//Console.WriteLine(match.Value);
|
||||
}
|
||||
// Console.WriteLine(matches.Count);
|
||||
//return input;
|
||||
|
||||
//var match = Regex.IsMatch(input, pattern);
|
||||
return Regex.Replace(input, pattern, replacement);
|
||||
}
|
||||
|
||||
@ -71,9 +67,6 @@ namespace Raylibcs
|
||||
//output += text;
|
||||
output += "\n}";
|
||||
|
||||
// convert syntax to c#
|
||||
//output = template.Replace("{{ CONTENT }}", output);
|
||||
|
||||
output = output.Replace("(void)", "()");
|
||||
output = output.Replace("const char *", "string ");
|
||||
output = output.Replace("const char * ", "string");
|
||||
@ -99,12 +92,6 @@ namespace Raylibcs
|
||||
// Design is close to raylib so only a few changes needed
|
||||
public static void ProcessExample(string file, string folder, string path)
|
||||
{
|
||||
// fix #defines
|
||||
// fix structs
|
||||
// fix enums
|
||||
// remove return 0 for main
|
||||
// fix {} initialization(not all cases covered)
|
||||
|
||||
// load and setup
|
||||
var fileName = Path.GetFileNameWithoutExtension(file);
|
||||
var text = File.ReadAllText(file);
|
||||
|
||||
@ -1,41 +1,46 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace Raylibcs
|
||||
namespace Generator
|
||||
{
|
||||
/// <summary>
|
||||
/// Rough generator for Raylib-cs to help automate binding + porting raylib code
|
||||
/// Output will still need to be modified
|
||||
/// Rough generator for creating bindings and ports for raylib
|
||||
/// Not a full parser so generated code is not perfect
|
||||
/// </summary>
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine("Raylib-cs generator");
|
||||
|
||||
GenerateBindings();
|
||||
GenerateExamples();
|
||||
GenerateTemplates();
|
||||
GenerateGames();
|
||||
|
||||
// GeneratePort("Examples");
|
||||
// GeneratePort("Templates");
|
||||
// GeneratePort("Games");
|
||||
Console.WriteLine("Finished generating. Enjoy! :)");
|
||||
Console.WriteLine("Press enter to exit");
|
||||
Console.Read();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Requires raylib headers
|
||||
/// </summary>
|
||||
static void GenerateBindings()
|
||||
{
|
||||
Console.WriteLine("Generating bindings");
|
||||
Generator.Process("raylib.h", "RLAPI");
|
||||
Generator.Process("raymath.h", "RMDEF");
|
||||
Generator.Process("physac.h", "PDEF");
|
||||
Generator.Process("rlgl.h", "RLGL");
|
||||
}
|
||||
|
||||
static void GenerateExamples()
|
||||
/// <summary>
|
||||
/// Porting C to C#
|
||||
/// </summary>
|
||||
static void GeneratePort(string folder)
|
||||
{
|
||||
Console.WriteLine("Generating examples");
|
||||
|
||||
// output folder
|
||||
var folder = "Examples";
|
||||
Directory.CreateDirectory(folder);
|
||||
var path = Generator.RaylibDirectory + folder.ToLower();
|
||||
var dirs = Directory.GetDirectories(path);
|
||||
@ -51,75 +56,5 @@ namespace Raylibcs
|
||||
Generator.ProcessExample(file, folder, folder + "//" + name);
|
||||
}
|
||||
}
|
||||
|
||||
static void GenerateTemplates()
|
||||
{
|
||||
Console.WriteLine("Generating templates");
|
||||
|
||||
// output folder
|
||||
var folder = "Templates";
|
||||
Directory.CreateDirectory(folder);
|
||||
var path = Generator.RaylibDirectory2 + folder.ToLower();
|
||||
var dirs = Directory.GetDirectories(path);
|
||||
|
||||
// copy folder structure
|
||||
foreach (string dirPath in Directory.GetDirectories(path, "*",
|
||||
SearchOption.AllDirectories))
|
||||
Directory.CreateDirectory(dirPath.Replace(path, folder));
|
||||
|
||||
// process all c files in directory and output result
|
||||
var files = Directory.GetFiles(path, "*.c", SearchOption.AllDirectories);
|
||||
foreach (var file in files)
|
||||
{
|
||||
var dirName = Path.GetDirectoryName(file);
|
||||
var name = new DirectoryInfo(dirName).Name;
|
||||
if (name == folder.ToLower())
|
||||
{
|
||||
Generator.ProcessExample(file, folder, folder);
|
||||
}
|
||||
else
|
||||
{
|
||||
var t = file;
|
||||
t = folder + t.Replace(path, "");
|
||||
t = new FileInfo(t).Directory.FullName;
|
||||
Generator.ProcessExample(file, folder, t);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void GenerateGames()
|
||||
{
|
||||
Console.WriteLine("Generating games");
|
||||
|
||||
// output folder
|
||||
var folder = "Games";
|
||||
Directory.CreateDirectory(folder);
|
||||
var path = Generator.RaylibDirectory2 + folder.ToLower();
|
||||
var dirs = Directory.GetDirectories(path);
|
||||
|
||||
// copy folder structure
|
||||
foreach (string dirPath in Directory.GetDirectories(path, "*",
|
||||
SearchOption.AllDirectories))
|
||||
Directory.CreateDirectory(dirPath.Replace(path, folder));
|
||||
|
||||
// process all c files in directory and output result
|
||||
var files = Directory.GetFiles(path, "*.c", SearchOption.AllDirectories);
|
||||
foreach (var file in files)
|
||||
{
|
||||
var dirName = Path.GetDirectoryName(file);
|
||||
var name = new DirectoryInfo(dirName).Name;
|
||||
if (name == folder.ToLower())
|
||||
{
|
||||
Generator.ProcessExample(file, folder, folder);
|
||||
}
|
||||
else
|
||||
{
|
||||
var t = file;
|
||||
t = folder + t.Replace(path, "");
|
||||
t = new FileInfo(t).Directory.FullName;
|
||||
Generator.ProcessExample(file, folder, t);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Raylib-cs</id>
|
||||
<version>1.0</version>
|
||||
<authors>Chris Dill</authors>
|
||||
<owners>Chris Dill</owners>
|
||||
<licenseUrl>https://github.com/ChrisDill/Raylib-cs/blob/master/LICENSE</licenseUrl>
|
||||
<projectUrl>https://github.com/ChrisDill/Raylib-cs</projectUrl>
|
||||
<iconUrl>https://github.com/ChrisDill/Raylib-cs/blob/master/Logo/raylib-cs.ico</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Testing C# bindings for raylib, a simple and easy-to-use library to learn videogames programming.</description>
|
||||
<releaseNotes>Made for raylib 2.0</releaseNotes>
|
||||
<copyright>Copyright 2018</copyright>
|
||||
<tags>raylib csharp binding opengl gamedev</tags>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="Bindings/bin/Debug/Bindings.dll" target="lib\net461"></file>
|
||||
<file src="Examples/bin/Debug/raylib.dll" target="lib\net461"></file>
|
||||
</files>
|
||||
</package>
|
||||
@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27703.2035
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{063F21F1-12D3-41C6-B598-125C725955B1}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bindings", "Bindings\Bindings.csproj", "{9F30944C-415B-4763-91C7-81721117879D}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bindings", "Bindings\Bindings.csproj", "{363D543C-F690-41AA-8215-2D368EA7434E}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{063F21F1-12D3-41C6-B598-125C725955B1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}"
|
||||
EndProject
|
||||
@ -19,6 +19,18 @@ Global
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9F30944C-415B-4763-91C7-81721117879D}.Release|x86.Build.0 = Release|Any CPU
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
@ -31,18 +43,6 @@ Global
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Release|x64.Build.0 = Release|Any CPU
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{063F21F1-12D3-41C6-B598-125C725955B1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|x64.Build.0 = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{363D543C-F690-41AA-8215-2D368EA7434E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
|
||||
</startup>
|
||||
</configuration>
|
||||
</configuration>
|
||||
|
||||
@ -8,9 +8,6 @@ class Program
|
||||
{
|
||||
public static void Main()
|
||||
{
|
||||
//RayForms.Run();
|
||||
//return;
|
||||
|
||||
// Initialization
|
||||
//--------------------------------------------------------------------------------------
|
||||
int screenWidth = 800;
|
||||
@ -19,6 +16,9 @@ class Program
|
||||
// SetConfigFlags((int)Flag.WINDOW_UNDECORATED);
|
||||
InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window");
|
||||
|
||||
var model = LoadModel("bridge.obj");
|
||||
model.mesh.Vertices[0] = 5f;
|
||||
|
||||
SetTargetFPS(60);
|
||||
//--------------------------------------------------------------------------------------
|
||||
|
||||
@ -45,6 +45,6 @@ class Program
|
||||
// De-Initialization
|
||||
//--------------------------------------------------------------------------------------
|
||||
CloseWindow(); // Close window and OpenGL context
|
||||
//--------------------------------------------------------------------------------------
|
||||
//--------------------------------------------------------------------------------------
|
||||
}
|
||||
}
|
||||
|
||||
102
Test/RayForms.cs
102
Test/RayForms.cs
@ -1,102 +0,0 @@
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Threading;
|
||||
using System.Windows.Forms;
|
||||
using static Raylib.Raylib;
|
||||
|
||||
namespace Raylib
|
||||
{
|
||||
public partial class RayForms : Form
|
||||
{
|
||||
private Panel gamePanel;
|
||||
private bool windowAttached = false;
|
||||
|
||||
#region WinAPI Entry Points
|
||||
|
||||
[DllImport("user32.dll")]
|
||||
private static extern IntPtr SetWindowPos(IntPtr handle, IntPtr handleAfter, int x, int y, int cx, int cy, uint flags);
|
||||
[DllImport("user32.dll")]
|
||||
private static extern IntPtr SetParent(IntPtr child, IntPtr newParent);
|
||||
[DllImport("user32.dll")]
|
||||
private static extern IntPtr ShowWindow(IntPtr handle, int command);
|
||||
|
||||
#endregion
|
||||
|
||||
public RayForms()
|
||||
{
|
||||
Size = new Size(1024, 700);
|
||||
Text = "Rayforms";
|
||||
|
||||
gamePanel = new Panel();
|
||||
gamePanel.Size = new Size(800, 500);
|
||||
gamePanel.Location = new Point(50, 50);
|
||||
|
||||
Button button = new Button();
|
||||
button.Text = "Attach window";
|
||||
button.Size = new Size(150, 20);
|
||||
button.Location = new Point(
|
||||
(Size.Width / 2) - (button.Size.Width / 2),
|
||||
gamePanel.Location.Y + gamePanel.Size.Height + 10
|
||||
);
|
||||
button.Click += new EventHandler(ClickedButton);
|
||||
Controls.Add(button);
|
||||
Controls.Add(gamePanel);
|
||||
}
|
||||
|
||||
private void ClickedButton(object sender, EventArgs e)
|
||||
{
|
||||
if (!windowAttached)
|
||||
{
|
||||
// new Thread(Test).Start();
|
||||
Test();
|
||||
}
|
||||
}
|
||||
|
||||
private void Test()
|
||||
{
|
||||
SetConfigFlags((int)Flag.WINDOW_UNDECORATED);
|
||||
InitWindow(800, 480, "Rayforms test");
|
||||
SetTargetFPS(60);
|
||||
|
||||
IntPtr winHandle = GetWindowHandle();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
SetWindowPos(winHandle, Handle, 0, 0, 0, 0, 0x0401 /*NOSIZE | SHOWWINDOW */);
|
||||
SetParent(winHandle, gamePanel.Handle);
|
||||
ShowWindow(winHandle, 1);
|
||||
windowAttached = true;
|
||||
}));
|
||||
|
||||
// Main game loop
|
||||
while (!WindowShouldClose()) // Detect window close button or ESC key
|
||||
{
|
||||
// Update
|
||||
//----------------------------------------------------------------------------------
|
||||
// TODO: Update your variables here
|
||||
//----------------------------------------------------------------------------------
|
||||
|
||||
// Draw
|
||||
//----------------------------------------------------------------------------------
|
||||
BeginDrawing();
|
||||
|
||||
ClearBackground(RAYWHITE);
|
||||
|
||||
DrawText("Congrats! You created your first window!", 190, 200, 20, MAROON);
|
||||
|
||||
DrawText(GetFrameTime().ToString(), 100, 10, 15, MAROON);
|
||||
|
||||
DrawFPS(10, 10);
|
||||
|
||||
EndDrawing();
|
||||
//----------------------------------------------------------------------------------
|
||||
}
|
||||
CloseWindow();
|
||||
}
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
Application.Run(new RayForms());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8,9 +8,25 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>Test</RootNamespace>
|
||||
<AssemblyName>Test</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFrameworkProfile />
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
@ -84,27 +100,49 @@
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="RayForms.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="raylib-cs.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Bindings\Bindings.csproj">
|
||||
<Project>{363d543c-f690-41aa-8215-2d368ea7434e}</Project>
|
||||
<Project>{9f30944c-415b-4763-91c7-81721117879d}</Project>
|
||||
<Name>Bindings</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
|
||||
7
Test/packages.config
Normal file
7
Test/packages.config
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="System.Buffers" version="4.4.0" targetFramework="net471" />
|
||||
<package id="System.Memory" version="4.5.1" targetFramework="net471" />
|
||||
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net471" />
|
||||
</packages>
|
||||
Loading…
x
Reference in New Issue
Block a user