- refreshed models

elect86 · elect86 · commit c507f2ff6695 · 2017-01-29T18:55:33.000+01:00
diff --git a/src/test/resources/models-nonbsd/3DS/jeep1.3ds.readme.txt b/src/test/resources/models-nonbsd/3DS/jeep1.3ds.readme.txt
@@ -2,7 +2,7 @@ Jeep designed, modelled and skinned by me, Psionic
 
 FREE for use however you like, credits are appreciated!!!
 
-It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations main.main.plus a UV template to help out if you want to create your own skin variations.
+It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations plus a UV template to help out if you want to create your own skin variations.
 
 I'd love to see a few screenshots of it being used in-game so feel free to stop by my site and maybe drop by my forums and show us all what your doing with it!!!!!!!
 
diff --git a/src/test/resources/models-nonbsd/BLEND/bob.source.txt b/src/test/resources/models-nonbsd/BLEND/bob.source.txt
@@ -12,7 +12,7 @@ Files and media are provided "as is" without any explicit or implied warranty of
 
 
 DISTRIBUTION
-Copyright � 2009 KatsBits. Distribution MUST include this readme and authorship attribution.
+Copyright � 2009 KatsBits. Distribution MUST include this readme and authorship attribution.
 Commercial use is permitted with written licensed permission.
 ----------------------------------------------------------------------------------------------
 
diff --git a/src/test/resources/models-nonbsd/FBX/2013_ASCII/jeep1.fbx b/src/test/resources/models-nonbsd/FBX/2013_ASCII/jeep1.fbx
@@ -862,7 +862,7 @@ Objects:  {
 		Shading: T
 		Culling: "CullingOff"
 	}
