Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a542aa authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "model rotation can now be controlled by the device's sensors"

parents 1c0b3311 35ccf465

tests/RenderScriptTests/ModelViewer/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
    package="com.android.modelviewer">

    <application android:label="ModelViewer">

        <activity android:name="SimpleModel"

                  android:label="SimpleModel">

                  android:label="SimpleModel"

                  android:screenOrientation="nosensor">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

tests/RenderScriptTests/ModelViewer/res/menu/loader_menu.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,4 +22,6 @@ 
          android:title="@string/load_model" />

    <item android:id="@+id/display_options"

          android:title="@string/display_options" />

    <item android:id="@+id/sensor"

          android:title="@string/sensor" />

</menu>

tests/RenderScriptTests/ModelViewer/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    <skip />

    <string name="load_model">Load Model</string>

    <string name="display_options">Display Options</string>

    <string name="sensor">Toggle Sensor</string>

</resources>

tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/SimpleModel.java

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public class SimpleModel extends Activity { 
            return true;

        case R.id.display_options:

            return true;

        case R.id.sensor:

            mView.toggleSensor();

            return true;

        default:

            return super.onOptionsItemSelected(item);

        }

tests/RenderScriptTests/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ public class SimpleModelRS { 
        mScript.invoke_onActionMove(x, y);

    }



    public void onPostureChanged(Matrix4f posture) {

        mScript.set_gPostureMatrix(posture);

    }



    private void initPFS() {

        ProgramStore.Builder b = new ProgramStore.Builder(mRS);