So now Linux clients import `mnit::linux` instead of `mnit_linux` and Android clients import `mnit::android`. Also rename `mnit_display` and `mnit_input` to `mnit::display` and `mnit::input` respectively.
This may look familiar as it was a part of #1671.
Pull-Request: #1674
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
module moles_android
-import mnit_android
+import mnit::android
import android::portrait
import moles
module moles_linux
-import mnit_linux
+import mnit::linux
import moles
import effects
module friendz_android
import friendz
-import mnit_android
+import mnit::android
import android::landscape
redef class App
module friendz_linux
import friendz
-import mnit_linux
+import mnit::linux
redef class Display
redef fun wanted_width do return app.screen_width
# limitations under the License.
import s2pn
-import mnit_android
+import mnit::android
# limitations under the License.
import s2pn
-import mnit_linux
+import mnit::linux
android_manifest """<uses-permission android:name="android.permission.VIBRATE" />"""
end
-import mnit_android
+import mnit::android
import android::portrait
import serialization
module simple_linux
import simple
-import mnit_linux
+import mnit::linux
import test_data_store
android_api_target 10
end
-import mnit_android
+import mnit::android
import android::audio
import android::vibration
import android::landscape
# GNU/Linux client with config saved to `config.json`
module linux_client
-import mnit_linux
+import mnit::linux
import linux::audio
import json::serialization
module game_logic
-import mnit_android
+import mnit::android
import android::sensors
class Ball
import dino
-import mnit_android
+import mnit::android
import android::portrait
import android::vibration
import dino
-import mnit_linux
+import mnit::linux
redef class ImageSet
redef fun start_over_path do return "images/play_again.png"
module shoot_android
import shoot
-import mnit_android
+import mnit::android
super
module shoot_linux
import shoot
-import mnit_linux
+import mnit::linux
super
# Pointer and hardware key events
module input_events
-import mnit_input
+import mnit::input
import android
in "C header" `{
module audio
import app::audio
-import mnit_linux::linux_assets
+import mnit::linux::linux_assets
# Simple audio asset
redef class Sound
# limitations under the License.
# Android support for MNit
-module mnit_android
+module android
import android_app
import android_opengles1
"""
import mnit
-import android
import mnit::opengles1
+import ::android
intrude import ::android::input_events
in "C" `{
module android_opengles1 is ldflags "-lEGL -lGLESv1_CM"
import android_app
-import android
in "C" `{
#include <android_native_app_glue.h>
module assets
import mnit_app
-import mnit_display
+import mnit::display
# General asset
interface Asset
# limitations under the License.
# Defines abstract display classes
-module mnit_display
+module display
-import mnit_input
+import mnit::input
# Any class with a size
interface Sized
# Defines abstract classes for user and general inputs to the application.
# Implemented independantly for each platforms and technologies.
-module mnit_input
+module input
# Input to the App, propagated through `App::input`.
interface InputEvent
# limitations under the License.
# Linux support for MNit
-module mnit_linux
+module linux
import linux_app
import linux_opengles1
import mnit
import sdl
import linux_opengles1
-import linux
+import ::linux
in "C" `{
#include <EGL/egl.h>
# See the License for the specific language governing permissions and
# limitations under the License.
-# General module for cross-compatibility between multiple platforms
+# Multiplatform game framework for Nit
module mnit
import mnit_app
module mnit_app
import ::app
-import mnit_display
+import mnit::display
# An App instance serves as base to every Mnit projects.
#
# OpenGL ES1 general support (most of it)
module opengles1 is pkgconfig("glesv1_cm", "egl")
-import mnit_display
+import mnit::display
in "C header" `{
#include <EGL/egl.h>
# Manage images that are tileset or glyphset (for bitmap fonts)
module tileset
-import mnit_display
+import mnit::display
# Efficiently retrieve tiles in a big image
class TileSet
ldflags(exec("sdl-config", "--libs"), "-lSDL_image -lSDL_ttf")
end
-import mnit_display
+import mnit::display
import c
in "C header" `{
-../lib/mnit_linux/linux_app.nit:29,16--31: Redef Error: a virtual type cannot be refined.
-../lib/mnit_linux/linux_app.nit:30,16--29: Redef Error: a virtual type cannot be refined.
+../lib/mnit/linux/linux_app.nit:29,16--31: Redef Error: a virtual type cannot be refined.
+../lib/mnit/linux/linux_app.nit:30,16--29: Redef Error: a virtual type cannot be refined.
-../lib/mnit_linux/linux_app.nit:29,16--31: Redef Error: a virtual type cannot be refined.
-../lib/mnit_linux/linux_app.nit:30,16--29: Redef Error: a virtual type cannot be refined.
+../lib/mnit/linux/linux_app.nit:29,16--31: Redef Error: a virtual type cannot be refined.
+../lib/mnit/linux/linux_app.nit:30,16--29: Redef Error: a virtual type cannot be refined.