-	Model: 39795488, "Model::main.main", "Mesh" {
+	Model: 39795488, "Model::main", "Mesh" {
 		Version: 232
 		Properties70:  {
 			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
@@ -969,7 +969,7 @@ Connections:  {
 	;Model::lsteer, Model::RootNode
 	C: "OO",39793552,0
 	
-	;Model::main.main, Model::RootNode
+	;Model::main, Model::RootNode
 	C: "OO",39795488,0
 	
 	;Video::jeep1.jpg, Texture::jeep1.jpg
@@ -1011,10 +1011,10 @@ Connections:  {
 	;Material::Material01, Model::lsteer
 	C: "OO",39275328,39793552
 	
-	;Geometry::, Model::main.main
+	;Geometry::, Model::main
 	C: "OO",39376576,39795488
 	
-	;Material::Material01, Model::main.main
+	;Material::Material01, Model::main
 	C: "OO",39275328,39795488
 	
 	;AnimLayer::Base Layer, AnimStack::Take 001
diff --git a/src/test/resources/models-nonbsd/FBX/2013_ASCII/jeep1.fbx.readme.txt b/src/test/resources/models-nonbsd/FBX/2013_ASCII/jeep1.fbx.readme.txt
@@ -2,7 +2,7 @@ Jeep designed, modelled and skinned by me, Psionic
 
 FREE for use however you like, credits are appreciated!!!
 
-It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations main.main.plus a UV template to help out if you want to create your own skin variations.
+It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations plus a UV template to help out if you want to create your own skin variations.
 
 I'd love to see a few screenshots of it being used in-game so feel free to stop by my site and maybe drop by my forums and show us all what your doing with it!!!!!!!
 
diff --git a/src/test/resources/models-nonbsd/FBX/2013_BINARY/jeep1.fbx.readme.txt b/src/test/resources/models-nonbsd/FBX/2013_BINARY/jeep1.fbx.readme.txt
@@ -2,7 +2,7 @@ Jeep designed, modelled and skinned by me, Psionic
 
 FREE for use however you like, credits are appreciated!!!
 
-It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations main.main.plus a UV template to help out if you want to create your own skin variations.
+It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations plus a UV template to help out if you want to create your own skin variations.
 
 I'd love to see a few screenshots of it being used in-game so feel free to stop by my site and maybe drop by my forums and show us all what your doing with it!!!!!!!
 
diff --git a/src/test/resources/models-nonbsd/MD5/bob.source.txt b/src/test/resources/models-nonbsd/MD5/bob.source.txt
@@ -12,7 +12,7 @@ Files and media are provided "as is" without any explicit or implied warranty of
 
 
 DISTRIBUTION
-Copyright � 2009 KatsBits. Distribution MUST include this readme and authorship attribution.
+Copyright � 2009 KatsBits. Distribution MUST include this readme and authorship attribution.
 Commercial use is permitted with written licensed permission.
 ----------------------------------------------------------------------------------------------
 
diff --git a/src/test/resources/models-nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt b/src/test/resources/models-nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt
@@ -28,7 +28,7 @@ progs.dat     : no
 Description of the Modification
 -------------------------------
 
-This is a new player.mdl for quake. It's main.main use is for bots. The Skins are Snake Eyes v4, Duke v3, Low-Light,
+This is a new player.mdl for quake. It's main use is for bots. The Skins are Snake Eyes v4, Duke v3, Low-Light,
 Storm Shadow v2, Shockwave, Repeater, Gung-Ho, Shipwreck, Dusty v3, and 
 Tunnel Rat v2. 
 
@@ -53,7 +53,7 @@ Author Information
 ------------------
 
 This is my first publicly distributed quake graphic change.
-I did it to main.main.get away from the stress of school.
+I did it to get away from the stress of school.
 
 
 Copyright and Distribution Permissions
diff --git a/src/test/resources/models-nonbsd/README.txt b/src/test/resources/models-nonbsd/README.txt
@@ -1,3 +1,3 @@
-These models are not generally redistributable under the terms of Assimp'S BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).
+These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).
 
 So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.
diff --git a/src/test/resources/models/3DS/UVTransformTest/note.txt b/src/test/resources/models/3DS/UVTransformTest/note.txt
@@ -1,8 +1,8 @@
-All 'mirror' files are not absolutely correct. That's mainly
-because it's difficult convert Max' handling of mirroring to
+All 'mirror' files are not absolutely correct. That's mainly 
+because it's difficult convert Max' handling of mirroring to 
 our's.
 
-In other main.main.getWords: TO DO, but only if someone REALLY needs it.
+In other words: TO DO, but only if someone REALLY needs it.
 
 -------------------------------------------------------------
 
diff --git a/src/test/resources/models/BVH/01_nn.bvh.source.txt b/src/test/resources/models/BVH/01_nn.bvh.source.txt
@@ -10,7 +10,7 @@ READMEFIRST v1.00 last update July 20, 2008 by B. Hahne
 This READMEFIRST file accompanies the cgspeed.com "BVH conversion"
 release of the Carnegie-Mellon University (CMU) Graphics Lab Motion
 Capture Database.  See "Where to find stuff" at the bottom of this
-file for where to main.main.get the BVH conversion and/or the original CMU
+file for where to get the BVH conversion and/or the original CMU
 dataset.
 
 The original CMU motion capture database isn't in BVH format - it's
diff --git a/src/test/resources/models/MS3D/jeep1.readme.txt b/src/test/resources/models/MS3D/jeep1.readme.txt
@@ -2,7 +2,7 @@ Jeep designed, modelled and skinned by me, Psionic
 
 FREE for use however you like, credits are appreciated!!!
 
-It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations main.main.plus a UV template to help out if you want to create your own skin variations.
+It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations plus a UV template to help out if you want to create your own skin variations.
 
 I'd love to see a few screenshots of it being used in-game so feel free to stop by my site and maybe drop by my forums and show us all what your doing with it!!!!!!!
 
diff --git a/src/test/resources/models/OBJ/box.obj b/src/test/resources/models/OBJ/box.obj
@@ -20,7 +20,7 @@ v 0.5 0.5 0.5
 # Point/Line/Face list
 
 usemtl Default
-f 4//3 3 2 1
+f 4 3 2 1
 f 2 6 5 1
 f 3 7 6 2
 f 8 7 3 4
diff --git a/src/test/resources/models/OBJ/regr01.obj b/src/test/resources/models/OBJ/regr01.obj
@@ -4838,7 +4838,7 @@ v  790.00000000 845.00000000 8.00000000
 # 72 vertices
 
 g Terraindek-01
-usemtl Terraind�k
+usemtl Terraind�k
 f 1438 1433 1427
 f 1438 1427 1432
 f 1437 1438 1432
@@ -4931,7 +4931,7 @@ v  20.00000000 845.00000000 12.00000000
 # 36 vertices
 
 g Terraindek-02
-usemtl Terraind�k
+usemtl Terraind�k
 f 1501 1500 1499
 f 1503 1502 1501
 f 1504 1503 1501
diff --git a/src/test/resources/models/X/BCN_Epileptic.txt b/src/test/resources/models/X/BCN_Epileptic.txt
@@ -1 +1 @@
-A human body separated into three meshes: lower body, upper body, head. A common bone hierarchy for all three meshes, main.main.plus an test animation that makes the body sort of jump. No material information exported.
+A human body separated into three meshes: lower body, upper body, head. A common bone hierarchy for all three meshes, plus an test animation that makes the body sort of jump. No material information exported.
diff --git a/src/test/resources/models/glTF/BoxTextured-glTF/BoxTextured0FS.glsl b/src/test/resources/models/glTF/BoxTextured-glTF/BoxTextured0FS.glsl
@@ -4,7 +4,7 @@ varying vec2 v_texcoord0;
 uniform sampler2D u_diffuse;
 uniform vec4 u_specular;
 uniform float u_shininess;
-void main.main(void) {
+void main(void) {
 vec3 normal = normalize(v_normal);
 vec4 color = vec4(0., 0., 0., 0.);
 vec4 diffuse = vec4(0., 0., 0., 1.);
diff --git a/src/test/resources/models/glTF/BoxTextured-glTF/BoxTextured0VS.glsl b/src/test/resources/models/glTF/BoxTextured-glTF/BoxTextured0VS.glsl
@@ -7,7 +7,7 @@ uniform mat4 u_modelViewMatrix;
 uniform mat4 u_projectionMatrix;
 attribute vec2 a_texcoord0;
 varying vec2 v_texcoord0;
-void main.main(void) {
+void main(void) {
 vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
 v_normal = u_normalMatrix * a_normal;
 v_texcoord0 = a_texcoord0;
diff --git a/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl b/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl
@@ -3,7 +3,7 @@ varying vec3 v_normal;
 uniform vec4 u_diffuse;
 uniform vec4 u_specular;
 uniform float u_shininess;
-void main.main(void) {
+void main(void) {
 vec3 normal = normalize(v_normal);
 vec4 color = vec4(0., 0., 0., 0.);
 vec4 diffuse = vec4(0., 0., 0., 1.);
diff --git a/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl b/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl
@@ -5,7 +5,7 @@ varying vec3 v_normal;
 uniform mat3 u_normalMatrix;
 uniform mat4 u_modelViewMatrix;
 uniform mat4 u_projectionMatrix;
-void main.main(void) {
+void main(void) {
 vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
 v_normal = u_normalMatrix * a_normal;
 gl_Position = u_projectionMatrix * pos;
diff --git a/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl b/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl
@@ -4,7 +4,7 @@ varying vec2 v_texcoord0;
 uniform sampler2D u_diffuse;
 uniform vec4 u_specular;
 uniform float u_shininess;
-void main.main(void) {
+void main(void) {
 vec3 normal = normalize(v_normal);
 vec4 color = vec4(0., 0., 0., 0.);
 vec4 diffuse = vec4(0., 0., 0., 1.);
diff --git a/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl b/src/test/resources/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl
@@ -7,7 +7,7 @@ uniform mat4 u_modelViewMatrix;
 uniform mat4 u_projectionMatrix;
 attribute vec2 a_texcoord0;
 varying vec2 v_texcoord0;
-void main.main(void) {
+void main(void) {
 vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
 v_normal = u_normalMatrix * a_normal;
 v_texcoord0 = a_texcoord0;
diff --git a/src/test/resources/models/glTF/TwoBoxes/Box0FS.glsl b/src/test/resources/models/glTF/TwoBoxes/Box0FS.glsl
@@ -3,7 +3,7 @@ varying vec3 v_normal;
 uniform vec4 u_diffuse;
 uniform vec4 u_specular;
 uniform float u_shininess;
-void main.main(void) {
+void main(void) {
 vec3 normal = normalize(v_normal);
 vec4 color = vec4(0., 0., 0., 0.);
 vec4 diffuse = vec4(0., 0., 0., 1.);
diff --git a/src/test/resources/models/glTF/TwoBoxes/Box0VS.glsl b/src/test/resources/models/glTF/TwoBoxes/Box0VS.glsl
@@ -5,7 +5,7 @@ varying vec3 v_normal;
 uniform mat3 u_normalMatrix;
 uniform mat4 u_modelViewMatrix;
 uniform mat4 u_projectionMatrix;
-void main.main(void) {
+void main(void) {
 vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
 v_normal = u_normalMatrix * a_normal;
 gl_Position = u_projectionMatrix * pos;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-These models are not generally redistributable under the terms of Assimp'S BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).`
	`1`	`+These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).`
`2`	`2`
`3`	`3`	`So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.`