Skip to content

Commit 6920fdf

Browse files
rsahlinrsahlin
committed
Add shadermodule, no implementation yet
1 parent 1dc4ef8 commit 6920fdf

File tree

8 files changed

+696
-638
lines changed

8 files changed

+696
-638
lines changed

‎.circleci/config.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
version: 2.1
2-
jobs:
3-
build-all:
4-
working_directory: ~/repo
5-
docker:
6-
- image: circleci/openjdk:8-jdk-browsers
7-
steps:
8-
- checkout
9-
- run:
10-
name: Download and build vecmath
11-
command: |
12-
git clone https://github.com/rsahlin/vecmath.git
13-
cd vecmath
14-
mvn compile install
15-
- run:
16-
name: Build graphics-by-opengl No Android
17-
command: |
18-
mvn compile install -DskipTests -DAndroid=false
19-
20-
21-
workflows:
22-
version: 2.1
23-
main:
24-
jobs:
25-
- build-all
1+
version: 2.1
2+
jobs:
3+
build-all:
4+
working_directory: ~/repo
5+
docker:
6+
- image: circleci/openjdk:8-jdk-browsers
7+
steps:
8+
- checkout
9+
- run:
10+
name: Download and build vecmath
11+
command: |
12+
git clone https://github.com/rsahlin/vecmath.git
13+
cd vecmath
14+
mvn compile install
15+
- run:
16+
name: Build graphics-by-opengl No Android
17+
command: |
18+
mvn compile install -DskipTests -DAndroid=false
19+
20+
21+
workflows:
22+
version: 2.1
23+
main:
24+
jobs:
25+
- build-all

