Refactor Member annotation into Std430Writer

LWJGL · Nov 2, 2019 · 3a903d2 · 3a903d2
1 parent e7ababb
commit 3a903d2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/src/org/lwjgl/demo/opengl/raytracing/DemoSsboTrianglesStacklessKdTree.java b/src/org/lwjgl/demo/opengl/raytracing/DemoSsboTrianglesStacklessKdTree.java
@@ -7,6 +7,7 @@
 import org.lwjgl.BufferUtils;
 import org.lwjgl.demo.util.*;
 import org.lwjgl.demo.util.KDTree.*;
+import org.lwjgl.demo.util.Std430Writer.*;
 import org.lwjgl.demo.util.WavefrontMeshLoader.Mesh;
 import org.lwjgl.glfw.*;
 import org.lwjgl.opengl.GL;

diff --git a/src/org/lwjgl/demo/opengl/raytracing/tutorial/Tutorial7.java b/src/org/lwjgl/demo/opengl/raytracing/tutorial/Tutorial7.java
@@ -13,7 +13,6 @@
 import org.lwjgl.assimp.Assimp;
 import org.lwjgl.demo.opengl.util.DemoUtils;
 import org.lwjgl.demo.util.DynamicByteBuffer;
-import org.lwjgl.demo.util.Member;
 import org.lwjgl.glfw.*;
 import org.lwjgl.opengl.*;
 import org.lwjgl.system.*;

diff --git a/src/org/lwjgl/demo/util/Member.java b/src/org/lwjgl/demo/util/Member.java
diff --git a/src/org/lwjgl/demo/util/Std430Writer.java b/src/org/lwjgl/demo/util/Std430Writer.java
@@ -4,6 +4,7 @@
  */
 package org.lwjgl.demo.util;
 
+import java.lang.annotation.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
@@ -21,6 +22,22 @@
  */
 public class Std430Writer {
 
+    /**
+     * Used to annotate a struct member (i.e. field in a class representing a GLSL struct).
+     * 
+     * @author Kai Burjack
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.FIELD)
+    public @interface Member {
+
+        /**
+         * If that member is an array, this indicates the static size of the array.
+         */
+        int length() default 0;
+
+    }
+
     private static final Map<Class<?>, Integer> SIZES = new IdentityHashMap<Class<?>, Integer>();
     static {
         SIZES.put(int.class, Integer.valueOf(1));