WIP commit

Author: dogunbound

CSFML/src/Graphics/BlendMode.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+typedef enum {
+    sfPoints,
+    sfLines,
+    sfLineStrip,
+    sfTriangles,
+    sfTriangleStrip,
+    sfTriangleFan,
+} sfPrimitiveType;

CSFML/src/Graphics/PrimitiveType.hpp

@@ -1,5 +1,7 @@
+#include "Graphics/PrimitiveType.hpp"
 #include "Graphics/Rect.hpp"
 #include "Graphics/Color.hpp"
+#include "SFML/Graphics/PrimitiveType.hpp"
 #include "SFML/Window/ContextSettings.hpp"
 #include "System/Vector2.hpp"
 #include <SFML/Graphics/RenderTarget.hpp>
@@ -105,8 +107,8 @@ extern "C" void sfRenderTexture_drawVertexBuffer(sf::RenderTexture *renderTextur
 
 extern "C" void sfRenderTexture_drawPrimitives(sf::RenderTexture *renderTexture,
                                                const sf::Vertex *vertices, size_t vertexCount,
-                                               sf::PrimitiveType type, const sf::RenderStates *states) {
-    renderTexture->draw(vertices, vertexCount, type, *states);
+                                               sfPrimitiveType type, const sf::RenderStates *states) {
+    renderTexture->draw(vertices, vertexCount, static_cast<sf::PrimitiveType>(type), *states);
 }
 
 extern "C" void sfRenderTexture_pushGLStates(sf::RenderTexture *renderTexture) {

CSFML/src/Graphics/RenderTexture.cpp

@@ -1,5 +1,7 @@
+#include "Graphics/PrimitiveType.hpp"
 #include "Graphics/Rect.hpp"
 #include "Graphics/Color.hpp"
+#include "SFML/Graphics/PrimitiveType.hpp"
 #include "System/Vector2.hpp"
 #include "Window/Event.hpp"
 #include "Window/VideoMode.hpp"
@@ -15,6 +17,8 @@
 #include <SFML/Window/Touch.hpp>
 #include <chrono>
 #include <cstddef>
+// Debug ONLY
+#include <iostream>
 
 extern "C" sf::RenderWindow *sfRenderWindow_new_mtsss(sfVideoMode mode, const uint32_t *title, uint32_t style, sfState state, const sf::ContextSettings *settings) {
     // Convert video mode
@@ -189,6 +193,8 @@ extern "C" void sfRenderWindow_drawConvexShape(sf::RenderWindow *renderWindow, c
     renderWindow->draw(*object, *states);
 }
 extern "C" void sfRenderWindow_drawRectangleShape(sf::RenderWindow *renderWindow, const sf::RectangleShape *object, const sf::RenderStates *states) {
+    std::cout << static_cast<int>(states->blendMode) << std::endl;
+    std::cout << object->getSize().x << " " << object->getSize().y << std::endl;
     renderWindow->draw(*object, *states);
 }
 extern "C" void sfRenderWindow_drawVertexBuffer(sf::RenderWindow *renderWindow, const sf::VertexBuffer *object, const sf::RenderStates *states) {
@@ -197,8 +203,8 @@ extern "C" void sfRenderWindow_drawVertexBuffer(sf::RenderWindow *renderWindow,
 
 extern "C" void sfRenderWindow_drawPrimitives(sf::RenderWindow *renderWindow,
                                               const sf::Vertex *vertices, size_t vertexCount,
-                                              sf::PrimitiveType type, const sf::RenderStates *states) {
-    renderWindow->draw(vertices, vertexCount, type, *states);
+                                              sfPrimitiveType type, const sf::RenderStates *states) {
+    renderWindow->draw(vertices, vertexCount, static_cast<sf::PrimitiveType>(type), *states);
 }
 
 extern "C" void sfRenderWindow_pushGLStates(sf::RenderWindow *renderWindow) {

CSFML/src/Graphics/RenderWindow.cpp

@@ -1,3 +1,5 @@
+#include "Graphics/PrimitiveType.hpp"
+#include "SFML/Graphics/PrimitiveType.hpp"
 #include "SFML/Graphics/RenderTarget.hpp"
 #include <SFML/Graphics/VertexBuffer.hpp>
 #include <cstddef>
@@ -38,12 +40,12 @@ extern "C" unsigned int sfVertexBuffer_getNativeHandle(const sf::VertexBuffer *v
     return vertexBuffer->getNativeHandle();
 }
 
-extern "C" void sfVertexBuffer_setPrimitiveType(sf::VertexBuffer *vertexBuffer, sf::PrimitiveType type) {
-    vertexBuffer->setPrimitiveType(type);
+extern "C" void sfVertexBuffer_setPrimitiveType(sf::VertexBuffer *vertexBuffer, sfPrimitiveType type) {
+    vertexBuffer->setPrimitiveType(static_cast<sf::PrimitiveType>(type));
 }
 
-extern "C" sf::PrimitiveType sfVertexBuffer_getPrimitiveType(const sf::VertexBuffer *vertexBuffer) {
-    return vertexBuffer->getPrimitiveType();
+extern "C" sfPrimitiveType sfVertexBuffer_getPrimitiveType(const sf::VertexBuffer *vertexBuffer) {
+    return static_cast<sfPrimitiveType>(vertexBuffer->getPrimitiveType());
 }
 
 extern "C" void sfVertexBuffer_setUsage(sf::VertexBuffer *vertexBuffer, sf::VertexBuffer::Usage usage) {

CSFML/src/Graphics/VertexBuffer.cpp

@@ -158,7 +158,7 @@ fn main() -> SfResult<()> {
         }
         window.clear(Color::BLACK);
         rs.texture = Some(&texture);
-        window.draw_primitives(&buf, PrimitiveType::QUADS, &rs);
+        window.draw_primitives(&buf, PrimitiveType::TRIANGLE_STRIP, &rs);
         rs.texture = None;
         text.set_string(&format!("{} sprites\n{fps} fps", objects.len()));
         window.draw_text(&text, &rs);

examples/spritemark.rs

@@ -12,6 +12,7 @@ fn main() -> SfResult<()> {
         (800, 600),
         "Vertex array example",
         Style::CLOSE,
+        Default::default(),
         &Default::default(),
     )?;
     window.set_vertical_sync_enabled(true);

examples/vertex-arrays.rs

@@ -272,8 +272,6 @@ pub enum sfPrimitiveType {
     TriangleStrip,
     /// List of connected triangles, a point uses the common center and the previous point to form a triangle
     TriangleFan,
-    /// List of individual quads
-    Quads,
 }
 
 type sfColor = Color;

src/ffi/graphics.rs

@@ -24,6 +24,4 @@ impl PrimitiveType {
     /// List of connected triangles, a point uses the common center
     /// and the previous point to form a triangle.
     pub const TRIANGLE_FAN: Self = Self(ffi::graphics::sfPrimitiveType::TriangleFan);
-    /// List of individual quads (deprecated, don't work with OpenGL ES)
-    pub const QUADS: Self = Self(ffi::graphics::sfPrimitiveType::Quads);
 }