‎graphics-by-opengl-android/src/main/java/com/nucleus/android/AndroidGLES32Wrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public void glUniform1iv(int location, int count, IntBuffer buffer) {
387387

388388
@Override
389389
public void glUniform1i(int location, int unit) {
390-
android.opengl.GLES20.glUniform1i(location, uni);
390+
android.opengl.GLES20.glUniform1i(location, unit);
391391
}
392392

393393
@Override

‎graphics-by-opengl-j2se/src/main/java/com/nucleus/io/StreamUtils.java

+159-134
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.nucleus.io;
22

33
import java.io.BufferedInputStream;
4+
import java.io.File;
45
import java.io.IOException;
56
import java.io.InputStream;
67
import java.net.URISyntaxException;
@@ -10,6 +11,8 @@
1011
import java.util.ArrayList;
1112
import java.util.List;
1213

14+
import com.nucleus.common.BufferUtils;
15+
1316
/**
1417
* Utility methods for input/output stream operations.
1518
*
@@ -18,139 +21,161 @@
1821
*/
1922
public class StreamUtils {
2023

21-
private final static int DEFAULT_BUFFER_SIZE = 2048;
22-
23-
/**
24-
* Encapsulates data read from BufferedInputStream
25-
*
26-
*/
27-
public class InputData {
28-
private byte[] buffer;
29-
private int count;
30-
31-
/**
32-
*
33-
* @param buffer The input data, eg read from inputstream.
34-
* @param count Number of bytes of valid data, may be smaller than length if not all of buffer is filled.
35-
*/
36-
public InputData(byte[] buffer, int count) {
37-
this.buffer = buffer;
38-
this.count = count;
39-
}
40-
41-
/**
42-
* Returns the buffer data
43-
*
44-
* @return
45-
*/
46-
public byte[] getBuffer() {
47-
return buffer;
48-
}
49-
50-
/**
51-
* Returns the number of bytes of valid data in buffer, may be smaller than length.
52-
*
53-
* @return
54-
*/
55-
public int getCount() {
56-
return count;
57-
}
58-
}
59-
60-
/**
61-
* Utility method to read data from inputstream using buffered inputstream.
62-
* The default buffer size will be used.
63-
* This is the same as calling readFromStream(InputStream, DEFAULT_BUFFER_SIZE)
64-
*
65-
* @param in
66-
* @return
67-
* @throws IOException
68-
*/
69-
public static byte[] readFromStream(InputStream in) throws IOException {
70-
return readFromStream(in, DEFAULT_BUFFER_SIZE);
71-
72-
}
73-
74-
/**
75-
* Utility method to read data from inputstream and return as a UTF-8 encoded
76-
* String.
77-
* Use this method when reading Strings from file to get correct encoding.
78-
*
79-
* @param in
80-
* @return
81-
* @throws IOException
82-
*/
83-
public static String readStringFromStream(InputStream in) throws IOException {
84-
// TODO - If Android build version => 19 then java.nio.StandardCharset can be used
85-
return new String(readFromStream(in), "UTF-8");
86-
}
87-
88-
/**
89-
* Utility method to read data from inputstream using buffered inputstream.
90-
* The buffer size used when reading data is specified.
91-
*
92-
* @param in
93-
* @param buffersize Size of buffer to use when reading data, for larger files it may be optimal to increase
94-
* the size. A value of 8K should be ok for normal file sizes.
95-
* @return
96-
* @throws IOException
97-
*/
98-
public static byte[] readFromStream(InputStream in, int buffersize) throws IOException {
99-
BufferedInputStream bis = new BufferedInputStream(in);
100-
List<InputData> buffers = new ArrayList<InputData>();
101-
int totalCount = 0;
102-
int count = 0;
103-
byte[] buffer = new byte[buffersize];
104-
StreamUtils util = new StreamUtils();
105-
while ((count = bis.read(buffer)) != -1) {
106-
totalCount += count;
107-
buffers.add(util.new InputData(buffer, count));
108-
buffer = new byte[buffersize];
109-
}
110-
byte[] data = new byte[totalCount];
111-
int index = 0;
112-
for (InputData b : buffers) {
113-
System.arraycopy(b.getBuffer(), 0, data, index, b.getCount());
114-
index += b.getCount();
115-
}
116-
return data;
117-
}
118-
119-
/**
120-
* Loads data from the filename, using ClassLoader and #getResourceAsStream(name)
121-
*
122-
* @param name
123-
* @param buffer Reads into buffer at current position
124-
* @return Number of bytes read
125-
* @throws IOException
126-
* @throws URISyntaxException
127-
*/
128-
public static int readFromName(String name, ByteBuffer buffer) throws IOException, URISyntaxException {
129-
ClassLoader loader = StreamUtils.class.getClassLoader();
130-
InputStream is = loader.getResourceAsStream(name);
131-
int loaded = readFromStream(is, buffer);
132-
is.close();
133-
return loaded;
134-
}
135-
136-
/**
137-
* Loads data from the inputstream into the buffer - at the current position
138-
*
139-
* @param is
140-
* @param buffer
141-
* @return The total number of bytes read
142-
* @throws IOException
143-
* @throws URISyntaxException
144-
*/
145-
public static int readFromStream(InputStream is, ByteBuffer buffer) throws IOException, URISyntaxException {
146-
ReadableByteChannel byteChannel = Channels.newChannel(is);
147-
int read = 0;
148-
int total = 0;
149-
while ((read = byteChannel.read(buffer)) > 0) {
150-
total += read;
151-
}
152-
byteChannel.close();
153-
return total;
154-
}
24+
private final static int DEFAULT_BUFFER_SIZE = 2048;
25+
26+
/**
27+
* Encapsulates data read from BufferedInputStream
28+
*
29+
*/
30+
public class InputData {
31+
private byte[] buffer;
32+
private int count;
33+
34+
/**
35+
*
36+
* @param buffer The input data, eg read from inputstream.
37+
* @param count Number of bytes of valid data, may be smaller than length if
38+
* not all of buffer is filled.
39+
*/
40+
public InputData(byte[] buffer, int count) {
41+
this.buffer = buffer;
42+
this.count = count;
43+
}
44+
45+
/**
46+
* Returns the buffer data
47+
*
48+
* @return
49+
*/
50+
public byte[] getBuffer() {
51+
return buffer;
52+
}
53+
54+
/**
55+
* Returns the number of bytes of valid data in buffer, may be smaller than
56+
* length.
57+
*
58+
* @return
59+
*/
60+
public int getCount() {
61+
return count;
62+
}
63+
}
64+
65+
/**
66+
* Utility method to read data from inputstream using buffered inputstream. The
67+
* default buffer size will be used. This is the same as calling
68+
* readFromStream(InputStream, DEFAULT_BUFFER_SIZE)
69+
*
70+
* @param in
71+
* @return
72+
* @throws IOException
73+
*/
74+
public static byte[] readFromStream(InputStream in) throws IOException {
75+
return readFromStream(in, DEFAULT_BUFFER_SIZE);
76+
77+
}
78+
79+
/**
80+
* Utility method to read data from inputstream and return as a UTF-8 encoded
81+
* String. Use this method when reading Strings from file to get correct
82+
* encoding.
83+
*
84+
* @param in
85+
* @return
86+
* @throws IOException
87+
*/
88+
public static String readStringFromStream(InputStream in) throws IOException {
89+
// TODO - If Android build version => 19 then java.nio.StandardCharset can be
90+
// used
91+
return new String(readFromStream(in), "UTF-8");
92+
}
93+
94+
/**
95+
* Utility method to read data from inputstream using buffered inputstream. The
96+
* buffer size used when reading data is specified.
97+
*
98+
* @param in
99+
* @param buffersize Size of buffer to use when reading data, for larger files
100+
* it may be optimal to increase the size. A value of 8K
101+
* should be ok for normal file sizes.
102+
* @return
103+
* @throws IOException
104+
*/
105+
public static byte[] readFromStream(InputStream in, int buffersize) throws IOException {
106+
BufferedInputStream bis = new BufferedInputStream(in);
107+
List<InputData> buffers = new ArrayList<InputData>();
108+
int totalCount = 0;
109+
int count = 0;
110+
byte[] buffer = new byte[buffersize];
111+
StreamUtils util = new StreamUtils();
112+
while ((count = bis.read(buffer)) != -1) {
113+
totalCount += count;
114+
buffers.add(util.new InputData(buffer, count));
115+
buffer = new byte[buffersize];
116+
}
117+
byte[] data = new byte[totalCount];
118+
int index = 0;
119+
for (InputData b : buffers) {
120+
System.arraycopy(b.getBuffer(), 0, data, index, b.getCount());
121+
index += b.getCount();
122+
}
123+
return data;
124+
}
125+
126+
/**
127+
* Loads data from the filename, using ClassLoader and
128+
* #getResourceAsStream(name)
129+
*
130+
* @param name
131+
* @param buffer Reads into buffer at current position
132+
* @return Number of bytes read
133+
* @throws IOException
134+
* @throws URISyntaxException
135+
*/
136+
public static int readFromName(String name, ByteBuffer buffer) throws IOException, URISyntaxException {
137+
ClassLoader loader = StreamUtils.class.getClassLoader();
138+
InputStream is = loader.getResourceAsStream(name);
139+
int loaded = readFromStream(is, buffer);
140+
is.close();
141+
return loaded;
142+
}
143+
144+
/**
145+
* Creates a bytebuffer and reads the specified file into
146+
*
147+
* @param name
148+
* @return
149+
* @throws IOException
150+
* @throws URISyntaxException
151+
*/
152+
public static ByteBuffer readBufferFromName(String name) throws IOException, URISyntaxException {
153+
ClassLoader loader = StreamUtils.class.getClassLoader();
154+
File file = new File(loader.getResource(name).toURI());
155+
ByteBuffer buffer = BufferUtils.createByteBuffer((int) file.length());
156+
buffer.position(0);
157+
readFromName(name, buffer);
158+
return buffer;
159+
}
160+
161+
/**
162+
* Loads data from the inputstream into the buffer - at the current position
163+
*
164+
* @param is
165+
* @param buffer
166+
* @return The total number of bytes read
167+
* @throws IOException
168+
* @throws URISyntaxException
169+
*/
170+
public static int readFromStream(InputStream is, ByteBuffer buffer) throws IOException, URISyntaxException {
171+
ReadableByteChannel byteChannel = Channels.newChannel(is);
172+
int read = 0;
173+
int total = 0;
174+
while ((read = byteChannel.read(buffer)) > 0) {
175+
total += read;
176+
}
177+
byteChannel.close();
178+
return total;
179+
}
155180

156181
}

0 commit comments

Comments
 (0)