Revision e1111500
Added by Leszek Koltunski over 5 years ago
| distorted-cube.iml | ||
|---|---|---|
| 17 | 17 |
<option name="ALLOW_USER_CONFIGURATION" value="false" /> |
| 18 | 18 |
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> |
| 19 | 19 |
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> |
| 20 |
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
|
|
| 20 |
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" /> |
|
| 21 | 21 |
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" /> |
| 22 | 22 |
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> |
| 23 | 23 |
</configuration> |
| src/main/java/org/distorted/magic/RubikActivity.java | ||
|---|---|---|
| 1 | 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 2 | 2 |
// Copyright 2019 Leszek Koltunski // |
| 3 | 3 |
// // |
| 4 |
// This file is part of Distorted. // |
|
| 4 |
// This file is part of DistortedLibrary. //
|
|
| 5 | 5 |
// // |
| 6 |
// Distorted is free software: you can redistribute it and/or modify // |
|
| 6 |
// DistortedLibrary is free software: you can redistribute it and/or modify //
|
|
| 7 | 7 |
// it under the terms of the GNU General Public License as published by // |
| 8 | 8 |
// the Free Software Foundation, either version 2 of the License, or // |
| 9 | 9 |
// (at your option) any later version. // |
| 10 | 10 |
// // |
| 11 |
// Distorted is distributed in the hope that it will be useful, // |
|
| 11 |
// DistortedLibrary is distributed in the hope that it will be useful, //
|
|
| 12 | 12 |
// but WITHOUT ANY WARRANTY; without even the implied warranty of // |
| 13 | 13 |
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // |
| 14 | 14 |
// GNU General Public License for more details. // |
| 15 | 15 |
// // |
| 16 | 16 |
// You should have received a copy of the GNU General Public License // |
| 17 |
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. // |
|
| 17 |
// along with DistortedLibrary. If not, see <http://www.gnu.org/licenses/>. //
|
|
| 18 | 18 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.magic; |
| ... | ... | |
| 27 | 27 |
import android.support.v4.content.ContextCompat; |
| 28 | 28 |
import android.view.View; |
| 29 | 29 |
|
| 30 |
import org.distorted.library.main.Distorted; |
|
| 30 |
import org.distorted.library.main.DistortedLibrary;
|
|
| 31 | 31 |
|
| 32 | 32 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 33 | 33 |
|
| ... | ... | |
| 55 | 55 |
{
|
| 56 | 56 |
GLSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 57 | 57 |
view.onPause(); |
| 58 |
Distorted.onPause(); |
|
| 58 |
DistortedLibrary.onPause();
|
|
| 59 | 59 |
super.onPause(); |
| 60 | 60 |
} |
| 61 | 61 |
|
| ... | ... | |
| 74 | 74 |
@Override |
| 75 | 75 |
protected void onDestroy() |
| 76 | 76 |
{
|
| 77 |
Distorted.onDestroy();
|
|
| 77 |
DistortedLibrary.onDestroy();
|
|
| 78 | 78 |
super.onDestroy(); |
| 79 | 79 |
} |
| 80 | 80 |
|
| src/main/java/org/distorted/magic/RubikCube.java | ||
|---|---|---|
| 1 | 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 2 | 2 |
// Copyright 2019 Leszek Koltunski // |
| 3 | 3 |
// // |
| 4 |
// This file is part of Distorted. // |
|
| 4 |
// This file is part of DistortedLibrary. //
|
|
| 5 | 5 |
// // |
| 6 |
// Distorted is free software: you can redistribute it and/or modify // |
|
| 6 |
// DistortedLibrary is free software: you can redistribute it and/or modify //
|
|
| 7 | 7 |
// it under the terms of the GNU General Public License as published by // |
| 8 | 8 |
// the Free Software Foundation, either version 2 of the License, or // |
| 9 | 9 |
// (at your option) any later version. // |
| 10 | 10 |
// // |
| 11 |
// Distorted is distributed in the hope that it will be useful, // |
|
| 11 |
// DistortedLibrary is distributed in the hope that it will be useful, //
|
|
| 12 | 12 |
// but WITHOUT ANY WARRANTY; without even the implied warranty of // |
| 13 | 13 |
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // |
| 14 | 14 |
// GNU General Public License for more details. // |
| 15 | 15 |
// // |
| 16 | 16 |
// You should have received a copy of the GNU General Public License // |
| 17 |
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. // |
|
| 17 |
// along with DistortedLibrary. If not, see <http://www.gnu.org/licenses/>. //
|
|
| 18 | 18 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.magic; |
| src/main/java/org/distorted/magic/RubikRenderer.java | ||
|---|---|---|
| 1 | 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 2 | 2 |
// Copyright 2019 Leszek Koltunski // |
| 3 | 3 |
// // |
| 4 |
// This file is part of Distorted. // |
|
| 4 |
// This file is part of DistortedLibrary. //
|
|
| 5 | 5 |
// // |
| 6 |
// Distorted is free software: you can redistribute it and/or modify // |
|
| 6 |
// DistortedLibrary is free software: you can redistribute it and/or modify //
|
|
| 7 | 7 |
// it under the terms of the GNU General Public License as published by // |
| 8 | 8 |
// the Free Software Foundation, either version 2 of the License, or // |
| 9 | 9 |
// (at your option) any later version. // |
| 10 | 10 |
// // |
| 11 |
// Distorted is distributed in the hope that it will be useful, // |
|
| 11 |
// DistortedLibrary is distributed in the hope that it will be useful, //
|
|
| 12 | 12 |
// but WITHOUT ANY WARRANTY; without even the implied warranty of // |
| 13 | 13 |
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // |
| 14 | 14 |
// GNU General Public License for more details. // |
| 15 | 15 |
// // |
| 16 | 16 |
// You should have received a copy of the GNU General Public License // |
| 17 |
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. // |
|
| 17 |
// along with DistortedLibrary. If not, see <http://www.gnu.org/licenses/>. //
|
|
| 18 | 18 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.magic; |
| ... | ... | |
| 22 | 22 |
import android.opengl.GLSurfaceView; |
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.effect.VertexEffectSink; |
| 25 |
import org.distorted.library.main.Distorted; |
|
| 25 |
import org.distorted.library.main.DistortedLibrary;
|
|
| 26 | 26 |
import org.distorted.library.main.DistortedScreen; |
| 27 | 27 |
import org.distorted.library.message.EffectListener; |
| 28 | 28 |
import org.distorted.library.message.EffectMessage; |
| ... | ... | |
| 166 | 166 |
|
| 167 | 167 |
try |
| 168 | 168 |
{
|
| 169 |
Distorted.onCreate(mView.getContext()); |
|
| 169 |
DistortedLibrary.onCreate(mView.getContext());
|
|
| 170 | 170 |
} |
| 171 | 171 |
catch(Exception ex) |
| 172 | 172 |
{
|
| src/main/java/org/distorted/magic/RubikSurfaceView.java | ||
|---|---|---|
| 1 | 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 2 | 2 |
// Copyright 2019 Leszek Koltunski // |
| 3 | 3 |
// // |
| 4 |
// This file is part of Distorted. // |
|
| 4 |
// This file is part of DistortedLibrary. //
|
|
| 5 | 5 |
// // |
| 6 |
// Distorted is free software: you can redistribute it and/or modify // |
|
| 6 |
// DistortedLibrary is free software: you can redistribute it and/or modify //
|
|
| 7 | 7 |
// it under the terms of the GNU General Public License as published by // |
| 8 | 8 |
// the Free Software Foundation, either version 2 of the License, or // |
| 9 | 9 |
// (at your option) any later version. // |
| 10 | 10 |
// // |
| 11 |
// Distorted is distributed in the hope that it will be useful, // |
|
| 11 |
// DistortedLibrary is distributed in the hope that it will be useful, //
|
|
| 12 | 12 |
// but WITHOUT ANY WARRANTY; without even the implied warranty of // |
| 13 | 13 |
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // |
| 14 | 14 |
// GNU General Public License for more details. // |
| 15 | 15 |
// // |
| 16 | 16 |
// You should have received a copy of the GNU General Public License // |
| 17 |
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. // |
|
| 17 |
// along with DistortedLibrary. If not, see <http://www.gnu.org/licenses/>. //
|
|
| 18 | 18 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.magic; |
Also available in: Unified diff
Rename all the classes that are not exported to application to 'Internal'