Project

General

Profile

« Previous | Next » 

Revision e52efe17

Added by Leszek Koltunski almost 5 years ago

Improve the Dynamic app.

View differences:

src/main/java/org/distorted/examples/dynamic/DynamicActivity.java
46 46
    private int mDim, mMode;
47 47

  
48 48
///////////////////////////////////////////////////////////////////////////////////////////////////
49

  
49 50
    @Override
50 51
    protected void onCreate(Bundle savedState)
51 52
      {
......
87 88
      ArrayAdapter<String> adapterMode = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, modes );
88 89
      adapterMode.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
89 90
      modeSpinner.setAdapter(adapterMode);
91
      modeSpinner.setSelection(0);
90 92

  
91 93
      if( savedState==null )
92 94
        {
......
103 105
      }
104 106

  
105 107
///////////////////////////////////////////////////////////////////////////////////////////////////
108

  
106 109
    @Override
107 110
    protected void onResume() 
108 111
      {
109 112
      super.onResume();
110 113
      
111
      GLSurfaceView view = findViewById(R.id.dynamicSurfaceView);
112
      view.onResume();
114
      GLSurfaceView v1 = findViewById(R.id.dynamicSurfaceView);
115
      v1.onResume();
116
      DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView);
117
      v2.onResume();
113 118
      }
114 119

  
115 120
///////////////////////////////////////////////////////////////////////////////////////////////////
121

  
116 122
    @Override
117 123
    protected void onPause() 
118 124
      {
119
      GLSurfaceView view = findViewById(R.id.dynamicSurfaceView);
120
      view.onPause();
125
      GLSurfaceView v1 = findViewById(R.id.dynamicSurfaceView);
126
      v1.onPause();
127
      DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView);
128
      v2.onPause();
121 129

  
122 130
      DistortedLibrary.onPause();
123 131
      super.onPause();
124 132
      }
125 133
    
126 134
///////////////////////////////////////////////////////////////////////////////////////////////////
135

  
127 136
    @Override
128 137
    public void onStop()
129 138
      {
......
131 140
      }
132 141

  
133 142
///////////////////////////////////////////////////////////////////////////////////////////////////
143

  
134 144
    @Override
135 145
    public void onDestroy()
136 146
      {  
......
138 148
      super.onDestroy();
139 149
      }     
140 150

  
151
///////////////////////////////////////////////////////////////////////////////////////////////////
152

  
153
    void setNumRedPoints(int numPoints)
154
      {
155
      DynamicSpeedSurfaceView view = findViewById(R.id.dynamicSpeedSurfaceView);
156
      view.setNumRedPoints(numPoints);
157
      }
158

  
159
///////////////////////////////////////////////////////////////////////////////////////////////////
160

  
161
    void addPoint(float x, float y)
162
      {
163
      DynamicSpeedSurfaceView view = findViewById(R.id.dynamicSpeedSurfaceView);
164
      view.addPoint(x,y);
165
      }
166

  
141 167
///////////////////////////////////////////////////////////////////////////////////////////////////
142 168

  
143 169
    public void setDim(int dim)
......
151 177

  
152 178
    public void setMode(int mode)
153 179
      {
154
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
155
      view.setMode(mode);
180
      DynamicSurfaceView v1 = findViewById(R.id.dynamicSurfaceView);
181
      v1.setMode(mode);
182
      DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView);
183
      v2.setMode(mode);
184

  
156 185
      mMode = mode;
157 186
      }
158 187

  
......
160 189

  
161 190
    public void Start(View v)
162 191
      {
163
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
164
      view.startDynamic();
192
      DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView);
193
      v2.clearPoints();
194
      DynamicSurfaceView v1 = findViewById(R.id.dynamicSurfaceView);
195
      v1.startDynamic();
165 196
      }
166 197

  
167 198
///////////////////////////////////////////////////////////////////////////////////////////////////
168 199

  
169 200
    public void Reset(View v)
170 201
      {
171
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
172
      view.resetPoints();
173
      view.stopDynamic();
202
      DynamicSurfaceView v1 = findViewById(R.id.dynamicSurfaceView);
203
      v1.resetPoints();
204
      v1.stopDynamic();
205
      DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView);
206
      v2.clearPoints();
174 207
      }
175 208

  
176 209
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff