Skip to content

Commit

Permalink
some more model fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thutmose
Thutmose committed Mar 7, 2020
1 parent c66d81a commit b50dc0c
Show file tree
Hide file tree
Showing 25 changed files with 104 additions and 204 deletions.
Binary file modified blender_files/gen_3/roselia.blend
View file
Binary file not shown.
Binary file modified blender_files/gen_3/sableye.blend
View file
Binary file not shown.
Binary file modified blender_files/gen_3/sableye_mega.blend
View file
Binary file not shown.
Binary file modified blender_files/gen_4/rotom.blend
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion src/main/java/thut/core/client/render/model/parts/Part.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ public void updateMaterial(final Mat mat)
final String[] parts = mat.name.split(":");
final Material material = new Material(mat_name);
material.diffuseColor = new Vector3f(1, 1, 1);
material.emissiveColor = new Vector3f(1, 1, 1);
material.emissiveColor = new Vector3f(mat.light, mat.light, mat.light);
material.emissiveMagnitude = Math.min(1, (float) (material.emissiveColor.length() / Math.sqrt(3)) / 0.8f);
material.specularColor = new Vector3f(1, 1, 1);
material.transparency = mat.transluscent ? 1 : 0;
for (final String s : parts)
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/thut/wearables/client/render/WearableEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ public void addWearableRenderLayer(final RenderLivingEvent.Post<?, ?> event)
if (this.addedLayers.contains(event.getRenderer())) return;

