diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..de3cdd9 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,20 @@ +name: Maven + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Java 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + - name: Verify + run: mvn --batch-mode --update-snapshots clean verify \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7d27f86..24f94e6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ .project .classpath +# vscode resources +.vscode/ + # binary folders /gen /build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c2617d7..0000000 --- a/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -language: java - -script: mvn clean verify - diff --git a/README.md b/README.md index 038e391..5838bf4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ java-data-front =============== -![](https://travis-ci.org/momchil-atanasov/java-data-front.svg?branch=master) +![maven verify status](https://github.com/mokiat/java-data-front/actions/workflows/maven.yml/badge.svg?branch=master) -A Java library for reading and writing Wavefront 3D model resources (OBJ, MTL). - -**Note:** Though planned in the future, it is not possible to serialize OBJ or MTL resources at the moment. +A Java library for reading Wavefront 3D model resources (OBJ, MTL). The OBJ and MTL file formats are one of the most popular 3D model formats used at the moment. This is mainly due to their simplicity. @@ -34,9 +32,9 @@ d 0.7 map_Kd vehicle.png ``` -I am not sure what is the exact history of these file formats, but I believe they were first introduced by the Wavefront Technologies company for their 3D software. Now they are available in practically all 3D modeling softwares. +The `obj` and `mtl` file formats were originally developed by the Wavefront Technologies company for their 3D visualizer software. Currently, they are available in practically all 3D modeling solutions. -## Parsing OBJs +## Loading OBJ resources Using this library is meant to be easy and straightforward. All you need to do is instantiate an `OBJParser` and pass it an `InputStream` to your OBJ resource. @@ -44,42 +42,27 @@ Using this library is meant to be easy and straightforward. All you need to do i ```java // Open a stream to your OBJ resource -final InputStream in = new FileInputStream("example.obj"); - -// Create an OBJParser and parse the resource -final IOBJParser parser = new OBJParser(); -final OBJModel model = parser.parse(in); - -// Use the model representation to get some basic info -System.out.println(MessageFormat.format( - "OBJ model has {0} vertices, {1} normals, {2} texture coordinates, and {3} objects.", - model.getVertices().size(), - model.getNormals().size(), - model.getTexCoords().size(), - model.getObjects().size())); -``` - -Let's look at the API in a bit more detail. - -So parsing is straightforward. You saw that in the previous code snippet. What's important to keep in mind is that you can have any InputStream. This means that you could open your model from a Java resource or a remote HTTP resource. - -**Example:** - -```java -final URL url = new URL("http://www.example.org/models/example.obj"); -final InputStream in = url.openStream(); -final IOBJParser parser = new OBJParser(); -final OBJModel model = parser.parse(in); -// You know what to do next... +try (InputStream in = new FileInputStream("example.obj")) { + // Create an OBJParser and parse the resource + final IOBJParser parser = new OBJParser(); + final OBJModel model = parser.parse(in); + + // Use the model representation to get some basic info + System.out.println(MessageFormat.format( + "OBJ model has {0} vertices, {1} normals, {2} texture coordinates, and {3} objects.", + model.getVertices().size(), + model.getNormals().size(), + model.getTexCoords().size(), + model.getObjects().size())); +} ``` -No matter where you load the OBJ resource from, you always get the same `OBJModel` model representation. +When you parse an OBJ resource, you get a `OBJModel` representation. +We use the `getVertices`, `getNormals`, and `getTexCoords` methods to get access to all of the vertices, normals and texture coordinates respectively that are defined in the OBJ resource. Since these can be shared between multiple objects, their getter methods are defined on the root `OBJModel` element. -As you've seen above, we used the `getVertices()`, `getNormals()`, and `getTexCoords()` methods. These give you access to all of the vertices, normals and texture coordinates respectively that were defined in the OBJ resource. Since these are shared between objects, that's why they are defined on the root `OBJModel` element. +Additionally, you have the `getMaterialLibraries` method. It provides a list of all the material dependencies that were declared in the OBJ resource. The method returns a list of strings, representing resources that can be parsed via a `MTLParser` parser. It is up to your implementation to locate those resources and process them, as the `OBJParser` has no way of knowing from where the OBJ resource originates. -Additionally, you have the `getMaterialLibraries()` method. This one provides you a list of all the material dependencies that were declared in the OBJ resource. The method returns a list of strings. You will need to use the `MTLParser` to load these resources. It is up to you to locate those resources, though. Since the parser has no idea from where the original OBJ resource is being parsed, it cannot know how to resolve relative dependencies (could be file, could be URL, etc.). - -The most interesting of methods is the `getObjects()` method which lists all of the objects that are defined in the OBJ resource. These are the entities you would usually iterate through to get the mesh data. +The `getObjects` method lists all of the objects that are defined in the OBJ resource. These are the entities you would usually iterate through to get the mesh data. **Example:** @@ -98,14 +81,14 @@ One thing that does not exactly match the OBJ specification is the `OBJMesh` con **Example:** ```java -final OBJMesh mesh = ...; // You already know how to get this. +final OBJMesh mesh = ...; final String materialName = mesh.getMaterialName(); final List faces = mesh.getFaces(); ``` -You would use the `materialName` to select the proper material to use for rendering the list of `OBJFace` instances. You will need to locate the material in one of the `OBJMaterial` resources that you have previously loaded as instructed by `getMaterialLibraries()`. +One would use the `materialName` value to select the proper material to use for rendering the list of `OBJFace` instances. The actual material would need to have been parsed in advance (as explained above) and probably stored in a map structure for easy access. -Now that you know how to get to the distinct faces and which material to use, what's left is to get their mesh data. +Knowing how to get to all faces and related materials, one needs a way to get the mesh data of each individual face. **Example:** @@ -128,35 +111,37 @@ for (OBJDataReference reference : face.getReferences()) { } ``` -A face can be defined by arbitrary number of vertices, as long as they are more than three. This is why each has the `getReferences()` method that returns a list of `OBJDataReference` objects. This object represents a single vertex and allows you to locate the positional, normal and texture coordinate information for that vertex. This happens through the usage for indices that point at the master data (i.e. `getVertices()`, `getNormals()`, `getTexCoords()`). There are helper methods like `hasNormalIndex()` that help you determine if the vertex has a normal declared and `getNormal` that automatically locates the `OBJNormal` instance for you. +A face can be defined by arbitrary number of vertices, as long as they are more than three. This is why each face has the `getReferences` method that returns a list of `OBJDataReference` objects. This object represents a single vertex and allows you to locate the positional, normal and texture coordinate information for that vertex. This happens through the usage for indices that point at the master data (the one available through `getVertices`, `getNormals`, `getTexCoords`). There are helper methods like `hasNormalIndex` that help you determine if the vertex has a normal declared and `getNormal` that automatically locates the `OBJNormal` instance for you. + +## Loading MTL resources -## Parsing MTLs -Parsing material libraries is performed in the same way as objects. All you need to do is instantiate an `MTLParser` and pass it an `InputStream` to your MTL resource. +Parsing material libraries is performed in the same way as objects. All one needs to do is instantiate an `MTLParser` and pass it an `InputStream` to the MTL resource. **Example:** ```java -final InputStream in = new FileInputStream("example.mtl"); -final IMTLParser parser = new MTLParser(); -final MTLLibrary library = parser.parse(in); -for (MTLMaterial material : library.getMaterials()) { - System.out.println(MessageFormat.format("Material with name ``{0}``.", material.getName())); +try (InputStream in = new FileInputStream("example.mtl")) { + final IMTLParser parser = new MTLParser(); + final MTLLibrary library = parser.parse(in); + for (MTLMaterial material : library.getMaterials()) { + System.out.println(MessageFormat.format("Material with name `{0}`.", material.getName())); + } } ``` -The `MTLMaterial` object represents a material that is defined in the MTL resource. You can have many of these defined in a single resource. Each of these has a name and some generic material data like diffuse color, ambient color, specular color, etc. +The `MTLMaterial` object represents a material that is defined in the MTL resource. There can be a number of these defined in a single MTL resource. Each of these has a name and some generic material data like diffuse color, ambient color, specular color, etc. **Example:** ```java -final MTLMaterial material = ...; // You already know how to get this. +final MTLMaterial material = ...; final MTLColor diffuseColor = material.getDiffuseColor(); final MTLColor ambientColor = material.getAmbientColor(); final MTLColor specularColor = material.getSpecularColor(); ``` -As you can see, parsing MTL resources is not that different from parsing OBJ resources. You wouldn't usually parse MTL resources on their own, though. Most often you would use the information from the OBJ resource to locate the MTL resources and load them. +One would rarely parse MTL files separately. Often, this would be as part of the parsing of an OBJ file. **Example:** @@ -167,19 +152,51 @@ final IMTLParser mtlParser = new MTLParser(); final InputStream objStream = ...; // Depends on your use case. final OBJModel model = objParser.parse(objStream); for (String libraryReference : model.getMaterialLibraries()) { - final InputStream mtlStream = ...; // You will need to resolve this based on `libraryReference` + final InputStream mtlStream = ...; // You will need to resolve this based on `libraryReference` and the storage used final MTLLibrary library = mtlParser.parse(mtlStream); - // Do something with the library. Maybe store it for later usage. + // Do something with the library. Maybe store it in a map for later usage. } ``` -## Notes +## Setting Up + +Even though this project relies on Maven for packaging, it has not been published to the central Maven repository. Following are a number of approaches to get the library imported in your project. + +### JitPack + +An amazing web page that allows one to import Maven projects directly from GitHub. It is ideal for publishing new and small projects like this one. +One only needs to add the following configuration in their `pom.xml` file to get the library included. + +```xml + + + jitpack.io + https://jitpack.io + + + + + + com.github.mokiat + java-data-front + v2.0.1 + + +``` + +JitPack works with other packaging frameworks as well. Check the [official webpage](https://jitpack.io/) for more information. + +### Packaging + +If `JitPack` is not an option for your use case, then you could package the `jar` files into your project. They are available for download from the [Releases](https://github.com/mokiat/java-data-front/releases) section of the repository. + -This library was implemented to support other projects of mine. As such, it supports only a subset of the OBJ and MTL specifications (which are large). The features that are provided should be sufficient for most use cases. +### Local Maven repository -Though not shown in the code snippets above, it is important that you always close any `InputStream` objects as that is not done by the API. I have omitted that on purpose to keep the snippets simple to read. +You can use a set of commands to import the `jar` files into your local Maven repository. Following are two available approaches. (I find the first one to do the job) -If you want to see an application that already uses this library, take a look at **[ModelViewer3D](https://play.google.com/store/apps/details?id=com.momchil_atanasov.android.modelviewer)**. +* [http://maven.apache.org/plugins/maven-install-plugin/examples/custom-pom-installation.html](http://maven.apache.org/plugins/maven-install-plugin/examples/custom-pom-installation.html) +* [http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html](http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html) ## License diff --git a/pom.xml b/pom.xml index d95533f..8a6efe5 100755 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,16 @@ - 4.0.0 - com.momchil_atanasov - com.momchil_atanasov.data.front - 1.0.0 + com.mokiat + com.mokiat.data.front + 2.0.1 jar - http://momchil-atanasov.com + https://github.com/mokiat/java-data-front UTF-8 @@ -19,48 +20,37 @@ junit junit - 4.11 + 4.13.2 test org.mockito mockito-core - 1.9.5 + 4.2.0 test - org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.9.0 - 1.6 - 1.6 + 1.7 + 1.7 - - org.apache.maven.plugins maven-surefire-plugin - 2.10 + 2.22.2 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.16 - - - org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.1 attach-sources @@ -70,12 +60,10 @@ - - org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 3.3.1 attach-javadoc diff --git a/src/main/java/com/momchil_atanasov/data/front/common/FastFloat.java b/src/main/java/com/mokiat/data/front/common/FastFloat.java similarity index 87% rename from src/main/java/com/momchil_atanasov/data/front/common/FastFloat.java rename to src/main/java/com/mokiat/data/front/common/FastFloat.java index 188b5c3..fa16034 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/FastFloat.java +++ b/src/main/java/com/mokiat/data/front/common/FastFloat.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; /** * Internal implementation of the {@link IFastFloat} diff --git a/src/main/java/com/momchil_atanasov/data/front/common/FastInt.java b/src/main/java/com/mokiat/data/front/common/FastInt.java similarity index 87% rename from src/main/java/com/momchil_atanasov/data/front/common/FastInt.java rename to src/main/java/com/mokiat/data/front/common/FastInt.java index 6684bf7..64b2859 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/FastInt.java +++ b/src/main/java/com/mokiat/data/front/common/FastInt.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; /** * Internal implementation of the {@link IFastInt} diff --git a/src/main/java/com/momchil_atanasov/data/front/common/IFastFloat.java b/src/main/java/com/mokiat/data/front/common/IFastFloat.java similarity index 88% rename from src/main/java/com/momchil_atanasov/data/front/common/IFastFloat.java rename to src/main/java/com/mokiat/data/front/common/IFastFloat.java index 6e19b7c..ae738f3 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/IFastFloat.java +++ b/src/main/java/com/mokiat/data/front/common/IFastFloat.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; /** * This interface is used to provide a float value. diff --git a/src/main/java/com/momchil_atanasov/data/front/common/IFastInt.java b/src/main/java/com/mokiat/data/front/common/IFastInt.java similarity index 88% rename from src/main/java/com/momchil_atanasov/data/front/common/IFastInt.java rename to src/main/java/com/mokiat/data/front/common/IFastInt.java index f89f87b..2aed60a 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/IFastInt.java +++ b/src/main/java/com/mokiat/data/front/common/IFastInt.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; /** * This interface is used to provide an integer value. diff --git a/src/main/java/com/momchil_atanasov/data/front/common/MTLLimits.java b/src/main/java/com/mokiat/data/front/common/MTLLimits.java similarity index 87% rename from src/main/java/com/momchil_atanasov/data/front/common/MTLLimits.java rename to src/main/java/com/mokiat/data/front/common/MTLLimits.java index bbb7639..bd87e02 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/MTLLimits.java +++ b/src/main/java/com/mokiat/data/front/common/MTLLimits.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; -import com.momchil_atanasov.data.front.error.WFSizeException; +import com.mokiat.data.front.error.WFSizeException; /** * The {@link MTLLimits} class can be used to diff --git a/src/main/java/com/momchil_atanasov/data/front/common/OBJLimits.java b/src/main/java/com/mokiat/data/front/common/OBJLimits.java similarity index 92% rename from src/main/java/com/momchil_atanasov/data/front/common/OBJLimits.java rename to src/main/java/com/mokiat/data/front/common/OBJLimits.java index 83ca7cd..7a8952f 100755 --- a/src/main/java/com/momchil_atanasov/data/front/common/OBJLimits.java +++ b/src/main/java/com/mokiat/data/front/common/OBJLimits.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.common; +package com.mokiat.data.front.common; -import com.momchil_atanasov.data.front.error.WFSizeException; +import com.mokiat.data.front.error.WFSizeException; /** * The {@link OBJLimits} class can be used to diff --git a/src/main/java/com/momchil_atanasov/data/front/error/WFCorruptException.java b/src/main/java/com/mokiat/data/front/error/WFCorruptException.java similarity index 89% rename from src/main/java/com/momchil_atanasov/data/front/error/WFCorruptException.java rename to src/main/java/com/mokiat/data/front/error/WFCorruptException.java index daa4883..620b1fc 100755 --- a/src/main/java/com/momchil_atanasov/data/front/error/WFCorruptException.java +++ b/src/main/java/com/mokiat/data/front/error/WFCorruptException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; /** * This exception is used to indicate a corrupt or invalid diff --git a/src/main/java/com/momchil_atanasov/data/front/error/WFException.java b/src/main/java/com/mokiat/data/front/error/WFException.java similarity index 90% rename from src/main/java/com/momchil_atanasov/data/front/error/WFException.java rename to src/main/java/com/mokiat/data/front/error/WFException.java index 0b3c494..8da63b1 100755 --- a/src/main/java/com/momchil_atanasov/data/front/error/WFException.java +++ b/src/main/java/com/mokiat/data/front/error/WFException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; import java.io.IOException; diff --git a/src/main/java/com/momchil_atanasov/data/front/error/WFSizeException.java b/src/main/java/com/mokiat/data/front/error/WFSizeException.java similarity index 89% rename from src/main/java/com/momchil_atanasov/data/front/error/WFSizeException.java rename to src/main/java/com/mokiat/data/front/error/WFSizeException.java index 799d44e..e1caa08 100755 --- a/src/main/java/com/momchil_atanasov/data/front/error/WFSizeException.java +++ b/src/main/java/com/mokiat/data/front/error/WFSizeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; /** * This exception is used to indicate that a WaveFront diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/IMTLParser.java b/src/main/java/com/mokiat/data/front/parser/IMTLParser.java similarity index 88% rename from src/main/java/com/momchil_atanasov/data/front/parser/IMTLParser.java rename to src/main/java/com/mokiat/data/front/parser/IMTLParser.java index 78f2466..604cd89 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/IMTLParser.java +++ b/src/main/java/com/mokiat/data/front/parser/IMTLParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import com.momchil_atanasov.data.front.common.MTLLimits; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.MTLLimits; +import com.mokiat.data.front.error.WFException; /** * The {@link IMTLParser} interface provides methods diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/IOBJParser.java b/src/main/java/com/mokiat/data/front/parser/IOBJParser.java similarity index 88% rename from src/main/java/com/momchil_atanasov/data/front/parser/IOBJParser.java rename to src/main/java/com/mokiat/data/front/parser/IOBJParser.java index b5e468e..d253e13 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/IOBJParser.java +++ b/src/main/java/com/mokiat/data/front/parser/IOBJParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import com.momchil_atanasov.data.front.common.OBJLimits; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.OBJLimits; +import com.mokiat.data.front.error.WFException; /** * The {@link IOBJParser} interface provides methods diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/MTLColor.java b/src/main/java/com/mokiat/data/front/parser/MTLColor.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/parser/MTLColor.java rename to src/main/java/com/mokiat/data/front/parser/MTLColor.java index 2703b83..99df0f7 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/MTLColor.java +++ b/src/main/java/com/mokiat/data/front/parser/MTLColor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static java.lang.Float.floatToRawIntBits; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/MTLLibrary.java b/src/main/java/com/mokiat/data/front/parser/MTLLibrary.java similarity index 91% rename from src/main/java/com/momchil_atanasov/data/front/parser/MTLLibrary.java rename to src/main/java/com/mokiat/data/front/parser/MTLLibrary.java index 1d5fdc1..3478151 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/MTLLibrary.java +++ b/src/main/java/com/mokiat/data/front/parser/MTLLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/MTLMaterial.java b/src/main/java/com/mokiat/data/front/parser/MTLMaterial.java similarity index 95% rename from src/main/java/com/momchil_atanasov/data/front/parser/MTLMaterial.java rename to src/main/java/com/mokiat/data/front/parser/MTLMaterial.java index 269c8cb..058930c 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/MTLMaterial.java +++ b/src/main/java/com/mokiat/data/front/parser/MTLMaterial.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; /** * Represents a single material. diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/MTLParseRunner.java b/src/main/java/com/mokiat/data/front/parser/MTLParseRunner.java similarity index 84% rename from src/main/java/com/momchil_atanasov/data/front/parser/MTLParseRunner.java rename to src/main/java/com/mokiat/data/front/parser/MTLParseRunner.java index 25f6e8c..2768238 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/MTLParseRunner.java +++ b/src/main/java/com/mokiat/data/front/parser/MTLParseRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.MTLLimits; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.scanner.IMTLScanner; -import com.momchil_atanasov.data.front.scanner.IMTLScannerHandler; -import com.momchil_atanasov.data.front.scanner.MTLLimitingScannerHandler; -import com.momchil_atanasov.data.front.scanner.MTLScanner; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.MTLLimits; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.scanner.IMTLScanner; +import com.mokiat.data.front.scanner.IMTLScannerHandler; +import com.mokiat.data.front.scanner.MTLLimitingScannerHandler; +import com.mokiat.data.front.scanner.MTLScanner; /** * Internal class that helps in the MTL resource diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/MTLParser.java b/src/main/java/com/mokiat/data/front/parser/MTLParser.java similarity index 84% rename from src/main/java/com/momchil_atanasov/data/front/parser/MTLParser.java rename to src/main/java/com/mokiat/data/front/parser/MTLParser.java index 77ff726..67c0509 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/MTLParser.java +++ b/src/main/java/com/mokiat/data/front/parser/MTLParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; @@ -22,8 +22,8 @@ import java.io.InputStreamReader; import java.io.Reader; -import com.momchil_atanasov.data.front.common.MTLLimits; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.MTLLimits; +import com.mokiat.data.front.error.WFException; /** * Default implementation of the {@link IMTLParser} diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJDataReference.java b/src/main/java/com/mokiat/data/front/parser/OBJDataReference.java similarity index 94% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJDataReference.java rename to src/main/java/com/mokiat/data/front/parser/OBJDataReference.java index 51e7593..d13a22d 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJDataReference.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJDataReference.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; /** * The {@link OBJDataReference} structure holds index references diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJFace.java b/src/main/java/com/mokiat/data/front/parser/OBJFace.java similarity index 94% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJFace.java rename to src/main/java/com/mokiat/data/front/parser/OBJFace.java index 5334682..a4f7df3 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJFace.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJFace.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJMesh.java b/src/main/java/com/mokiat/data/front/parser/OBJMesh.java similarity index 92% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJMesh.java rename to src/main/java/com/mokiat/data/front/parser/OBJMesh.java index b9ee454..53ba3e3 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJMesh.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJMesh.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJModel.java b/src/main/java/com/mokiat/data/front/parser/OBJModel.java similarity index 94% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJModel.java rename to src/main/java/com/mokiat/data/front/parser/OBJModel.java index f90754c..e3d1c19 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJModel.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJNormal.java b/src/main/java/com/mokiat/data/front/parser/OBJNormal.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJNormal.java rename to src/main/java/com/mokiat/data/front/parser/OBJNormal.java index 8e5e39e..79109fc 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJNormal.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJNormal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static java.lang.Float.floatToRawIntBits; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJObject.java b/src/main/java/com/mokiat/data/front/parser/OBJObject.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJObject.java rename to src/main/java/com/mokiat/data/front/parser/OBJObject.java index 00098f5..d2d9ac9 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJObject.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJParseRunner.java b/src/main/java/com/mokiat/data/front/parser/OBJParseRunner.java similarity index 84% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJParseRunner.java rename to src/main/java/com/mokiat/data/front/parser/OBJParseRunner.java index 6b1d940..01a48be 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJParseRunner.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJParseRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.common.OBJLimits; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.parser.OBJTexCoord.Type; -import com.momchil_atanasov.data.front.scanner.IOBJScanner; -import com.momchil_atanasov.data.front.scanner.IOBJScannerHandler; -import com.momchil_atanasov.data.front.scanner.OBJLimitingScannerHandler; -import com.momchil_atanasov.data.front.scanner.OBJScanner; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.common.OBJLimits; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.parser.OBJTexCoord.Type; +import com.mokiat.data.front.scanner.IOBJScanner; +import com.mokiat.data.front.scanner.IOBJScannerHandler; +import com.mokiat.data.front.scanner.OBJLimitingScannerHandler; +import com.mokiat.data.front.scanner.OBJScanner; /** * Internal class that helps in the parsing of OBJ diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJParser.java b/src/main/java/com/mokiat/data/front/parser/OBJParser.java similarity index 84% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJParser.java rename to src/main/java/com/mokiat/data/front/parser/OBJParser.java index 622102c..71b1785 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJParser.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import java.io.BufferedReader; import java.io.IOException; @@ -22,8 +22,8 @@ import java.io.InputStreamReader; import java.io.Reader; -import com.momchil_atanasov.data.front.common.OBJLimits; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.OBJLimits; +import com.mokiat.data.front.error.WFException; /** * Default implementation of the {@link IOBJParser} diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJTexCoord.java b/src/main/java/com/mokiat/data/front/parser/OBJTexCoord.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJTexCoord.java rename to src/main/java/com/mokiat/data/front/parser/OBJTexCoord.java index c89e357..cfa937a 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJTexCoord.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJTexCoord.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static java.lang.Float.floatToRawIntBits; diff --git a/src/main/java/com/momchil_atanasov/data/front/parser/OBJVertex.java b/src/main/java/com/mokiat/data/front/parser/OBJVertex.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/parser/OBJVertex.java rename to src/main/java/com/mokiat/data/front/parser/OBJVertex.java index d5d727c..0e8a8d4 100755 --- a/src/main/java/com/momchil_atanasov/data/front/parser/OBJVertex.java +++ b/src/main/java/com/mokiat/data/front/parser/OBJVertex.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static java.lang.Float.floatToRawIntBits; diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScanner.java b/src/main/java/com/mokiat/data/front/scanner/IMTLScanner.java similarity index 90% rename from src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScanner.java rename to src/main/java/com/mokiat/data/front/scanner/IMTLScanner.java index 961f838..310d551 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScanner.java +++ b/src/main/java/com/mokiat/data/front/scanner/IMTLScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.error.WFException; /** * The {@link IMTLScanner} interface provides methods through which diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScannerHandler.java b/src/main/java/com/mokiat/data/front/scanner/IMTLScannerHandler.java similarity index 95% rename from src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScannerHandler.java rename to src/main/java/com/mokiat/data/front/scanner/IMTLScannerHandler.java index bb316c3..02190c7 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/IMTLScannerHandler.java +++ b/src/main/java/com/mokiat/data/front/scanner/IMTLScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFException; /** * Users should implement this interface and pass it to diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScanner.java b/src/main/java/com/mokiat/data/front/scanner/IOBJScanner.java similarity index 90% rename from src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScanner.java rename to src/main/java/com/mokiat/data/front/scanner/IOBJScanner.java index f4fdcc9..fa191a7 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScanner.java +++ b/src/main/java/com/mokiat/data/front/scanner/IOBJScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.error.WFException; /** * The {@link IOBJScanner} interface provides methods diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScannerHandler.java b/src/main/java/com/mokiat/data/front/scanner/IOBJScannerHandler.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScannerHandler.java rename to src/main/java/com/mokiat/data/front/scanner/IOBJScannerHandler.java index 430e1f3..af823e2 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/IOBJScannerHandler.java +++ b/src/main/java/com/mokiat/data/front/scanner/IOBJScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.error.WFException; /** * Users should implement this interface and pass it diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandler.java b/src/main/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandler.java similarity index 89% rename from src/main/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandler.java rename to src/main/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandler.java index 6dae75a..88e1ba8 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandler.java +++ b/src/main/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.MTLLimits; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.error.WFSizeException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.MTLLimits; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.error.WFSizeException; /** * This implementation of the {@link IMTLScannerHandler} assures diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanColor.java b/src/main/java/com/mokiat/data/front/scanner/MTLScanColor.java similarity index 86% rename from src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanColor.java rename to src/main/java/com/mokiat/data/front/scanner/MTLScanColor.java index accdc34..0986d40 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanColor.java +++ b/src/main/java/com/mokiat/data/front/scanner/MTLScanColor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFCorruptException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFCorruptException; /** * Internal class that is used to parse color definitions. diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanRunner.java b/src/main/java/com/mokiat/data/front/scanner/MTLScanRunner.java similarity index 93% rename from src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanRunner.java rename to src/main/java/com/mokiat/data/front/scanner/MTLScanRunner.java index 7d16dec..1bbfc94 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanRunner.java +++ b/src/main/java/com/mokiat/data/front/scanner/MTLScanRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFException; /** * Internal class that performs the MTL scanning. diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanner.java b/src/main/java/com/mokiat/data/front/scanner/MTLScanner.java similarity index 87% rename from src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanner.java rename to src/main/java/com/mokiat/data/front/scanner/MTLScanner.java index 4efca29..2c70d59 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/MTLScanner.java +++ b/src/main/java/com/mokiat/data/front/scanner/MTLScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; @@ -22,7 +22,7 @@ import java.io.InputStreamReader; import java.io.Reader; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.error.WFException; /** * Default implementation of the {@link IMTLScanner} diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandler.java b/src/main/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandler.java similarity index 89% rename from src/main/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandler.java rename to src/main/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandler.java index 21ce0b6..bf5616e 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandler.java +++ b/src/main/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.common.OBJLimits; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.error.WFSizeException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.common.OBJLimits; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.error.WFSizeException; /** * This implementation of the {@link IOBJScannerHandler} assures diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanDataReference.java b/src/main/java/com/mokiat/data/front/scanner/OBJScanDataReference.java similarity index 85% rename from src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanDataReference.java rename to src/main/java/com/mokiat/data/front/scanner/OBJScanDataReference.java index 3a09daf..f901d6b 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanDataReference.java +++ b/src/main/java/com/mokiat/data/front/scanner/OBJScanDataReference.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; -import com.momchil_atanasov.data.front.common.FastInt; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.error.WFCorruptException; +import com.mokiat.data.front.common.FastInt; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.error.WFCorruptException; /** * Internal class that is used to parse face data references. diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanRunner.java b/src/main/java/com/mokiat/data/front/scanner/OBJScanRunner.java similarity index 91% rename from src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanRunner.java rename to src/main/java/com/mokiat/data/front/scanner/OBJScanRunner.java index 9c2a78b..7fd061b 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanRunner.java +++ b/src/main/java/com/mokiat/data/front/scanner/OBJScanRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFException; /** * Internal class that performs the OBJ scanning. diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanner.java b/src/main/java/com/mokiat/data/front/scanner/OBJScanner.java similarity index 87% rename from src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanner.java rename to src/main/java/com/mokiat/data/front/scanner/OBJScanner.java index 9d7b6de..d2fcccd 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/OBJScanner.java +++ b/src/main/java/com/mokiat/data/front/scanner/OBJScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; @@ -22,7 +22,7 @@ import java.io.InputStreamReader; import java.io.Reader; -import com.momchil_atanasov.data.front.error.WFException; +import com.mokiat.data.front.error.WFException; /** * Default implementation of the {@link IOBJScanner} diff --git a/src/main/java/com/momchil_atanasov/data/front/scanner/WFScanCommand.java b/src/main/java/com/mokiat/data/front/scanner/WFScanCommand.java similarity index 90% rename from src/main/java/com/momchil_atanasov/data/front/scanner/WFScanCommand.java rename to src/main/java/com/mokiat/data/front/scanner/WFScanCommand.java index c31342c..4508295 100755 --- a/src/main/java/com/momchil_atanasov/data/front/scanner/WFScanCommand.java +++ b/src/main/java/com/mokiat/data/front/scanner/WFScanCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import java.io.BufferedReader; import java.io.IOException; -import com.momchil_atanasov.data.front.common.FastFloat; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFCorruptException; +import com.mokiat.data.front.common.FastFloat; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFCorruptException; /** * This class helps in parsing OBJ and MTL files by extracting element diff --git a/src/test/java/com/momchil_atanasov/data/front/error/AbstractWFExceptionTest.java b/src/test/java/com/mokiat/data/front/error/AbstractWFExceptionTest.java similarity index 86% rename from src/test/java/com/momchil_atanasov/data/front/error/AbstractWFExceptionTest.java rename to src/test/java/com/mokiat/data/front/error/AbstractWFExceptionTest.java index 3ca1b82..3f9c38f 100755 --- a/src/test/java/com/momchil_atanasov/data/front/error/AbstractWFExceptionTest.java +++ b/src/test/java/com/mokiat/data/front/error/AbstractWFExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; public class AbstractWFExceptionTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/error/WFCorruptExceptionTest.java b/src/test/java/com/mokiat/data/front/error/WFCorruptExceptionTest.java similarity index 87% rename from src/test/java/com/momchil_atanasov/data/front/error/WFCorruptExceptionTest.java rename to src/test/java/com/mokiat/data/front/error/WFCorruptExceptionTest.java index a283e4c..04f0dfb 100755 --- a/src/test/java/com/momchil_atanasov/data/front/error/WFCorruptExceptionTest.java +++ b/src/test/java/com/mokiat/data/front/error/WFCorruptExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -22,8 +22,6 @@ import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFCorruptException; - public class WFCorruptExceptionTest extends AbstractWFExceptionTest { @Test diff --git a/src/test/java/com/momchil_atanasov/data/front/error/WFSizeExceptionTest.java b/src/test/java/com/mokiat/data/front/error/WFSizeExceptionTest.java similarity index 87% rename from src/test/java/com/momchil_atanasov/data/front/error/WFSizeExceptionTest.java rename to src/test/java/com/mokiat/data/front/error/WFSizeExceptionTest.java index 35949e8..9253c35 100755 --- a/src/test/java/com/momchil_atanasov/data/front/error/WFSizeExceptionTest.java +++ b/src/test/java/com/mokiat/data/front/error/WFSizeExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.error; +package com.mokiat.data.front.error; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -22,8 +22,6 @@ import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFSizeException; - public class WFSizeExceptionTest extends AbstractWFExceptionTest { @Test diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/AbstractMTLParserTest.java b/src/test/java/com/mokiat/data/front/parser/AbstractMTLParserTest.java similarity index 71% rename from src/test/java/com/momchil_atanasov/data/front/parser/AbstractMTLParserTest.java rename to src/test/java/com/mokiat/data/front/parser/AbstractMTLParserTest.java index 95ac70d..0997fca 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/AbstractMTLParserTest.java +++ b/src/test/java/com/mokiat/data/front/parser/AbstractMTLParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,11 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; -import com.momchil_atanasov.data.front.parser.IMTLParser; -import com.momchil_atanasov.data.front.parser.MTLColor; -import com.momchil_atanasov.data.front.parser.MTLLibrary; -import com.momchil_atanasov.data.front.parser.MTLParser; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.test.WFResourceFixture; public class AbstractMTLParserTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/AbstractOBJParserTest.java b/src/test/java/com/mokiat/data/front/parser/AbstractOBJParserTest.java similarity index 74% rename from src/test/java/com/momchil_atanasov/data/front/parser/AbstractOBJParserTest.java rename to src/test/java/com/mokiat/data/front/parser/AbstractOBJParserTest.java index 9fe87a5..578ab20 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/AbstractOBJParserTest.java +++ b/src/test/java/com/mokiat/data/front/parser/AbstractOBJParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,12 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; -import com.momchil_atanasov.data.front.parser.IOBJParser; -import com.momchil_atanasov.data.front.parser.OBJDataReference; -import com.momchil_atanasov.data.front.parser.OBJModel; -import com.momchil_atanasov.data.front.parser.OBJNormal; -import com.momchil_atanasov.data.front.parser.OBJParser; -import com.momchil_atanasov.data.front.parser.OBJTexCoord; -import com.momchil_atanasov.data.front.parser.OBJVertex; -import com.momchil_atanasov.data.front.parser.OBJTexCoord.Type; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.parser.OBJTexCoord.Type; +import com.mokiat.data.front.test.WFResourceFixture; public abstract class AbstractOBJParserTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserBasicTest.java b/src/test/java/com/mokiat/data/front/parser/MTLParserBasicTest.java similarity index 91% rename from src/test/java/com/momchil_atanasov/data/front/parser/MTLParserBasicTest.java rename to src/test/java/com/mokiat/data/front/parser/MTLParserBasicTest.java index 7d1f167..d1b5a5a 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserBasicTest.java +++ b/src/test/java/com/mokiat/data/front/parser/MTLParserBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -22,8 +22,6 @@ import org.junit.Before; import org.junit.Test; -import com.momchil_atanasov.data.front.parser.MTLMaterial; - public class MTLParserBasicTest extends AbstractMTLParserTest { private MTLMaterial material; diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserDetailedTest.java b/src/test/java/com/mokiat/data/front/parser/MTLParserDetailedTest.java similarity index 90% rename from src/test/java/com/momchil_atanasov/data/front/parser/MTLParserDetailedTest.java rename to src/test/java/com/mokiat/data/front/parser/MTLParserDetailedTest.java index 78dc4ca..98deed9 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserDetailedTest.java +++ b/src/test/java/com/mokiat/data/front/parser/MTLParserDetailedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,8 +23,6 @@ import org.junit.Test; -import com.momchil_atanasov.data.front.parser.MTLMaterial; - public class MTLParserDetailedTest extends AbstractMTLParserTest { @Test diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserErrorTest.java b/src/test/java/com/mokiat/data/front/parser/MTLParserErrorTest.java similarity index 92% rename from src/test/java/com/momchil_atanasov/data/front/parser/MTLParserErrorTest.java rename to src/test/java/com/mokiat/data/front/parser/MTLParserErrorTest.java index 97c542c..c99e325 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/MTLParserErrorTest.java +++ b/src/test/java/com/mokiat/data/front/parser/MTLParserErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFCorruptException; public class MTLParserErrorTest extends AbstractMTLParserTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserBasicTest.java b/src/test/java/com/mokiat/data/front/parser/OBJParserBasicTest.java similarity index 86% rename from src/test/java/com/momchil_atanasov/data/front/parser/OBJParserBasicTest.java rename to src/test/java/com/mokiat/data/front/parser/OBJParserBasicTest.java index 48ca7a0..fae5a52 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserBasicTest.java +++ b/src/test/java/com/mokiat/data/front/parser/OBJParserBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,14 +25,6 @@ import org.junit.Before; import org.junit.Test; -import com.momchil_atanasov.data.front.parser.OBJDataReference; -import com.momchil_atanasov.data.front.parser.OBJFace; -import com.momchil_atanasov.data.front.parser.OBJMesh; -import com.momchil_atanasov.data.front.parser.OBJNormal; -import com.momchil_atanasov.data.front.parser.OBJObject; -import com.momchil_atanasov.data.front.parser.OBJTexCoord; -import com.momchil_atanasov.data.front.parser.OBJVertex; - public class OBJParserBasicTest extends AbstractOBJParserTest { @Before diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserDetailedTest.java b/src/test/java/com/mokiat/data/front/parser/OBJParserDetailedTest.java similarity index 83% rename from src/test/java/com/momchil_atanasov/data/front/parser/OBJParserDetailedTest.java rename to src/test/java/com/mokiat/data/front/parser/OBJParserDetailedTest.java index b03cefd..f47ff95 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserDetailedTest.java +++ b/src/test/java/com/mokiat/data/front/parser/OBJParserDetailedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -24,15 +24,7 @@ import org.junit.Test; -import com.momchil_atanasov.data.front.parser.IOBJParser; -import com.momchil_atanasov.data.front.parser.OBJDataReference; -import com.momchil_atanasov.data.front.parser.OBJFace; -import com.momchil_atanasov.data.front.parser.OBJMesh; -import com.momchil_atanasov.data.front.parser.OBJModel; -import com.momchil_atanasov.data.front.parser.OBJObject; -import com.momchil_atanasov.data.front.parser.OBJParser; -import com.momchil_atanasov.data.front.parser.OBJTexCoord; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJParserDetailedTest extends AbstractOBJParserTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserErrorTest.java b/src/test/java/com/mokiat/data/front/parser/OBJParserErrorTest.java similarity index 81% rename from src/test/java/com/momchil_atanasov/data/front/parser/OBJParserErrorTest.java rename to src/test/java/com/mokiat/data/front/parser/OBJParserErrorTest.java index 8ad9a0f..1bad698 100755 --- a/src/test/java/com/momchil_atanasov/data/front/parser/OBJParserErrorTest.java +++ b/src/test/java/com/mokiat/data/front/parser/OBJParserErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.parser; +package com.mokiat.data.front.parser; import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFCorruptException; +import com.mokiat.data.front.error.WFCorruptException; public class OBJParserErrorTest extends AbstractOBJParserTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandlerTest.java b/src/test/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandlerTest.java similarity index 87% rename from src/test/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandlerTest.java rename to src/test/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandlerTest.java index e5a335d..8301f74 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLLimitingScannerHandlerTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/MTLLimitingScannerHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -24,12 +24,10 @@ import org.junit.Test; import org.mockito.Mockito; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.MTLLimits; -import com.momchil_atanasov.data.front.error.WFSizeException; -import com.momchil_atanasov.data.front.scanner.IMTLScannerHandler; -import com.momchil_atanasov.data.front.scanner.MTLLimitingScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.MTLLimits; +import com.mokiat.data.front.error.WFSizeException; +import com.mokiat.data.front.test.WFResourceFixture; public class MTLLimitingScannerHandlerTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerBasicTest.java b/src/test/java/com/mokiat/data/front/scanner/MTLScannerBasicTest.java similarity index 89% rename from src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerBasicTest.java rename to src/test/java/com/mokiat/data/front/scanner/MTLScannerBasicTest.java index 7d334b2..7a310d7 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerBasicTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/MTLScannerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Before; import org.junit.Test; -import com.momchil_atanasov.data.front.stub.MTLContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.stub.MTLContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class MTLScannerBasicTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerDetailedTest.java b/src/test/java/com/mokiat/data/front/scanner/MTLScannerDetailedTest.java similarity index 89% rename from src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerDetailedTest.java rename to src/test/java/com/mokiat/data/front/scanner/MTLScannerDetailedTest.java index d6e6bae..fa3774d 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerDetailedTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/MTLScannerDetailedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Test; -import com.momchil_atanasov.data.front.stub.MTLContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.stub.MTLContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class MTLScannerDetailedTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerErrorTest.java b/src/test/java/com/mokiat/data/front/scanner/MTLScannerErrorTest.java similarity index 88% rename from src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerErrorTest.java rename to src/test/java/com/mokiat/data/front/scanner/MTLScannerErrorTest.java index 4d0d6ff..2a1a694 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerErrorTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/MTLScannerErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.stub.MTLContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.stub.MTLContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class MTLScannerErrorTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerHandlerErrorTest.java b/src/test/java/com/mokiat/data/front/scanner/MTLScannerHandlerErrorTest.java similarity index 89% rename from src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerHandlerErrorTest.java rename to src/test/java/com/mokiat/data/front/scanner/MTLScannerHandlerErrorTest.java index 6aadd44..8d22e96 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/MTLScannerHandlerErrorTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/MTLScannerHandlerErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -23,10 +23,9 @@ import org.junit.Test; import org.mockito.Mockito; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.scanner.IMTLScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.test.WFResourceFixture; public class MTLScannerHandlerErrorTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandlerTest.java b/src/test/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandlerTest.java similarity index 88% rename from src/test/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandlerTest.java rename to src/test/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandlerTest.java index 7833b8e..f7afa11 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJLimitingScannerHandlerTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/OBJLimitingScannerHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -24,13 +24,11 @@ import org.junit.Test; import org.mockito.Mockito; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.common.OBJLimits; -import com.momchil_atanasov.data.front.error.WFSizeException; -import com.momchil_atanasov.data.front.scanner.IOBJScannerHandler; -import com.momchil_atanasov.data.front.scanner.OBJLimitingScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.common.OBJLimits; +import com.mokiat.data.front.error.WFSizeException; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJLimitingScannerHandlerTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerBasicTest.java b/src/test/java/com/mokiat/data/front/scanner/OBJScannerBasicTest.java similarity index 74% rename from src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerBasicTest.java rename to src/test/java/com/mokiat/data/front/scanner/OBJScannerBasicTest.java index aa3092f..da20f12 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerBasicTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/OBJScannerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Before; import org.junit.Test; -import com.momchil_atanasov.data.front.stub.OBJContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.stub.OBJContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJScannerBasicTest { @@ -42,19 +42,19 @@ public void testComment() { @Test public void testVertices() { handler.assertVertexCount(4); - handler.assertVertex(index++, -1.0f, 1.0f, -1.0f, null); - handler.assertVertex(index++, -1.0f, -1.0f, 1.0f, null); - handler.assertVertex(index++, 1.0f, -1.0f, -1.0f, null); - handler.assertVertex(index++, 1.0f, 1.0f, 1.0f, null); + handler.assertVertex(index++, -1.0f, 1.0f, -1.0f, 1.0f); + handler.assertVertex(index++, -1.0f, -1.0f, 1.0f, 0.9f); + handler.assertVertex(index++, 1.0f, -1.0f, -1.0f, 0.8f); + handler.assertVertex(index++, 1.0f, 1.0f, 1.0f, 0.7f); } @Test public void testTexCoords() { handler.assertTexCoordCount(4); - handler.assertTexCoord(index++, 0.0f, 0.0f, null); - handler.assertTexCoord(index++, 1.0f, 1.0f, null); - handler.assertTexCoord(index++, 1.0f, 0.0f, null); - handler.assertTexCoord(index++, 0.0f, 1.0f, null); + handler.assertTexCoord(index++, 0.0f, 0.0f, 0.0f); + handler.assertTexCoord(index++, 1.0f, 1.0f, 0.5f); + handler.assertTexCoord(index++, 1.0f, 0.0f, 1.0f); + handler.assertTexCoord(index++, 0.0f, 1.0f, 0.3f); } @Test diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerDetailedTest.java b/src/test/java/com/mokiat/data/front/scanner/OBJScannerDetailedTest.java similarity index 92% rename from src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerDetailedTest.java rename to src/test/java/com/mokiat/data/front/scanner/OBJScannerDetailedTest.java index 5001206..6a6ad5f 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerDetailedTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/OBJScannerDetailedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Test; -import com.momchil_atanasov.data.front.stub.OBJContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.stub.OBJContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJScannerDetailedTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerErrorTest.java b/src/test/java/com/mokiat/data/front/scanner/OBJScannerErrorTest.java similarity index 84% rename from src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerErrorTest.java rename to src/test/java/com/mokiat/data/front/scanner/OBJScannerErrorTest.java index 588d969..7667b69 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerErrorTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/OBJScannerErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import org.junit.Test; -import com.momchil_atanasov.data.front.error.WFCorruptException; -import com.momchil_atanasov.data.front.stub.OBJContentScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.error.WFCorruptException; +import com.mokiat.data.front.stub.OBJContentScannerHandler; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJScannerErrorTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerHandlerErrorTest.java b/src/test/java/com/mokiat/data/front/scanner/OBJScannerHandlerErrorTest.java similarity index 87% rename from src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerHandlerErrorTest.java rename to src/test/java/com/mokiat/data/front/scanner/OBJScannerHandlerErrorTest.java index 443f9e7..a95303a 100755 --- a/src/test/java/com/momchil_atanasov/data/front/scanner/OBJScannerHandlerErrorTest.java +++ b/src/test/java/com/mokiat/data/front/scanner/OBJScannerHandlerErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.scanner; +package com.mokiat.data.front.scanner; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -25,11 +25,10 @@ import org.junit.Test; import org.mockito.Mockito; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.scanner.IOBJScannerHandler; -import com.momchil_atanasov.data.front.test.WFResourceFixture; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.test.WFResourceFixture; public class OBJScannerHandlerErrorTest { diff --git a/src/test/java/com/momchil_atanasov/data/front/stub/MTLContentScannerHandler.java b/src/test/java/com/mokiat/data/front/stub/MTLContentScannerHandler.java similarity index 93% rename from src/test/java/com/momchil_atanasov/data/front/stub/MTLContentScannerHandler.java rename to src/test/java/com/mokiat/data/front/stub/MTLContentScannerHandler.java index 0820c38..202fa63 100755 --- a/src/test/java/com/momchil_atanasov/data/front/stub/MTLContentScannerHandler.java +++ b/src/test/java/com/mokiat/data/front/stub/MTLContentScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.stub; +package com.mokiat.data.front.stub; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.error.WFException; -import com.momchil_atanasov.data.front.scanner.IMTLScannerHandler; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.error.WFException; +import com.mokiat.data.front.scanner.IMTLScannerHandler; public class MTLContentScannerHandler implements IMTLScannerHandler { diff --git a/src/test/java/com/momchil_atanasov/data/front/stub/OBJContentScannerHandler.java b/src/test/java/com/mokiat/data/front/stub/OBJContentScannerHandler.java similarity index 93% rename from src/test/java/com/momchil_atanasov/data/front/stub/OBJContentScannerHandler.java rename to src/test/java/com/mokiat/data/front/stub/OBJContentScannerHandler.java index d62fac5..7bc4f2e 100755 --- a/src/test/java/com/momchil_atanasov/data/front/stub/OBJContentScannerHandler.java +++ b/src/test/java/com/mokiat/data/front/stub/OBJContentScannerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.stub; +package com.mokiat.data.front.stub; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; -import com.momchil_atanasov.data.front.common.IFastFloat; -import com.momchil_atanasov.data.front.common.IFastInt; -import com.momchil_atanasov.data.front.scanner.IOBJScannerHandler; +import com.mokiat.data.front.common.IFastFloat; +import com.mokiat.data.front.common.IFastInt; +import com.mokiat.data.front.scanner.IOBJScannerHandler; public class OBJContentScannerHandler implements IOBJScannerHandler { diff --git a/src/test/java/com/momchil_atanasov/data/front/test/WFResourceFixture.java b/src/test/java/com/mokiat/data/front/test/WFResourceFixture.java similarity index 72% rename from src/test/java/com/momchil_atanasov/data/front/test/WFResourceFixture.java rename to src/test/java/com/mokiat/data/front/test/WFResourceFixture.java index a24bed4..a79f8b9 100755 --- a/src/test/java/com/momchil_atanasov/data/front/test/WFResourceFixture.java +++ b/src/test/java/com/mokiat/data/front/test/WFResourceFixture.java @@ -1,5 +1,5 @@ /* - * Copyright (C) momchil-atanasov.com + * Copyright (C) mokiat.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.momchil_atanasov.data.front.test; +package com.mokiat.data.front.test; import java.io.IOException; import java.io.InputStream; -import com.momchil_atanasov.data.front.parser.IMTLParser; -import com.momchil_atanasov.data.front.parser.IOBJParser; -import com.momchil_atanasov.data.front.parser.MTLLibrary; -import com.momchil_atanasov.data.front.parser.OBJModel; -import com.momchil_atanasov.data.front.scanner.IMTLScanner; -import com.momchil_atanasov.data.front.scanner.IMTLScannerHandler; -import com.momchil_atanasov.data.front.scanner.IOBJScanner; -import com.momchil_atanasov.data.front.scanner.IOBJScannerHandler; -import com.momchil_atanasov.data.front.scanner.MTLScanner; -import com.momchil_atanasov.data.front.scanner.OBJScanner; +import com.mokiat.data.front.parser.IMTLParser; +import com.mokiat.data.front.parser.IOBJParser; +import com.mokiat.data.front.parser.MTLLibrary; +import com.mokiat.data.front.parser.OBJModel; +import com.mokiat.data.front.scanner.IMTLScanner; +import com.mokiat.data.front.scanner.IMTLScannerHandler; +import com.mokiat.data.front.scanner.IOBJScanner; +import com.mokiat.data.front.scanner.IOBJScannerHandler; +import com.mokiat.data.front.scanner.MTLScanner; +import com.mokiat.data.front.scanner.OBJScanner; public class WFResourceFixture { - - private static final String RESOURCE_PACKAGE = "/com/momchil_atanasov/data/front/test/"; - + + private static final String RESOURCE_PACKAGE = "/com/mokiat/data/front/test/"; + public WFResourceFixture() { super(); } - + public void scanOBJ(String name, IOBJScannerHandler handler) throws IOException { final InputStream in = getOBJScannerResource(name); try { @@ -47,7 +47,7 @@ public void scanOBJ(String name, IOBJScannerHandler handler) throws IOException in.close(); } } - + public OBJModel parseOBJ(String name, IOBJParser parser) throws IOException { final InputStream in = getOBJParserResource(name); try { @@ -56,7 +56,7 @@ public OBJModel parseOBJ(String name, IOBJParser parser) throws IOException { in.close(); } } - + public void scanMTL(String name, IMTLScannerHandler handler) throws IOException { final InputStream in = getMTLScannerResource(name); try { @@ -66,7 +66,7 @@ public void scanMTL(String name, IMTLScannerHandler handler) throws IOException in.close(); } } - + public MTLLibrary parseMTL(String name, IMTLParser parser) throws IOException { final InputStream in = getMTLParserResource(name); try { @@ -75,23 +75,23 @@ public MTLLibrary parseMTL(String name, IMTLParser parser) throws IOException { in.close(); } } - + private InputStream getOBJScannerResource(String name) { return getResource(RESOURCE_PACKAGE + "scanner/obj/" + name); } - + private InputStream getOBJParserResource(String name) { return getResource(RESOURCE_PACKAGE + "parser/obj/" + name); } - + private InputStream getMTLScannerResource(String name) { return getResource(RESOURCE_PACKAGE + "scanner/mtl/" + name); } - + private InputStream getMTLParserResource(String name) { return getResource(RESOURCE_PACKAGE + "parser/mtl/" + name); } - + private InputStream getResource(String path) { final InputStream in = getClass().getResourceAsStream(path); if (in == null) { diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_ambient_color_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_ambient_color_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_ambient_color_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_ambient_color_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_ambient_texture_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_ambient_texture_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_ambient_texture_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_ambient_texture_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_diffuse_color_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_diffuse_color_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_diffuse_color_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_diffuse_color_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_diffuse_texture_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_diffuse_texture_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_diffuse_texture_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_diffuse_texture_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_dissolve_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_dissolve_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_dissolve_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_dissolve_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_dissolve_texture_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_dissolve_texture_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_dissolve_texture_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_dissolve_texture_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_color_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_color_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_color_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_color_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_exponent_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_exponent_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_exponent_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_exponent_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_exponent_texture_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_exponent_texture_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_exponent_texture_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_exponent_texture_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_texture_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_texture_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_specular_texture_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_specular_texture_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_transmission_color_no_material.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/error_transmission_color_no_material.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/error_transmission_color_no_material.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/error_transmission_color_no_material.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/valid_basic.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/valid_basic.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/valid_basic.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/valid_basic.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/valid_multiple_materials.mtl b/src/test/resources/com/mokiat/data/front/test/parser/mtl/valid_multiple_materials.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/mtl/valid_multiple_materials.mtl rename to src/test/resources/com/mokiat/data/front/test/parser/mtl/valid_multiple_materials.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/error_missing_face_data.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/error_missing_face_data.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/error_missing_face_data.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/error_missing_face_data.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_basic.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_basic.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_basic.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_basic.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_negative_indices.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_negative_indices.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_negative_indices.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_negative_indices.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_mesh.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_mesh.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_mesh.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_mesh.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_object.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_object.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_object.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_object.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_object_no_mesh.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_object_no_mesh.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_no_object_no_mesh.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_no_object_no_mesh.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_objects.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_objects.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_objects.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_objects.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_tex_coords.obj b/src/test/resources/com/mokiat/data/front/test/parser/obj/valid_tex_coords.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/parser/obj/valid_tex_coords.obj rename to src/test/resources/com/mokiat/data/front/test/parser/obj/valid_tex_coords.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_ambient_color_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_ambient_color_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_ambient_color_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_ambient_color_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_ambient_texture_filename.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_ambient_texture_filename.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_ambient_texture_filename.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_ambient_texture_filename.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_diffuse_color_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_diffuse_color_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_diffuse_color_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_diffuse_color_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_diffuse_texture_filename.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_diffuse_texture_filename.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_diffuse_texture_filename.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_diffuse_texture_filename.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_dissolve_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_dissolve_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_dissolve_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_dissolve_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_dissolve_texture_filename.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_dissolve_texture_filename.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_dissolve_texture_filename.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_dissolve_texture_filename.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_material_name.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_material_name.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_material_name.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_material_name.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_color_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_color_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_color_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_color_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_exponent_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_exponent_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_exponent_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_exponent_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_exponent_texture_filename.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_exponent_texture_filename.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_exponent_texture_filename.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_exponent_texture_filename.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_texture_filename.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_texture_filename.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_specular_texture_filename.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_specular_texture_filename.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_transmission_color_data.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_transmission_color_data.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/error_missing_transmission_color_data.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/error_missing_transmission_color_data.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_ambient_colors.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_ambient_colors.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_ambient_colors.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_ambient_colors.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_basic.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_basic.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_basic.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_basic.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_diffuse_colors.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_diffuse_colors.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_diffuse_colors.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_diffuse_colors.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_specular_colors.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_specular_colors.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_specular_colors.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_specular_colors.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_transmission_colors.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_transmission_colors.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_transmission_colors.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_transmission_colors.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_unknown_command.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_unknown_command.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_unknown_command.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_unknown_command.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_unsupported_colors.mtl b/src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_unsupported_colors.mtl similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/mtl/valid_unsupported_colors.mtl rename to src/test/resources/com/mokiat/data/front/test/scanner/mtl/valid_unsupported_colors.mtl diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_corrupt_data_reference.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_corrupt_data_reference.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_corrupt_data_reference.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_corrupt_data_reference.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_corrupt_vertex.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_corrupt_vertex.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_corrupt_vertex.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_corrupt_vertex.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_empty_object_name.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_empty_object_name.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_empty_object_name.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_empty_object_name.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_material_library_data.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_material_library_data.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_material_library_data.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_material_library_data.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_normal_data.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_normal_data.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_normal_data.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_normal_data.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_texcoord_data.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_texcoord_data.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_texcoord_data.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_texcoord_data.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_vertex_data.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_vertex_data.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/error_missing_vertex_data.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/error_missing_vertex_data.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_basic.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_basic.obj similarity index 51% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_basic.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_basic.obj index 1ca7292..386935b 100755 --- a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_basic.obj +++ b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_basic.obj @@ -2,15 +2,15 @@ mtllib valid_basic.mtl -v -1.0 1.0 -1.0 -v -1.0 -1.0 1.0 -v 1.0 -1.0 -1.0 -v 1.0 1.0 1.0 +v -1.0 1.0 -1.0 1.0 +v -1.0 -1.0 1.0 0.9 +v 1.0 -1.0 -1.0 0.8 +v 1.0 1.0 1.0 0.7 -vt 0.0 0.0 -vt 1.0 1.0 -vt 1.0 0.0 -vt 0.0 1.0 +vt 0.0 0.0 0.0 +vt 1.0 1.0 0.5 +vt 1.0 0.0 1.0 +vt 0.0 1.0 0.3 vn 0.0 1.0 0.0 vn 1.0 0.0 0.0 diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_comments.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_comments.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_comments.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_comments.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_data_references.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_data_references.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_data_references.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_data_references.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_faces.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_faces.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_faces.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_faces.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_logical_line.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_logical_line.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_logical_line.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_logical_line.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_material_libraries.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_material_libraries.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_material_libraries.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_material_libraries.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_material_references.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_material_references.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_material_references.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_material_references.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_normals.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_normals.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_normals.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_normals.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_objects.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_objects.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_objects.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_objects.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_texcoords.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_texcoords.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_texcoords.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_texcoords.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_unknown_command.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_unknown_command.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_unknown_command.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_unknown_command.obj diff --git a/src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_vertices.obj b/src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_vertices.obj similarity index 100% rename from src/test/resources/com/momchil_atanasov/data/front/test/scanner/obj/valid_vertices.obj rename to src/test/resources/com/mokiat/data/front/test/scanner/obj/valid_vertices.obj