← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_PythonMouse.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GameLogic/SCA_PythonMouse.cpp
90
90
        KX_PYATTRIBUTE_RW_FUNCTION("position", SCA_PythonMouse, pyattr_get_position, pyattr_set_position),
91
91
        KX_PYATTRIBUTE_RW_FUNCTION("visible", SCA_PythonMouse, pyattr_get_visible, pyattr_set_visible),
92
92
        { NULL }        //Sentinel
93
 
};      
 
93
};
94
94
 
95
 
PyObject* SCA_PythonMouse::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
95
PyObject *SCA_PythonMouse::pyattr_get_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
96
96
{
97
97
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
98
98
        
100
100
        {
101
101
                const SCA_InputEvent & inevent = self->m_mouse->GetEventValue((SCA_IInputDevice::KX_EnumInputs)i);
102
102
                
103
 
                PyDict_SetItem(self->m_event_dict, PyLong_FromSsize_t(i), PyLong_FromSsize_t(inevent.m_status));
 
103
                PyDict_SetItem(self->m_event_dict, PyLong_FromLong(i), PyLong_FromLong(inevent.m_status));
104
104
        }
105
105
        Py_INCREF(self->m_event_dict);
106
106
        return self->m_event_dict;
107
107
}
108
108
 
109
 
PyObject* SCA_PythonMouse::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
109
PyObject *SCA_PythonMouse::pyattr_get_active_events(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
110
110
{
111
111
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
112
112
 
117
117
                const SCA_InputEvent & inevent = self->m_mouse->GetEventValue((SCA_IInputDevice::KX_EnumInputs)i);
118
118
                
119
119
                if (inevent.m_status != SCA_InputEvent::KX_NO_INPUTSTATUS)
120
 
                        PyDict_SetItem(self->m_event_dict, PyLong_FromSsize_t(i), PyLong_FromSsize_t(inevent.m_status));
 
120
                        PyDict_SetItem(self->m_event_dict, PyLong_FromLong(i), PyLong_FromLong(inevent.m_status));
121
121
        }
122
122
        Py_INCREF(self->m_event_dict);
123
123
        return self->m_event_dict;
124
124
}
125
125
 
126
 
PyObject* SCA_PythonMouse::pyattr_get_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
126
PyObject *SCA_PythonMouse::pyattr_get_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
127
127
{
128
128
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
129
129
        const SCA_InputEvent & xevent = self->m_mouse->GetEventValue(SCA_IInputDevice::KX_MOUSEX);
134
134
        x_coord = self->m_canvas->GetMouseNormalizedX(xevent.m_eventval);
135
135
        y_coord = self->m_canvas->GetMouseNormalizedY(yevent.m_eventval);
136
136
 
137
 
        PyObject* ret = PyTuple_New(2);
 
137
        PyObject *ret = PyTuple_New(2);
138
138
 
139
139
        PyTuple_SET_ITEM(ret, 0, PyFloat_FromDouble(x_coord));
140
140
        PyTuple_SET_ITEM(ret, 1, PyFloat_FromDouble(y_coord));
158
158
        return PY_SET_ATTR_SUCCESS;
159
159
}
160
160
 
161
 
PyObject* SCA_PythonMouse::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
161
PyObject *SCA_PythonMouse::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
162
162
{
163
163
        SCA_PythonMouse* self = static_cast<SCA_PythonMouse*>(self_v);
164
164