From 3a903d249c2a0386b5abee130ace0f3600f91296 Mon Sep 17 00:00:00 2001
From: httpdigest <kburjack@googlemail.com>
Date: Sat, 2 Nov 2019 15:28:13 +0100
Subject: [PATCH] Refactor Member annotation into Std430Writer

---
 .../DemoSsboTrianglesStacklessKdTree.java     |  1 +
 .../opengl/raytracing/tutorial/Tutorial7.java |  1 -
 src/org/lwjgl/demo/util/Member.java           | 26 -------------------
 src/org/lwjgl/demo/util/Std430Writer.java     | 17 ++++++++++++
 4 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 src/org/lwjgl/demo/util/Member.java

diff --git a/src/org/lwjgl/demo/opengl/raytracing/DemoSsboTrianglesStacklessKdTree.java b/src/org/lwjgl/demo/opengl/raytracing/DemoSsboTrianglesStacklessKdTree.java
index 2d7cbfe3..aa6fa37d 100644
--- 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
index 251cab81..408c7c7c 100644
--- 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
deleted file mode 100644
index 540abda1..00000000
--- a/src/org/lwjgl/demo/util/Member.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright LWJGL. All rights reserved.
- * License terms: https://www.lwjgl.org/license
- */
-package org.lwjgl.demo.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 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;
-
-}
diff --git a/src/org/lwjgl/demo/util/Std430Writer.java b/src/org/lwjgl/demo/util/Std430Writer.java
index f8d89bd0..ab6c4c23 100644
--- 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));