-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(JOML): cleanup and migrate to joml (#48)
Co-authored-by: Tobias Nett <[email protected]>
- Loading branch information
1 parent
124fb73
commit 4eda17e
Showing
15 changed files
with
1,304 additions
and
1,312 deletions.
There are no files selected for viewing
72 changes: 36 additions & 36 deletions
72
src/main/java/org/terasology/scenario/components/regions/RegionBeingCreatedComponent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| /* | ||
| * Copyright 2017 MovingBlocks | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.terasology.scenario.components.regions; | ||
|
|
||
| import org.terasology.entitySystem.Component; | ||
| import org.terasology.entitySystem.entity.EntityRef; | ||
| import org.terasology.math.geom.Vector3i; | ||
| import org.terasology.network.FieldReplicateType; | ||
| import org.terasology.network.Replicate; | ||
| import org.terasology.scenario.components.ScenarioComponent; | ||
|
|
||
| /** | ||
| * Creation component for a Scenario argument entity, indicates that this region is currently being created | ||
| * | ||
| * Scenario region entities are detailed in {@link ScenarioComponent} | ||
| */ | ||
| public class RegionBeingCreatedComponent implements Component { | ||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public Vector3i firstHit; | ||
|
|
||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public EntityRef creatingEntity; | ||
| } | ||
| /* | ||
| * Copyright 2017 MovingBlocks | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.terasology.scenario.components.regions; | ||
|
|
||
| import org.joml.Vector3i; | ||
| import org.terasology.entitySystem.Component; | ||
| import org.terasology.entitySystem.entity.EntityRef; | ||
| import org.terasology.network.FieldReplicateType; | ||
| import org.terasology.network.Replicate; | ||
| import org.terasology.scenario.components.ScenarioComponent; | ||
|
|
||
| /** | ||
| * Creation component for a Scenario argument entity, indicates that this region is currently being created | ||
| * | ||
| * Scenario region entities are detailed in {@link ScenarioComponent} | ||
| */ | ||
| public class RegionBeingCreatedComponent implements Component { | ||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public Vector3i firstHit; | ||
|
|
||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public EntityRef creatingEntity; | ||
| } |
66 changes: 32 additions & 34 deletions
66
src/main/java/org/terasology/scenario/components/regions/RegionLocationComponent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,32 @@ | ||
| /* | ||
| * Copyright 2017 MovingBlocks | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.terasology.scenario.components.regions; | ||
|
|
||
| import org.terasology.entitySystem.Component; | ||
| import org.terasology.math.Region3i; | ||
| import org.terasology.network.FieldReplicateType; | ||
| import org.terasology.network.Replicate; | ||
| import org.terasology.scenario.components.ScenarioComponent; | ||
| import org.terasology.scenario.internal.systems.RegionSystem; | ||
| import org.terasology.structureTemplates.components.ProtectedRegionsComponent; | ||
|
|
||
| /** | ||
| * Creation component for a Scenario argument entity, contains the actual Region3i of the region | ||
| * | ||
| * Scenario region entities are detailed in {@link ScenarioComponent} | ||
| */ | ||
| public class RegionLocationComponent implements Component { | ||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public Region3i region; | ||
| } | ||
| /* | ||
| * Copyright 2017 MovingBlocks | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.terasology.scenario.components.regions; | ||
|
|
||
| import org.terasology.entitySystem.Component; | ||
| import org.terasology.network.FieldReplicateType; | ||
| import org.terasology.network.Replicate; | ||
| import org.terasology.scenario.components.ScenarioComponent; | ||
| import org.terasology.world.block.BlockRegion; | ||
|
|
||
| /** | ||
| * Creation component for a Scenario argument entity, contains the actual Region3i of the region | ||
| * | ||
| * Scenario region entities are detailed in {@link ScenarioComponent} | ||
| */ | ||
| public class RegionLocationComponent implements Component { | ||
| @Replicate(FieldReplicateType.SERVER_TO_CLIENT) | ||
| public BlockRegion region; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.