// Add the layer.
// final List<LayerRenderer<?, ?>> layerRenderers =
// event.getRenderer().layerRenderers;
// final int index = Math.min(1, layerRenderers.size());
// layerRenderers.add(index, new
// WearablesRenderer(event.getRenderer()));
event.getRenderer().addLayer(new WearablesRenderer(event.getRenderer()));
this.addedLayers.add(event.getRenderer());
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_3/entity/models/froslass.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" name="global" scale="1.4"/>
<model>
<phase name="global" scale="1.4"/>
<metadata head="headmiddle"/>
</model>
</ModelAnimator>
2 changes: 1 addition & 1 deletion src/main/resources/assets/pokecube_mobs/gen_3/entity/models/illumise.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase name="global" offset="0,0.75,0" scale="0.7"/>
<phase name="global" scale="0.7"/>
<metadata head="head1" headCap="-60,60"/>
</model>
</ModelAnimator>
4 changes: 2 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<model>
<phase name="global" scale="1.0"/>
<metadata head="Head1" headAxis="2" headAxis2="0" headCap="-60,60" headCap1="-60,60" headDir="1"/>
<metadata head="Head1" headAxis="1" headAxis2="0" headCap="-60,60" headCap1="-60,60" headDir="1"/>
</model>
</ModelAnimator>
4 changes: 2 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_3/entity/models/minun.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" headDir="-1" name="global" scale="0.20"/>
<phase name="global" scale="0.20"/>
<phase armAngle="50" duration="10" leftArm="Left_hand" leftLeg="Left_foot" legAngle="45" name="biWalk" rightArm="Right_hand" rightLeg="Right_foot"/>
<metadata head="Head"/>
<metadata head="Head" headAxis="2" headCap="-50,50" headDir2="-1" />
<customTex default="minun">
<part name="Head" tex="minunhead"/>
<animation diffs="0,0.33" part="Head" trigger="random:0.005:20"/>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/pokecube_mobs/gen_3/entity/models/plusle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" headDir="-1" name="global" scale="0.20"/>
<phase name="global" scale="0.20"/>
<phase armAngle="50" duration="10" leftArm="Left_hand" leftLeg="Left_foot" legAngle="45" name="biWalk" rightArm="Right_hand" rightLeg="Right_foot"/>
<metadata head="Head"/>
<metadata head="Head" headAxis="2" headCap="-50,50" headDir2="-1" />
<customTex default="plusle">
<part name="Head" tex="pluslehead"/>
<animation diffs="0,0.33" part="Head" trigger="random:0.005:20"/>
Expand Down
20 changes: 10 additions & 10 deletions src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.x3d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
</Group>
</Transform>
<Transform DEF="Left_armplate_TRANSFORM"
translation="0.104810 0.191706 0.077972"
translation="0.332269 0.378360 0.183230"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
<Transform DEF="Left_armplate_ifs_TRANSFORM"
translation="0.000000 -0.000000 -0.000000"
translation="0.000000 0.000000 0.000000"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
Expand All @@ -93,7 +93,7 @@
normalPerVertex="true"
index="0 1 2 0 2 3 4 5 6 4 6 7 3 2 8 3 8 9 10 11 12 10 12 13 14 0 3 14 3 15 1 4 7 1 7 2 "
>
<Coordinate point="-0.104734 -0.184030 -0.375114 -0.226519 -0.041901 -0.363978 0.228399 0.331407 -0.153463 0.350183 0.189277 -0.164599 -0.350183 -0.189277 0.164599 -0.228398 -0.331407 0.153463 0.226520 0.041900 0.363978 0.104735 0.184029 0.375114 0.104735 0.184029 0.375114 0.226520 0.041900 0.363978 -0.228398 -0.331407 0.153463 -0.350183 -0.189277 0.164599 -0.226519 -0.041901 -0.363978 -0.104734 -0.184030 -0.375114 -0.228398 -0.331407 0.153463 0.226520 0.041900 0.363978 " />
<Coordinate point="-0.332193 -0.370683 -0.480372 -0.453978 -0.228554 -0.469236 0.000940 0.144753 -0.258721 0.122724 0.002624 -0.269857 -0.577642 -0.375931 0.059342 -0.455857 -0.518060 0.048205 -0.000939 -0.144753 0.258721 -0.122724 -0.002624 0.269857 -0.122724 -0.002624 0.269857 -0.000939 -0.144753 0.258721 -0.455857 -0.518060 0.048205 -0.577642 -0.375931 0.059342 -0.453978 -0.228554 -0.469236 -0.332193 -0.370683 -0.480372 -0.455857 -0.518060 0.048205 -0.000939 -0.144753 0.258721 " />
<Normal vector="0.081668 -0.631214 -0.771264 -0.668294 0.244057 -0.702689 0.172155 0.933744 -0.313761 0.922147 0.058443 -0.382336 -0.922147 -0.058443 0.382336 -0.172155 -0.933744 0.313761 0.668294 -0.244057 0.702689 -0.081668 0.631214 0.771264 -0.081668 0.631214 0.771264 0.668294 -0.244057 0.702689 -0.172155 -0.933744 0.313761 -0.922147 -0.058443 0.382336 -0.668294 0.244057 -0.702689 0.081668 -0.631214 -0.771264 -0.172155 -0.933744 0.313761 0.668294 -0.244057 0.702689 " />
<TextureCoordinate point="0.4531 0.6094 0.4766 0.6094 0.4766 0.6875 0.4531 0.6875 0.5469 0.6094 0.5703 0.6094 0.5703 0.6875 0.5469 0.6875 0.4766 0.7578 0.4531 0.7578 0.4766 0.6875 0.5000 0.6875 0.5000 0.7578 0.4766 0.7578 0.3828 0.6094 0.3828 0.6875 " />
</IndexedTriangleSet>
Expand Down Expand Up @@ -156,12 +156,12 @@
</Group>
</Transform>
<Transform DEF="Right_armplate_TRANSFORM"
translation="-0.104810 0.191706 0.077972"
translation="-0.332269 0.378360 0.183230"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
<Transform DEF="Right_armplate_ifs_TRANSFORM"
translation="0.000000 -0.000000 -0.000000"
translation="0.000000 0.000000 0.000000"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
Expand All @@ -174,7 +174,7 @@
normalPerVertex="true"
index="0 1 2 0 2 3 4 5 6 4 6 7 3 2 8 3 8 9 10 11 12 10 12 13 14 0 3 14 3 15 1 4 7 1 7 2 "
>
<Coordinate point="0.226519 -0.041900 -0.363978 0.104734 -0.184030 -0.375114 -0.350183 0.189278 -0.164599 -0.228399 0.331407 -0.153463 0.228398 -0.331406 0.153463 0.350183 -0.189277 0.164599 -0.104735 0.184030 0.375114 -0.226520 0.041901 0.363978 -0.226520 0.041901 0.363978 -0.104735 0.184030 0.375114 0.350183 -0.189277 0.164599 0.228398 -0.331406 0.153463 0.104734 -0.184030 -0.375114 0.226519 -0.041900 -0.363978 0.350183 -0.189277 0.164599 -0.104735 0.184030 0.375114 " />
<Coordinate point="0.453978 -0.228554 -0.469236 0.332193 -0.370684 -0.480372 -0.122724 0.002624 -0.269857 -0.000940 0.144753 -0.258721 0.455857 -0.518060 0.048205 0.577642 -0.375931 0.059342 0.122724 -0.002624 0.269857 0.000939 -0.144753 0.258721 0.000939 -0.144753 0.258721 0.122724 -0.002624 0.269857 0.577642 -0.375931 0.059342 0.455857 -0.518060 0.048205 0.332193 -0.370684 -0.480372 0.453978 -0.228554 -0.469236 0.577642 -0.375931 0.059342 0.122724 -0.002624 0.269857 " />
<Normal vector="0.668294 0.244057 -0.702689 -0.081668 -0.631214 -0.771264 -0.922147 0.058443 -0.382336 -0.172155 0.933744 -0.313761 0.172155 -0.933744 0.313761 0.922147 -0.058443 0.382336 0.081668 0.631214 0.771264 -0.668294 -0.244057 0.702689 -0.668294 -0.244057 0.702689 0.081668 0.631214 0.771264 0.922147 -0.058443 0.382336 0.172155 -0.933744 0.313761 -0.081668 -0.631214 -0.771264 0.668294 0.244057 -0.702689 0.922147 -0.058443 0.382336 0.081668 0.631214 0.771264 " />
<TextureCoordinate point="0.7578 0.6094 0.7812 0.6094 0.7812 0.6875 0.7578 0.6875 0.8516 0.6094 0.8750 0.6094 0.8750 0.6875 0.8516 0.6875 0.7812 0.7578 0.7578 0.7578 0.7812 0.6875 0.8047 0.6875 0.8047 0.7578 0.7812 0.7578 0.6875 0.6094 0.6875 0.6875 " />
</IndexedTriangleSet>
Expand Down Expand Up @@ -211,7 +211,7 @@
</Transform>
</Transform>
<Transform DEF="Left_leg_TRANSFORM"
translation="-0.308415 -0.699362 0.000000"
translation="-0.347653 -0.138232 0.000000"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
Expand All @@ -229,7 +229,7 @@
normalPerVertex="true"
index="0 1 2 0 2 3 4 5 6 4 6 7 3 2 8 3 8 9 10 11 12 10 12 13 14 0 3 14 3 15 1 4 7 1 7 2 "
>
<Coordinate point="0.226281 -0.548050 -0.187500 -0.147805 -0.574210 -0.187500 -0.226281 0.548051 -0.187500 0.147805 0.574210 -0.187500 -0.147805 -0.574210 0.187500 0.226281 -0.548050 0.187500 0.147805 0.574210 0.187500 -0.226281 0.548051 0.187500 -0.226281 0.548051 0.187500 0.147805 0.574210 0.187500 0.226281 -0.548050 0.187500 -0.147805 -0.574210 0.187500 -0.147805 -0.574210 -0.187500 0.226281 -0.548050 -0.187500 0.226281 -0.548050 0.187500 0.147805 0.574210 0.187500 " />
<Coordinate point="0.265519 -1.109180 -0.187500 -0.108567 -1.135339 -0.187500 -0.187043 -0.013079 -0.187500 0.187043 0.013080 -0.187500 -0.108567 -1.135339 0.187500 0.265519 -1.109180 0.187500 0.187043 0.013080 0.187500 -0.187043 -0.013079 0.187500 -0.187043 -0.013079 0.187500 0.187043 0.013080 0.187500 0.265519 -1.109180 0.187500 -0.108567 -1.135339 0.187500 -0.108567 -1.135339 -0.187500 0.265519 -1.109180 -0.187500 0.265519 -1.109180 0.187500 0.187043 0.013080 0.187500 " />
<Normal vector="0.616199 -0.535661 -0.577349 -0.535661 -0.616199 -0.577349 -0.616199 0.535661 -0.577349 0.535661 0.616199 -0.577349 -0.535661 -0.616199 0.577349 0.616199 -0.535661 0.577349 0.535661 0.616199 0.577349 -0.616199 0.535661 0.577349 -0.616199 0.535661 0.577349 0.535661 0.616199 0.577349 0.616199 -0.535661 0.577349 -0.535661 -0.616199 0.577349 -0.535661 -0.616199 -0.577349 0.616199 -0.535661 -0.577349 0.616199 -0.535661 0.577349 0.535661 0.616199 0.577349 " />
<TextureCoordinate point="0.0469 0.3281 0.0938 0.3281 0.0938 0.4688 0.0469 0.4688 0.1406 0.3281 0.1875 0.3281 0.1875 0.4688 0.1406 0.4688 0.0938 0.5156 0.0469 0.5156 0.0938 0.4688 0.1406 0.4688 0.1406 0.5156 0.0938 0.5156 0.0000 0.3281 0.0000 0.4688 " />
</IndexedTriangleSet>
Expand All @@ -238,7 +238,7 @@
</Transform>
</Transform>
<Transform DEF="Right_leg_TRANSFORM"
translation="0.308415 -0.699362 0.000000"
translation="0.347653 -0.138232 0.000000"
scale="1.000000 1.000000 1.000000"
rotation="0.000000 1.000000 0.000000 0.000000"
>
Expand All @@ -256,7 +256,7 @@
normalPerVertex="true"
index="0 1 2 0 2 3 4 5 6 4 6 7 3 2 8 3 8 9 10 11 12 10 12 13 14 0 3 14 3 15 1 4 7 1 7 2 "
>
<Coordinate point="0.147805 -0.574210 -0.187500 -0.226281 -0.548050 -0.187500 -0.147805 0.574210 -0.187500 0.226281 0.548051 -0.187500 -0.226281 -0.548050 0.187500 0.147805 -0.574210 0.187500 0.226281 0.548051 0.187500 -0.147805 0.574210 0.187500 -0.147805 0.574210 0.187500 0.226281 0.548051 0.187500 0.147805 -0.574210 0.187500 -0.226281 -0.548050 0.187500 -0.226281 -0.548050 -0.187500 0.147805 -0.574210 -0.187500 0.147805 -0.574210 0.187500 0.226281 0.548051 0.187500 " />
<Coordinate point="0.108567 -1.135339 -0.187500 -0.265519 -1.109180 -0.187500 -0.187043 0.013080 -0.187500 0.187043 -0.013079 -0.187500 -0.265519 -1.109180 0.187500 0.108567 -1.135339 0.187500 0.187043 -0.013079 0.187500 -0.187043 0.013080 0.187500 -0.187043 0.013080 0.187500 0.187043 -0.013079 0.187500 0.108567 -1.135339 0.187500 -0.265519 -1.109180 0.187500 -0.265519 -1.109180 -0.187500 0.108567 -1.135339 -0.187500 0.108567 -1.135339 0.187500 0.187043 -0.013079 0.187500 " />
<Normal vector="0.535661 -0.616199 -0.577349 -0.616199 -0.535661 -0.577349 -0.535661 0.616199 -0.577349 0.616199 0.535661 -0.577349 -0.616199 -0.535661 0.577349 0.535661 -0.616199 0.577349 0.616199 0.535661 0.577349 -0.535661 0.616199 0.577349 -0.535661 0.616199 0.577349 0.616199 0.535661 0.577349 0.535661 -0.616199 0.577349 -0.616199 -0.535661 0.577349 -0.616199 -0.535661 -0.577349 0.535661 -0.616199 -0.577349 0.535661 -0.616199 0.577349 0.616199 0.535661 0.577349 " />
<TextureCoordinate point="0.0469 0.3281 0.0938 0.3281 0.0938 0.4688 0.0469 0.4688 0.1406 0.3281 0.1875 0.3281 0.1875 0.4688 0.1406 0.4688 0.0938 0.5156 0.0469 0.5156 0.0938 0.4688 0.1406 0.4688 0.1406 0.5156 0.0938 0.5156 0.0000 0.3281 0.0000 0.4688 " />
</IndexedTriangleSet>
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ModelAnimator version="0.1">
<model name="">
<phase headAxis="1" headCap="-50,50" name="global" scale=".1"/>
<phase name="global" scale=".1"/>
<metadata head="head"/>
<phase armAngle="50" duration="10" leftArm="Left_arm" leftLeg="Left_leg" legAngle="45" name="biWalk" rightArm="Right_arm" rightLeg="Right_leg"/>
</model>
</ModelAnimator>
Loading

0 comments on commit b50dc0c

Please sign in to comment.