Skip to content
This repository has been archived by the owner on Mar 14, 2024. It is now read-only.

Commit

Permalink
0.1.12正式版!
Browse files Browse the repository at this point in the history
  • Loading branch information
Aloento committed Jan 12, 2021
1 parent de7c33d commit 9837c78
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 23 deletions.
14 changes: 0 additions & 14 deletions dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,6 @@
<url>https://repository.sonatype.org/content/groups/public/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<properties>
<maven.compiler.target>15</maven.compiler.target>
<maven.compiler.source>15</maven.compiler.source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private Attachment readAttachment(DataInput input, Skin skin, int slotIndex, Str
case mesh -> {
String path = input.readString();
int color = input.readInt();
int hullLength = 0;
int hullLength;
int verticesLength = input.readInt(true) * 2;
float[] uvs = readFloatArray(input, verticesLength, 1);
short[] triangles = readShortArray(input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ public void draw(Skeleton skeleton) {
for (int i = 0, n = bones.size; i < n; i++) {
Bone bone = bones.get(i);
if (bone.parent == null || !bone.active) continue;
float boneWidth = 2;
float length = bone.data.length, width = boneWidth;
float length = bone.data.length, width = (float) 2;
if (length == 0) {
length = 8;
width /= 2;
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/sun/prism/impl/BaseTexture.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,25 @@ protected BaseTexture(BaseTexture<T> sharedTex, WrapMode newMode, boolean useMip
protected BaseTexture(T resource,
PixelFormat format, WrapMode wrapMode,
int width, int height) {
this(resource, format, wrapMode, width, height, 0, 0, width, height, false);
this(resource, format, wrapMode, width, height, width, height);
}

protected BaseTexture(T resource,
PixelFormat format, WrapMode wrapMode,
int physicalWidth, int physicalHeight,
int contentX, int contentY,
int contentWidth, int contentHeight, boolean useMipmap) {
int contentWidth, int contentHeight) {
this.resource = resource;
this.format = format;
this.wrapMode = wrapMode;
this.physicalWidth = physicalWidth;
this.physicalHeight = physicalHeight;
this.contentX = contentX;
this.contentY = contentY;
this.contentX = 0;
this.contentY = 0;
this.contentWidth = contentWidth;
this.contentHeight = contentHeight;
this.maxContentWidth = physicalWidth;
this.maxContentHeight = physicalHeight;
this.useMipmap = useMipmap;
this.useMipmap = false;
}

protected BaseTexture(T resource,
Expand Down

0 comments on commit 9837c78

Please sign in to comment.